Index: /trunk/include/VBox/log.h
===================================================================
--- /trunk/include/VBox/log.h (revision 74760)
+++ /trunk/include/VBox/log.h (revision 74761)
@@ -378,4 +378,6 @@
/** Main group, IDataModel. */
LOG_GROUP_MAIN_DATAMODEL,
+ /** Main group, IDataStream. */
+ LOG_GROUP_MAIN_DATASTREAM,
/** Main group, IDHCPServer. */
LOG_GROUP_MAIN_DHCPSERVER,
@@ -1010,4 +1012,5 @@
"MAIN_CURSORPOSITIONCHANGEDEVENT", \
"MAIN_DATAMODEL", \
+ "MAIN_DATASTREASTREAM", \
"MAIN_DHCPSERVER", \
"MAIN_DIRECTORY", \
Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 74760)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 74761)
@@ -444,4 +444,10 @@
Guest Control reported an error from the guest side.
+
+
+
+
+
+ The operation ran into an explicitly requested timeout.
@@ -2621,9 +2627,9 @@
- Allows the caller to request a completely new medium UUID for
- the image which is to be opened. Useful if one intends to open an exact
- copy of a previously opened image, as this would normally fail due to
- the duplicate UUID.
-
+ Allows the caller to request a completely new medium UUID for
+ the image which is to be opened. Useful if one intends to open an exact
+ copy of a previously opened image, as this would normally fail due to
+ the duplicate UUID.
+
Opened medium object.
@@ -2884,8 +2890,8 @@
-
-
+ -->
+
@@ -2893,7 +2899,7 @@
+ -->
-
+
@@ -5464,5 +5470,5 @@
set by one of ,
or , depending on which was called last.
- See for details.
+ See for details.
@@ -6511,5 +6517,5 @@
-
+
Name of the storage controller.
@@ -10250,21 +10256,21 @@
- Proxy server URL for the proxy mode.
-
- The format is: [{type}"://"][{userid}[@{password}]:]{server}[":"{port}]
-
- Valid types are: http (default), https, socks4, socks4a, socks5, socks5h and direct.
- Please note that these are proxy types defining how the proxy operates rather than
- how to proxy any similarly named protocol (i.e. don't confuse a http-proxy with
- proxying the http protocol, as a http-proxy usually can proxy https and other protocols too).
-
- The port number defaults to 80 for http, 443 for https and 1080 for the socks ones.
-
- The password is currently stored as plain text! Use the
- mode if you consider the proxy password to be sensitive.
-
- An empty string will cause the behavior to be identical to .
- For compatibility with libproxy, an URL starting with "direct://" will cause
- behavior.
+ Proxy server URL for the proxy mode.
+
+ The format is: [{type}"://"][{userid}[@{password}]:]{server}[":"{port}]
+
+ Valid types are: http (default), https, socks4, socks4a, socks5, socks5h and direct.
+ Please note that these are proxy types defining how the proxy operates rather than
+ how to proxy any similarly named protocol (i.e. don't confuse a http-proxy with
+ proxying the http protocol, as a http-proxy usually can proxy https and other protocols too).
+
+ The port number defaults to 80 for http, 443 for https and 1080 for the socks ones.
+
+ The password is currently stored as plain text! Use the
+ mode if you consider the proxy password to be sensitive.
+
+ An empty string will cause the behavior to be identical to .
+ For compatibility with libproxy, an URL starting with "direct://" will cause
+ behavior.
@@ -11378,5 +11384,5 @@
Process terminated abnormally.
-
+ Process timed out and was killed.
@@ -11680,5 +11686,5 @@
Returns the protocol version which is used to communicate
- with the guest.
+ with the guest.
@@ -12174,5 +12180,5 @@
Update
Only copy when the source file is newer than the destination
- file or when the destination file is missing.
+ file or when the destination file is missing.
@@ -12229,5 +12235,5 @@
Update
Only copy when the source file is newer than the destination
- file or when the destination file is missing.
+ file or when the destination file is missing.
@@ -12406,5 +12412,5 @@
If @c false, a symbolic link in the final component will make the
method return @c false (because a symlink isn't a directory).
-
+
@@ -12483,5 +12489,5 @@
Zero or more flags.
WARNING! SPECIFYING IS
- MANDATORY AT THE MOMENT!!
+ MANDATORY AT THE MOMENT!!
@@ -12670,5 +12676,5 @@
characters in the template will be replaced by a random
alphanumeric string to produce a unique name.
-
+
@@ -12718,5 +12724,5 @@
If @c false, a symbolic link in the final component will make the
method return @c false (because a symlink isn't a regular file).
-
+
@@ -12827,9 +12833,9 @@
- It @c true, symbolic links in the final path component will be
- followed to their target, and the size of the target is returned.
- If @c false, symbolic links in the final path component will make
- the method call fail (symblink is not a regular file).
-
+ It @c true, symbolic links in the final path component will be
+ followed to their target, and the size of the target is returned.
+ If @c false, symbolic links in the final path component will make
+ the method call fail (symblink is not a regular file).
+
@@ -12855,9 +12861,9 @@
- If @c true, symbolic links in the final component will be followed
- and the method will instead check if the target exists.
- If @c false, symbolic links in the final component will satisfy the
- method and it will return @c true in @a exists.
-
+ If @c true, symbolic links in the final component will be followed
+ and the method will instead check if the target exists.
+ If @c false, symbolic links in the final component will satisfy the
+ method and it will return @c true in @a exists.
+
@@ -12884,8 +12890,8 @@
- Information about symbolic links is returned if @c false. Otherwise,
- symbolic links are followed and the returned information concerns
- itself with the symlink target if @c true.
-
+ Information about symbolic links is returned if @c false. Otherwise,
+ symbolic links are followed and the returned information concerns
+ itself with the symlink target if @c true.
+
@@ -12987,5 +12993,5 @@
otherwise, if @c false, the method will work directly on a symbolic
link in the final component.
-
+
@@ -16394,6 +16400,6 @@
- Set this to open the medium for both reading and writing. When
- not set the medium is opened readonly.
+ Set this to open the medium for both reading and writing. When
+ not set the medium is opened readonly.
@@ -16639,4 +16645,50 @@
+
+
+
+ The IDataStream interface is used to retrieve a data stream. It is
+ returned by .
+
+
+
+ Recommended size of a read. Requesting a larger read may be
+ possible in certain situations, but it is not guaranteed.
+
+
+
+
+ Read data from the stream.
+
+ Waiting time has expired.
+
+
+
+ How many bytes to try read.
+
+
+
+ Timeout (in ms) for limiting the wait time for data to be available.
+ Pass 0 for an infinite timeout.
+
+
+
+ Array of data read. This may be shorter than the specified size.
+ Returning a zero-sized array indicates the end of the stream, if the
+ status is successful.
+
+
+
+
+
+
+ name="BandwidthGroupType"
+ uuid="1d92b67d-dc69-4be9-ad4c-93a01e1e0c8e">
Index: /trunk/src/VBox/Main/include/DataStreamImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/DataStreamImpl.h (revision 74761)
+++ /trunk/src/VBox/Main/include/DataStreamImpl.h (revision 74761)
@@ -0,0 +1,54 @@
+/* $Id$ */
+/** @file
+ * VirtualBox COM class implementation
+ */
+
+/*
+ * Copyright (C) 2018 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+
+#ifndef ____H_DATASTREAMIMPL
+#define ____H_DATASTREAMIMPL
+
+#include "DataStreamWrap.h"
+
+
+class ATL_NO_VTABLE DataStream
+ : public DataStreamWrap
+{
+public:
+ DECLARE_EMPTY_CTOR_DTOR(DataStream)
+
+ HRESULT FinalConstruct();
+ void FinalRelease();
+
+ HRESULT init(unsigned long aBufferSize);
+ void uninit();
+
+ /// Feed data into the stream, used by the stream source.
+ /// Blocks if the internal buffer cannot take anything, otherwise
+ /// as much as the internal buffer can hold is taken (if smaller
+ /// than @a cbWrite). Modeled after RTStrmWriteEx.
+ int i_write(const void *pvBuf, size_t cbWrite, size_t *pcbWritten);
+
+private:
+ // wrapped IDataStream attributes and methods
+ HRESULT getReadSize(ULONG *aReadSize);
+ HRESULT read(ULONG aSize, ULONG aTimeoutMS, std::vector &aData);
+
+private:
+ std::vector m_aBuffer;
+};
+
+#endif // !____H_DATASTREAMIMPL
+
+/* vi: set tabstop=4 shiftwidth=4 expandtab: */
Index: /trunk/src/VBox/Main/include/MediumIOImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/MediumIOImpl.h (revision 74760)
+++ /trunk/src/VBox/Main/include/MediumIOImpl.h (revision 74761)
@@ -52,4 +52,9 @@
HRESULT formatFAT(BOOL a_fQuick);
HRESULT initializePartitionTable(PartitionTableType_T a_enmFormat, BOOL a_fWholeDiskInOneEntry);
+ HRESULT convertToStream(const com::Utf8Str &aFormat,
+ const std::vector &aVariant,
+ ULONG aBufferSize,
+ ComPtr &aStream,
+ ComPtr &aProgress);
HRESULT close();
/** @} */
Index: /trunk/src/VBox/Main/src-server/MediumIOImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MediumIOImpl.cpp (revision 74760)
+++ /trunk/src/VBox/Main/src-server/MediumIOImpl.cpp (revision 74761)
@@ -394,4 +394,13 @@
}
+HRESULT MediumIO::convertToStream(const com::Utf8Str &aFormat,
+ const std::vector &aVariant,
+ ULONG aBufferSize,
+ ComPtr &aStream,
+ ComPtr &aProgress)
+{
+ return E_NOTIMPL;
+}
+
HRESULT MediumIO::close()
{