Changeset 20928 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 25, 2009 11:53:37 AM (16 years ago)

Author:

vboxsync

Message:

API/others: Renamed IConsole::discardSavedState to IConsole::forgetSavedState, added parameter. Deleted old IConsole::powerDown, renamed IConsole::powerDownAsync to IConsole::powerDown (as promised for 2.1). Implemented perl sample code for registering a hard disk. Cleaned up constant formatting in the API docs. Updated SDK changelog. Renamed com/errorprint2.h to com/errorprint.h, added a few assertion variants. Eliminated com/errorprint_legacy.h. Adjusted all files using the affected headers and APIs. Renamed tstHeadless2 to tstHeadless.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• MachineImpl.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (2 diffs)
• glue/errorprint.cpp (moved) (moved from trunk/src/VBox/Main/glue/errorprint2.cpp ) (2 diffs)
• idl/VirtualBox.xidl (modified) (126 diffs)
• include/ConsoleImpl.h (modified) (3 diffs)
• include/MachineImpl.h (modified) (2 diffs)
• testcase/tstAPI.cpp (modified) (82 diffs)
• webservice/samples/perl/clienttest.pl (modified) (3 diffs)
• webservice/vboxweb.cpp (modified) (1 diff)
• webservice/websrv-cpp.xsl (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1322 +1322 @@
 }
 
-STDMETHODIMP Console::PowerDown()
-{
-    LogFlowThisFuncEnter();
-    LogFlowThisFunc (("mMachineState=%d\n", mMachineState));
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
-    if (!Global::IsActive (mMachineState))
-    {
-        /* extra nice error message for a common case */
-        if (mMachineState == MachineState_Saved)
-            return setError (VBOX_E_INVALID_VM_STATE,
-                tr ("Cannot power down a saved virtual machine"));
-        else if (mMachineState == MachineState_Stopping)
-            return setError (VBOX_E_INVALID_VM_STATE,
-                tr ("Virtual machine is being powered down"));
-        else
-            return setError(VBOX_E_INVALID_VM_STATE,
-                tr ("Invalid machine state: %d (must be Running, Paused "
-                    "or Stuck)"),
-                mMachineState);
-    }
-
-    LogFlowThisFunc (("Sending SHUTDOWN request...\n"));
-
-    HRESULT rc = powerDown();
-
-    LogFlowThisFunc (("mMachineState=%d, rc=%08X\n", mMachineState, rc));
-    LogFlowThisFuncLeave();
-    return rc;
-}
-
-STDMETHODIMP Console::PowerDownAsync (IProgress **aProgress)
+STDMETHODIMP Console::PowerDown (IProgress **aProgress)
 {
     if (aProgress == NULL)
@@ -1837 +1802 @@
 }
 
-STDMETHODIMP Console::DiscardSavedState()
+STDMETHODIMP Console::ForgetSavedState(BOOL aRemove)
 {
     AutoCaller autoCaller (this);
@@ -1850 +1815 @@
             mMachineState);
 
+    HRESULT rc = S_OK;
+
+    rc = mControl->SetRemoveSavedState(aRemove);
+    CheckComRCReturnRC (rc);
+
     /*
      *  Saved -> PoweredOff transition will be detected in the SessionMachine
      *  and properly handled.
      */
-    setMachineState (MachineState_PoweredOff);
-
-    return S_OK;
+    rc = setMachineState (MachineState_PoweredOff);
+
+    return rc;
 }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8240 +8240 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (SessionMachine)
+SessionMachine::SessionMachine()
+    : mRemoveSavedState(true)
+{}
+
+SessionMachine::~SessionMachine()
+{}
 
 HRESULT SessionMachine::FinalConstruct()
@@ -8686 +8691 @@
 
 /**
+ *  @note Locks this object for writing.
+ */
+STDMETHODIMP SessionMachine::SetRemoveSavedState(BOOL aRemove)
+{
+    AutoCaller autoCaller (this);
+    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    mRemoveSavedState = aRemove;
+
+    return S_OK;
+}
+
+/**
  *  @note Locks the same as #setMachineState() does.
  */
@@ -11275 +11295 @@
     }
 
-    if (deleteSavedState == true)
-    {
-        /** @todo remove this API hack, and provide a clean way for
-         * detaching a saved state without deleting. */
-        Utf8Str val;
-        HRESULT rc2 = getExtraData("API/DiscardSavedStateKeepFile", val);
-        if (FAILED(rc2) || val != "1")
+    if (deleteSavedState)
+    {
+        if (mRemoveSavedState)
         {
             Assert (!mSSData->mStateFilePath.isEmpty());

trunk/src/VBox/Main/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2009 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -678 +678 @@
         glue/EventQueue.cpp \
         glue/ErrorInfo.cpp \
-        glue/errorprint2.cpp \
+        glue/errorprint.cpp \
         glue/SupportErrorInfo.cpp \
         glue/VirtualBoxErrorInfo.cpp

trunk/src/VBox/Main/glue/errorprint.cpp

@@ -3 +3 @@
 /** @file
  * MS COM / XPCOM Abstraction Layer:
- * Error info print helpers. This implements the shared code from the macros from errorprint2.h.
+ * Error info print helpers. This implements the shared code from the macros from errorprint.h.
  */
 
@@ -24 +24 @@
 
 #include <VBox/com/ErrorInfo.h>
-#include <VBox/com/errorprint2.h>
+#include <VBox/com/errorprint.h>
 #include <VBox/log.h>
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -233 +233 @@
       <td>
         Returned if a memory pointer for the output argument is invalid (for
-        example, <tt>NULL</tt>). Note that when pointers representing input
+        example, @c null). Note that when pointers representing input
         arguments (such as strings) are invalid, E_INVALIDARG is returned.
       </td>
@@ -494 +494 @@
         needed: for any online VM state, the condition
         <tt>FirstOnline &lt;= state &lt;= LastOnline</tt> must be
-        <tt>true</tt>. The same relates to transient states for which
+        @c true. The same relates to transient states for which
         the condition <tt>FirstOnline &lt;= state &lt;= LastOnline</tt> must be
-        <tt>true</tt>.
+        @c true.
       </note>
     </desc>
@@ -1027 +1027 @@
       <desc>
         Notification when someone tries to change extra data for
-        either the given machine or (if null) global extra data.
+        either the given machine or (if @c null) global extra data.
         This gives the chance to veto against changes.
       </desc>
@@ -1033 +1033 @@
         <desc>
           ID of the machine this event relates to
-          (null ID for global extra data change requests).
+          (@c null ID for global extra data change requests).
         </desc>
       </param>
@@ -1118 +1118 @@
       <param name="registered" type="boolean" dir="in">
         <desc>
-          If true, the media was registered, otherwise it was
+          If @c true, the media was registered, otherwise it was
           unregistered.
         </desc>
@@ -1134 +1134 @@
       <param name="registered" type="boolean" dir="in">
         <desc>
-          If true, the machine was registered, otherwise it was
+          If @c true, the machine was registered, otherwise it was
           unregistered.
         </desc>
@@ -1183 +1183 @@
       <param name="snapshotId" type="wstring" dir="in">
         <desc>
-          ID of the discarded snapshot. <tt>null</tt> means the
-          current machine state has been discarded (restored from
-          the current snapshot).
+          ID of the discarded snapshot. @c null means the current machine
+          state has been discarded (restored from the current snapshot).
         </desc>
       </param>
@@ -1344 +1343 @@
   <interface
     name="IVirtualBox" extends="$dispatched"
-    uuid="54bf05ec-3fa9-4735-b92e-76e7c6c7e2be"
+    uuid="3f4ab53a-199b-4526-a91a-93ff62e456b8"
     wsmap="managed"
   >
@@ -1419 +1418 @@
           x.y-platform
         </pre>
-        where <tt>x</tt> and <tt>y</tt> are the major and the minor format
-        versions, and <tt>platform</tt> is the platform identifier.
+        where @c x and @c y are the major and the minor format
+        versions, and @c platform is the platform identifier.
 
         The current version usually matches the value of the
@@ -1455 +1454 @@
           x.y-platform
         </pre>
-        where <tt>x</tt> and <tt>y</tt> are the major and the minor format
-        versions, and <tt>platform</tt> is the platform identifier.
+        where @c x and @c y are the major and the minor format
+        versions, and @c platform is the platform identifier.
 
         VirtualBox uses this version of the format when saving settings files
@@ -1582 +1581 @@
         directory</link>.
 
-        If @a baseFolder is a null or empty string (which is recommended), the
+        If @a baseFolder is a @c null or empty string (which is recommended), the
         <link to="ISystemProperties::defaultMachineFolder">default machine
         settings folder</link> will be used as a base folder for the created
@@ -1597 +1596 @@
         Optionally, you may specify an UUID of to assign to the created machine.
         However, this is not recommended and you should normally pass an empty
-        (null) UUID to this method so that a new UUID will be automatically
+        (@c null) UUID to this method so that a new UUID will be automatically
         generated for every created machine. You can use UUID
-        00000000-0000-0000-0000-000000000000 as null value.
+        00000000-0000-0000-0000-000000000000 as @c null value.
 
         <note>
@@ -1614 +1613 @@
         </result>
         <result name="E_INVALIDARG">
-          @a name is empty or null.
+          @a name is empty or @c null.
         </result>
       </desc>
@@ -1674 +1673 @@
         </result>
         <result name="E_INVALIDARG">
-          @a name or @a settingsFile is empty or null.
+          @a name or @a settingsFile is empty or @c null.
         </result>
       </desc>
@@ -1722 +1721 @@
       <note>
         <link to="IMachine::settingsModified"/> will return
-        false for the created machine, until any of machine settings
+        @c false for the created machine, until any of machine settings
         are changed.
       </note>
@@ -1867 +1866 @@
         installation can be obtained using
         <link to="ISystemProperties::hardDiskFormats"/>. If the @a format
-        attribute is empty or <tt>null</tt> then the default storage format
+        attribute is empty or @c null then the default storage format
         specified by <link to="ISystemProperties::defaultHardDiskFormat"/> will
         be used for creating a storage unit of the hard disk.
@@ -1883 +1882 @@
         </result>
         <result name="E_INVALIDARG">
-          @a format is a null or empty string.
+          @a format is a @c null or empty string.
         </result>
       </desc>
@@ -2079 +2078 @@
         <desc>
           UUID to assign to the given image within this VirtualBox installation.
-          If an empty (null) UUID is specified, the system will randomly
+          If an empty (@c null) UUID is specified, the system will randomly
           generate a new UUID.
         </desc>
@@ -2179 +2178 @@
         <desc>
           UUID to assign to the given image file within this VirtualBox
-          installation. If an empty (null) UUID is specified, the system will
+          installation. If an empty (@c null) UUID is specified, the system will
           randomly generate a new UUID.
         </desc>
@@ -2313 +2312 @@
         Returns the global extra data key name following the supplied key.
 
-        An error is returned if the supplied @a key does not exist. @c NULL is
+        An error is returned if the supplied @a key does not exist. @c null is
         returned in @a nextKey if the supplied key is the last key. When
-        supplying @c NULL or an empty string for the @a key, the first key item
+        supplying @c null or an empty string for the @a key, the first key item
         is returned in @a nextKey (if there is any). @a nextValue is an optional
         parameter and if supplied, the next key's value is returned in it.
@@ -2340 +2339 @@
 
         If the requested data @a key does not exist, this function will
-        succeed and return @c NULL in the @a value argument.
+        succeed and return @c null in the @a value argument.
 
         <result name="VBOX_E_FILE_ERROR">
@@ -2362 +2361 @@
         Sets associated global extra data.
 
-        If you pass @c NULL as a key @a value, the given @a key will be
+        If you pass @c null as a key @a value, the given @a key will be
         deleted.
 
@@ -2521 +2520 @@
         argument) are:
         <ul>
-          <li><tt>gui</tt>: VirtualBox Qt GUI session</li>
-          <li><tt>vrdp</tt>: VirtualBox VRDP Server session</li>
-          <li><tt>sdl</tt>: VirtualBox SDL GUI session</li>
+          <li><tt>"gui"</tt>: VirtualBox Qt GUI session</li>
+          <li><tt>"vrdp"</tt>: VirtualBox VRDP Server session</li>
+          <li><tt>"sdl"</tt>: VirtualBox SDL GUI session</li>
         </ul>
 
@@ -2649 +2648 @@
 
         <result name="E_INVALIDARG">
-          A @c NULL callback cannot be registered.
+          A @c null callback cannot be registered.
         </result>
 
@@ -2807 +2806 @@
 
         If the given backup file already exists, this method will try to add the
-        <tt>.N</tt> suffix to the backup file name (where <tt>N</tt> counts from
+        <tt>.N</tt> suffix to the backup file name (where @c N counts from
         0 to 9) and copy it again until it succeeds. If all suffixes are
         occupied, or if any other copy error occurs, this method will return a
@@ -3664 +3663 @@
         the configuration remains unchanged. Please see the documentation for getDescription()
         for valid configuration values for the individual array item types. If the
-        corresponding item in the aEnabled array is false, the configuration value is ignored.
+        corresponding item in the aEnabled array is @c false, the configuration value is ignored.
       </desc>
 
@@ -3710 +3709 @@
   <interface
      name="IInternalMachineControl" extends="$unknown"
-     uuid="5595cae1-6b18-42c1-b416-bc7493a87618"
+     uuid="ce8087d7-de92-4bbb-8140-a22fb07f37ba"
      internal="yes"
      wsmap="suppress"
      >
+    <method name="setRemoveSavedState">
+      <desc>
+        Updates the flag whether saved state is removed on a machine state
+        change from Saved to PowerOff.
+      </desc>
+      <param name="aRemove" type="boolean" dir="in"/>
+    </method>
+
     <method name="updateState">
       <desc>
@@ -3758 +3765 @@
     <method name="detachUSBDevice">
       <desc>
-        Notification that a VM is going to detach (done = false) or has
-        already detached (done = true) the given USB device.
-        When the done = true request is completed, the VM process will
+        Notification that a VM is going to detach (@a done = @c false) or has
+        already detached (@a done = @c true) the given USB device.
+        When the @a done = @c true request is completed, the VM process will
         get a <link to="IInternalSessionControl::onUSBDeviceDetach"/>
         notification.
         <note>
-          In the done = true case, the server must run its own filters
+          In the @a done = @c true case, the server must run its own filters
           and filters of all VMs but this one on the detached device
           as if it were just attached to the host computer.
@@ -3786 +3793 @@
         Notification that a VM that is being powered down. The done
         parameter indicates whether which stage of the power down
-        we're at. When done = false the VM is announcing its
-        intentions, while when done = true the VM is reporting
+        we're at. When @a done = @c false the VM is announcing its
+        intentions, while when @a done = @c true the VM is reporting
         what it has done.
         <note>
-          In the done = true case, the server must run its own filters
+          In the @a done = @c true case, the server must run its own filters
           and filters of all VMs but this one on all detach devices as
           if they were just attached to the host computer.
@@ -3849 +3856 @@
 
       <param name="success" type="boolean" dir="in">
-        <desc><tt>true</tt> to indicate success and <tt>false</tt>
-          otherwise.
+        <desc>@c true to indicate success and @c false otherwise.
         </desc>
       </param>
@@ -3915 +3921 @@
 
       <param name="success" type="boolean" dir="in">
-        <desc><tt>true</tt> to indicate success and <tt>false</tt> otherwise</desc>
+        <desc>@c true to indicate success and @c false otherwise</desc>
       </param>
     </method>
@@ -4197 +4203 @@
         </ul>
 
-        Otherwise, the value of this property is always <tt>true</tt>.
+        Otherwise, the value of this property is always @c true.
 
         Every time this property is read, the accessibility state of
-        this machine is re-evaluated. If the returned value is |false|,
+        this machine is re-evaluated. If the returned value is @c false,
         the <link to="#accessError"/> property may be used to get the
         detailed error information describing the reason of
@@ -4226 +4232 @@
         <note>
           In the current implementation, once this property returns
-          <tt>true</tt>, the machine will never become inaccessible
+          @c true, the machine will never become inaccessible
           later, even if its settings file cannot be successfully
           read/written any more (at least, until the VirtualBox
@@ -4241 +4247 @@
 
         Reading this property is only valid after the last call to
-        <link to="#accessible"/> returned <tt>false</tt> (i.e. the
-        machine is currently unaccessible). Otherwise, a null
+        <link to="#accessible"/> returned @c false (i.e. the
+        machine is currently unaccessible). Otherwise, a @c null
         IVirtualBoxErrorInfo object will be returned.
       </desc>
@@ -4416 +4422 @@
 
         <note>
-          Setting this property to <tt>null</tt> will restore the
+          Setting this property to @c null will restore the
           initial value.
         </note>
@@ -4483 +4489 @@
           x.y-platform
         </pre>
-        where <tt>x</tt> and <tt>y</tt> are the major and the minor format
-        versions, and <tt>platform</tt> is the platform identifier.
+        where @c x and @c y are the major and the minor format
+        versions, and @c platform is the platform identifier.
 
         The current version usually matches the value of the
@@ -4526 +4532 @@
         <note>
           For newly created unregistered machines, the value of this
-          property is always TRUE until <link to="#saveSettings"/>
+          property is always @c true until <link to="#saveSettings"/>
           is called (no matter if any machine settings have been
           changed after the creation or not). For opened machines
-          the value is set to FALSE (and then follows to normal rules).
+          the value is set to @c false (and then follows to normal rules).
         </note>
       </desc>
@@ -4579 +4585 @@
         the machine when it is in the <link to="MachineState_Saved"/> state.
         <note>
-          When the machine is not in the Saved state, this attribute
-          <tt>null</tt>.
+          When the machine is not in the Saved state, this attribute is
+          @c null.
         </note>
       </desc>
@@ -4599 +4605 @@
         Current snapshot of this machine.
         <note>
-          A <tt>null</tt> object is returned if the machine doesn't
+          A @c null object is returned if the machine doesn't
           have snapshots.
         </note>
@@ -4615 +4621 @@
     <attribute name="currentStateModified" type="boolean" readonly="yes">
       <desc>
-        Returns <tt>true</tt> if the current state of the machine is not
+        Returns @c true if the current state of the machine is not
         identical to the state stored in the current snapshot.
 
@@ -4626 +4632 @@
           <li><link to="IConsole::takeSnapshot"/> (issued on a
             powered off or saved machine, for which
-            <link to="#settingsModified"/> returns <tt>false</tt>)
+            <link to="#settingsModified"/> returns @c false)
           </li>
           <li><link to="IMachine::setCurrentSnapshot"/>
@@ -4643 +4649 @@
         <note>
           For machines that don't have snapshots, this property is
-          always <tt>false</tt>.
+          always @c false.
         </note>
       </desc>
@@ -4695 +4701 @@
       <param name="position" type="unsigned long" dir="in">
         <desc>
-          Position in the boot order (<tt>1</tt> to the total number of
+          Position in the boot order (@c 1 to the total number of
           devices the machine can boot from, as returned by
           <link to="ISystemProperties::maxBootPosition"/>).
@@ -4729 +4735 @@
       <param name="position" type="unsigned long" dir="in">
         <desc>
-          Position in the boot order (<tt>1</tt> to the total number of
+          Position in the boot order (@c 1 to the total number of
           devices the machine can boot from, as returned by
           <link to="ISystemProperties::maxBootPosition"/>).
@@ -5007 +5013 @@
         supplied key.
 
-        An error is returned if the supplied @a key does not exist. @c NULL is
+        An error is returned if the supplied @a key does not exist. @c null is
         returned in @a nextKey if the supplied key is the last key. When
-        supplying @c NULL for the @a key, the first key item is returned in
+        supplying @c null for the @a key, the first key item is returned in
         @a nextKey (if there is any). @a nextValue is an optional parameter and
         if supplied, the next key's value is returned in it.
@@ -5034 +5040 @@
 
         If the requested data @a key does not exist, this function will
-        succeed and return @c NULL in the @a value argument.
+        succeed and return @c null in the @a value argument.
 
         <result name="VBOX_E_FILE_ERROR">
@@ -5056 +5062 @@
         Sets associated machine-specific extra data.
 
-        If you pass @c NULL as a key @a value, the given @a key will be
+        If you pass @c null as a key @a value, the given @a key will be
         deleted.
 
@@ -5149 +5155 @@
 
         If the given backup file already exists, this method will try to add the
-        <tt>.N</tt> suffix to the backup file name (where <tt>N</tt> counts from
+        <tt>.N</tt> suffix to the backup file name (where @c N counts from
         0 to 9) and copy it again until it succeeds. If all suffixes are
         occupied, or if any other copy error occurs, this method will return a
@@ -5215 +5221 @@
         to succeed.
         <note>
-          <link to="#settingsModified"/> will return TRUE after this
+          <link to="#settingsModified"/> will return @c true after this
           method successfully returns.
         </note>
@@ -5258 +5264 @@
       <desc>
         Returns a snapshot of this machine with the given UUID.
-        A <tt>null</tt> UUID can be used to obtain the first snapshot
+        A @c null UUID can be used to obtain the first snapshot
         taken on this machine. This is useful if you want to traverse
         the whole tree of snapshots starting from the root.
@@ -5367 +5373 @@
       <param name="canShow" type="boolean" dir="return">
         <desc>
-          @c true if the console window can be shown and @c
-          false otherwise.
+          @c true if the console window can be shown and @c false otherwise.
         </desc>
       </param>
@@ -5564 +5569 @@
         <desc>
           The patterns to match the properties against, separated by '|'
-          characters.  If this is empty or NULL, all properties will match.
+          characters.  If this is empty or @c null, all properties will match.
         </desc>
       </param>
@@ -5829 +5834 @@
       <param name="attached" type="boolean" dir="in">
         <desc>
-          <tt>true</tt> if the device was attached
-          and <tt>false</tt> otherwise.
+          @c true if the device was attached and @c false otherwise.
         </desc>
       </param>
       <param name="error" type="IVirtualBoxErrorInfo" dir="in">
         <desc>
-          <tt>null</tt> on success or an error message object on
-          failure.
+          @c null on success or an error message object on failure.
         </desc>
       </param>
@@ -5872 +5875 @@
 
         <b>Fatal</b> errors are indicated by the @a fatal parameter set
-        to <tt>true</tt>. In case of fatal errors, the virtual machine
+        to @c true. In case of fatal errors, the virtual machine
         execution is always paused before calling this notification, and
         the notification handler is supposed either to immediately save
@@ -5880 +5883 @@
 
         <b>Non-fatal</b> errors and warnings are indicated by the
-        @a fatal parameter set to <tt>false</tt>. If the virtual machine
+        @a fatal parameter set to @c false. If the virtual machine
         is in the Paused state by the time the error notification is
         received, it means that the user can <i>try to resume</i> the machine
@@ -5953 +5956 @@
       <param name="canShow" type="boolean" dir="return">
         <desc>
-          @c true if the console window can be shown and @c
-          false otherwise.
+          @c true if the console window can be shown and @c false otherwise.
         </desc>
       </param>
@@ -6109 +6111 @@
   <interface
      name="IConsole" extends="$unknown"
-     uuid="a7f17a42-5b64-488d-977b-4b2c639ada27"
+     uuid="0a51994b-cbc6-4686-94eb-d4e4023280e2"
      wsmap="managed"
      >
@@ -6297 +6299 @@
     <method name="powerDown">
       <desc>
-        Stops the virtual machine execution.
-        After this operation completes, the machine will go to the
-        PoweredOff state.
-
-        @deprecated This method will be removed in VirtualBox 2.1 where the
-        powerDownAsync() method will take its name. Do not use this method in
-        the code.
-        <result name="VBOX_E_INVALID_VM_STATE">
-          Virtual machine must be Running, Paused or Stuck to be powered down.
-        </result>
-        <result name="VBOX_E_VM_ERROR">
-          Unable to power off or destroy virtual machine.
-        </result>
-      </desc>
-    </method>
-
-    <method name="powerDownAsync">
-      <desc>
         Initiates the power down procedure to stop the virtual machine
         execution.
@@ -6321 +6305 @@
         IProgress object. After the operation is complete, the machine will go
         to the PoweredOff state.
-
-        @warning This method will be renamed to "powerDown" in VirtualBox 2.1
-        where the original powerDown() method will be removed. You will need to
-        rename "powerDownAsync" to "powerDown" in your sources to make them
-        build with version 2.1.
         <result name="VBOX_E_INVALID_VM_STATE">
           Virtual machine must be Running, Paused or Stuck to be powered down.
@@ -6401 +6380 @@
     <method name="getGuestEnteredACPIMode">
       <desc>Checks if the guest entered the ACPI mode G0 (working) or
-        G1 (sleeping). If this method returns false, the guest will
+        G1 (sleeping). If this method returns @c false, the guest will
         most likely not respond to external ACPI events.
         <result name="VBOX_E_INVALID_VM_STATE">
@@ -6483 +6462 @@
     </method>
 
-    <method name="discardSavedState">
-      <desc>
-        Discards (deletes) the saved state of the virtual machine
-        previously created by <link to="#saveState"/>. Next time the
-        machine is powered up, a clean boot will occur.
+    <method name="forgetSavedState">
+      <desc>
+        Forgets the saved state of the virtual machine previously created
+        by <link to="#saveState"/>. Next time the machine is powered up, a
+        clean boot will occur. If @a remove is @c true the saved state file
+        is deleted.
         <note>
           This operation is equivalent to resetting or powering off
@@ -6496 +6476 @@
         </result>
       </desc>
+      <param name="remove" type="boolean" dir="in">
+        <desc>If @c true remove the saved state file.</desc>
+      </param>
     </method>
 
@@ -6708 +6691 @@
         children at all (i.e. the first snapshot is the only snapshot of
         the machine), both the current and the first snapshot of the
-        machine will be set to null. In all other cases, the first
+        machine will be set to @c null. In all other cases, the first
         snapshot cannot be discarded.
 
@@ -6799 +6782 @@
           If the machine state is <link to="MachineState_Saved">Saved</link>
           prior to this operation, the saved state file will be implicitly
-          discarded (as if <link to="IConsole::discardSavedState"/> were
+          discarded (as if <link to="IConsole::forgetSavedState"/> were
           called).
         </note>
@@ -6845 +6828 @@
           If the machine state is <link to="MachineState_Saved">Saved</link>
           prior to this operation, the saved state file will be implicitly
-          discarded (as if <link to="#discardSavedState"/> were
+          discarded (as if <link to="#forgetSavedState"/> were
           called).
         </note>
@@ -7245 +7228 @@
       <param name="description" type="wstring" dir="return">
         <desc>
-          Model string. A NULL string is returned if value is not known or
+          Model string. A @c null string is returned if value is not known or
           @a cpuId is invalid.
         </desc>
@@ -7272 +7255 @@
 
     <attribute name="Acceleration3DAvailable" type="boolean" readonly="yes">
-      <desc>Returns true when the host supports 3D hardware acceleration.</desc>
+      <desc>Returns @c true when the host supports 3D hardware acceleration.</desc>
     </attribute>
 
@@ -7321 +7304 @@
       <desc>
         Creates a new USB device filter. All attributes except
-        the filter name are set to <tt>null</tt> (any match),
-        <i>active</i> is <tt>false</tt> (the filter is not active).
+        the filter name are set to @c null (any match),
+        <i>active</i> is @c false (the filter is not active).
 
         The created filter can be added to the list of filters using
@@ -7345 +7328 @@
         in the list of filters.
 
-        Positions are numbered starting from <tt>0</tt>. If the specified
+        Positions are numbered starting from @c 0. If the specified
         position is equal to or greater than the number of elements in
         the list, the filter is added at the end of the collection.
@@ -7381 +7364 @@
         list of filters.
 
-        Positions are numbered starting from <tt>0</tt>. Specifying a
+        Positions are numbered starting from @c 0. Specifying a
         position equal to or greater than the number of elements in
         the list will produce an error.
@@ -7613 +7596 @@
 
         <note>
-          Setting this property to <tt>null</tt> will restore the
+          Setting this property to @c null will restore the
           initial value.
         </note>
@@ -7651 +7634 @@
 
         <note>
-          Setting this property to <tt>null</tt> will restore the
-          initial value.
+          Setting this property to @c null will restore the initial value.
         </note>
         <note>
@@ -7707 +7689 @@
         The hard disk format set by this attribute is used by VirtualBox
         when the hard disk format was not specified explicitly. One example is
-        <link to="IVirtualBox::createHardDisk"/> with the <tt>null</tt>
+        <link to="IVirtualBox::createHardDisk"/> with the @c null
         format argument. A more complex example is implicit creation of
         differencing hard disks when taking a snapshot of a virtual machine:
@@ -7720 +7702 @@
         unexpectedly.
 
-        The initial value of this property is <tt>VDI</tt> in the current
+        The initial value of this property is <tt>"VDI"</tt> in the current
         version of the VirtualBox product, but may change in the future.
 
         <note>
-          Setting this property to <tt>null</tt> will restore the
-          initial value.
+          Setting this property to @c null will restore the initial value.
         </note>
 
@@ -7746 +7727 @@
         system's default library path.
 
-        The default value of this property is <tt>VRDPAuth</tt>. There is a library
+        The default value of this property is <tt>"VRDPAuth"</tt>. There is a library
         of that name in one of the default VirtualBox library directories.
 
@@ -7753 +7734 @@
 
         <note>
-          Setting this property to <tt>null</tt> will restore the
+          Setting this property to @c null will restore the
           initial value.
         </note>
@@ -7769 +7750 @@
         there is no per-VM setting for this, as the webservice is a global
         resource (if it is running). Only for this setting (for the webservice),
-        setting this value to a literal "null" string disables authentication,
+        setting this value to a literal <tt>"null"</tt> string disables authentication,
         meaning that <link to="IWebsessionManager::logon" /> will always succeed,
         no matter what user name and password are supplied.
 
-        The initial value of this property is <tt>VRDPAuth</tt>,
+        The initial value of this property is <tt>"VRDPAuth"</tt>,
         meaning that the webservice will use the same authentication
         library that is used by default for VBoxVRDP (again, see
@@ -8010 +7991 @@
         create and manipulate progress objects, whereas client code
         can only use the IProgress object to monitor a task's
-        progress and, if <link to="#cancelable" /> is true,
+        progress and, if <link to="#cancelable" /> is @c true,
         cancel the task by calling <link to="#cancel" />.
 
@@ -8050 +8031 @@
         Current progress value of the task as a whole, in percent.
         This value depends on how many operations are already complete.
-        Returns 100 if <link to="#completed" /> is true.
+        Returns 100 if <link to="#completed" /> is @c true.
       </desc>
     </attribute>
@@ -8079 +8060 @@
       <desc>
         Result code of the progress task.
-        Valid only if <link to="#completed"/> is true.
+        Valid only if <link to="#completed"/> is @c true.
       </desc>
     </attribute>
@@ -8086 +8067 @@
       <desc>
         Extended information about the unsuccessful result of the
-        progress operation. May be NULL if no extended information
+        progress operation. May be @c null if no extended information
         is available.
-        Valid only if <link to="#completed"/> is true and
+        Valid only if <link to="#completed"/> is @c true and
         <link to="#resultCode"/> indicates a failure.
       </desc>
@@ -8158 +8139 @@
         Cancels the task.
         <note>
-          If <link to="#cancelable"/> is <tt>false</tt>, then
-          this method will fail.
+          If <link to="#cancelable"/> is @c false, then this method will fail.
         </note>
 
@@ -8236 +8216 @@
       cannot be changed.
 
-      The current snapshot is <tt>null</tt> if the machine doesn't have
+      The current snapshot is @c null if the machine doesn't have
       snapshots at all; in this case the current machine state is just
       current settings of this machine plus its current execution state.
@@ -8337 +8317 @@
     <attribute name="online" type="boolean" readonly="yes">
       <desc>
-        <tt>true</tt> if this snapshot is an online snapshot and
-        <tt>false</tt> otherwise.
-
-        <note>
-          When this attribute is <tt>true</tt>, the
+        @c true if this snapshot is an online snapshot and @c false otherwise.
+
+        <note>
+          When this attribute is @c true, the
           <link to="IMachine::stateFilePath"/> attribute of the
           <link to="#machine"/> object associated with this snapshot
           will point to the saved state file. Otherwise, it will be
-          <tt>null</tt>.
+          @c null.
         </note>
       </desc>
@@ -8366 +8345 @@
         <note>
           It's not an error to read this attribute on a snapshot
-          that doesn't have a parent -- a null object will be
+          that doesn't have a parent -- a @c null object will be
           returned to indicate this.
         </note>
@@ -8522 +8501 @@
       created for the first time), all known media are in the
       <link to="MediaState_Inaccessible"/> state but the value of the <link
-      to="#lastAccessError"/> attribute is <tt>null</tt> because no actual
+      to="#lastAccessError"/> attribute is @c null because no actual
       accessibility check is made on startup. This is done to make the
       VirtualBox object ready for serving requests as
@@ -8545 +8524 @@
       <desc>
         Optional description of the medium. For newly created media, the value
-        of this attribute value is <tt>null</tt>.
+        of this attribute value is @c null.
 
         Media types that don't support this attribute will return E_NOTIMPL in
@@ -8580 +8559 @@
         medium is <link to="MediaState_LockedRead"/> or
         <link to="MediaState_LockedWrite"/> then it remains the same, and a
-        non-null value of <link to="#lastAccessError"/> will indicate a failed
+        non-@c null value of <link to="#lastAccessError"/> will indicate a failed
         accessibility check in this case.
 
@@ -8653 +8632 @@
         Accessibility checks are performed each time the <link to="#state"/>
         attribute is read. A @c null string is returned if the last
-        accessibility check was successful. A non-null string indicates a
+        accessibility check was successful. A non-@c null string indicates a
         failure and should normally describe a reason of the failure (for
         example, a file read error).
@@ -8663 +8642 @@
         Array of UUIDs of all machines this medium is attached to.
 
-        A <tt>null</tt> array is returned if this medium is not attached to any
+        A @c null array is returned if this medium is not attached to any
         machine or to any machine's snapshot.
 
@@ -8688 +8667 @@
         the array will contain only snapshot IDs.
 
-        The returned array may be <tt>null</tt> if this medium is not attached
+        The returned array may be @c null if this medium is not attached
         to the given machine at all, neither in the current state nor in one of
         the snapshots.
@@ -9028 +9007 @@
       querying the <link to="#parent"/> attribute: base hard disks do not have
       parents they would depend on, so the value of this attribute is always
-      <tt>null</tt> for them. Using this attribute, it is possible to walk up
+      @c null for them. Using this attribute, it is possible to walk up
       the hard disk tree (from the child hard disk to its parent). It is also
       possible to walk down the tree using the <link to="#children"/>
@@ -9310 +9289 @@
 
         Only differencing hard disks have parents. For base (non-differencing)
-        hard disks, <tt>null</tt> is returned.
+        hard disks, @c null is returned.
       </desc>
     </attribute>
@@ -9317 +9296 @@
       <desc>
         Children of this hard disk (all differencing hard disks directly based
-        on this hard disk). A <tt>null</tt> array is returned if this hard disk
+        on this hard disk). A @c null array is returned if this hard disk
         does not have any children.
       </desc>
@@ -9335 +9314 @@
     <attribute name="readOnly" type="boolean" readonly="yes">
       <desc>
-        Returns <tt>true</tt> if this hard disk is read-only and <tt>false</tt>
-        otherwise.
+        Returns @c true if this hard disk is read-only and @c false otherwise.
 
         A hard disk is considered to be read-only when its contents cannot be
@@ -9347 +9325 @@
         The value of this attribute can be used to determine the kind of the
         attachment that will take place when attaching this hard disk to a
-        virtual machine. If the value is <tt>false</tt> then the hard disk will
-        be attached directly. If the value is <tt>true</tt> then the hard disk
+        virtual machine. If the value is @c false then the hard disk will
+        be attached directly. If the value is @c true then the hard disk
         will be attached indirectly by creating a new differencing child hard
         disk for that. See the interface description for more information.
@@ -9396 +9374 @@
         <note>
           Reading this property on a base (non-differencing) hard disk will
-          always <tt>false</tt>. Changing the value of this property in this
+          always @c false. Changing the value of this property in this
           case is not supported.
         </note>
@@ -9416 +9394 @@
         be obtained with <link to="IHardDiskFormat::describeProperties"/>.
 
-        Note that if this method returns a <tt>null</tt> @a value, the requested
+        Note that if this method returns a @c null @a value, the requested
         property is supported but currently not assigned any value.
 
@@ -9422 +9400 @@
           Requested property does not exist (not supported by the format).
         </result>
-        <result name="E_INVALIDARG">@a name is NULL or empty.</result>
+        <result name="E_INVALIDARG">@a name is @c null or empty.</result>
       </desc>
       <param name="name" type="wstring" dir="in">
@@ -9439 +9417 @@
         be obtained with <link to="IHardDiskFormat::describeProperties"/>.
 
-        Note that setting the property value to <tt>null</tt> is equivalent to
+        Note that setting the property value to @c null is equivalent to
         deleting the existing value. A default value (if it is defined for this
         property) will be used by the format backend in this case.
@@ -9446 +9424 @@
           Requested property does not exist (not supported by the format).
         </result>
-        <result name="E_INVALIDARG">@a name is NULL or empty.</result>
+        <result name="E_INVALIDARG">@a name is @c null or empty.</result>
       </desc>
       <param name="name" type="wstring" dir="in">
@@ -9462 +9440 @@
         The names of the properties to get are specified using the @a names
         argument which is a list of comma-separated property names or
-        <tt>null</tt> if all properties are to be returned. Note that currently
+        @c null if all properties are to be returned. Note that currently
         the value of this argument is ignored and the method always returns all
         existing properties.
@@ -9476 +9454 @@
 
         Note that for properties that do not have assigned values,
-        <tt>null</tt> is returned at the appropriate index in the
+        @c null is returned at the appropriate index in the
         @a returnValues array.
 
@@ -9514 +9492 @@
         be obtained with <link to="IHardDiskFormat::describeProperties"/>.
 
-        Note that setting the property value to <tt>null</tt> is equivalent to
+        Note that setting the property value to @c null is equivalent to
         deleting the existing value. A default value (if it is defined for this
         property) will be used by the format backend in this case.
@@ -9737 +9715 @@
 
         The @a parent argument defines which hard disk will be the parent
-        of the clone. Passing a NULL reference indicates that the clone will
+        of the clone. Passing a @c null reference indicates that the clone will
         be a base image, i.e. completely independent. It is possible to specify
         an arbitrary hard disk for this parameter, including the parent of the
@@ -9940 +9918 @@
         Identifier of this format.
 
-        The format identifier is a non-null non-empty ASCII string. Note that
+        The format identifier is a non-@c null non-empty ASCII string. Note that
         this string is case-insensitive. This means that, for example, all of
         the following strings:
@@ -9998 +9976 @@
         The returned arrays are filled in only if the
         <link to="HardDiskFormatCapabilities_Properties"/> flag is set.
-        All arguments must be non-NULL.
+        All arguments must be non-@c null.
 
         <see>DataType</see>
@@ -10373 +10351 @@
       <param name="x" type="long" dir="in">
         <desc>
-          X coordinate of the pointer in pixels, starting from <tt>1</tt>.
+          X coordinate of the pointer in pixels, starting from @c 1.
         </desc>
       </param>
       <param name="y" type="long" dir="in">
         <desc>
-          Y coordinate of the pointer in pixels, starting from <tt>1</tt>.
+          Y coordinate of the pointer in pixels, starting from @c 1.
         </desc>
       </param>
@@ -10397 +10375 @@
             <tr><td>Bit 2 (<tt>0x04</tt>)</td><td>middle mouse button</td></tr>
           </table>
-          A value of <tt>1</tt> means the corresponding button is pressed.
+          A value of @c 1 means the corresponding button is pressed.
           otherwise it is released.
         </desc>
@@ -10510 +10488 @@
         visible until the affected portion of IFramebuffer is updated.  The
         overlay can be created lazily the first time it is requested.  This
-        attribute can also return NULL to signal that the overlay is not
+        attribute can also return @c null to signal that the overlay is not
         implemented.
       </desc>
@@ -10591 +10569 @@
         free to choose which mode to use. To indicate that this frame buffer uses
         the direct mode, the implementation of the <link to="#usesGuestVRAM"/>
-        attribute must return <tt>true</tt> and <link to="#address"/> must
+        attribute must return @c true and <link to="#address"/> must
         return exactly the same address that is passed in the @a VRAM parameter
         of this method; otherwise it is assumed that the indirect strategy is
@@ -10674 +10652 @@
         support a given video mode. In case it is not able to render
         the video mode (or for some reason not willing), it should
-        return false. Usually this method is called when the guest
+        return @c false. Usually this method is called when the guest
         asks the VMM device whether a given video mode is supported
         so the information returned is directly exposed to the guest.
@@ -10689 +10667 @@
         Returns the visible region of this frame buffer.
 
-        If the @a rectangles parameter is <tt>NULL</tt> then the value of the
+        If the @a rectangles parameter is @c null then the value of the
         @a count parameter is ignored and the number of elements necessary to
         describe the current visible region is returned in @a countCopied.
 
-        If @a rectangles is not <tt>NULL</tt> but @a count is less
+        If @a rectangles is not @c null but @a count is less
         than the required number of elements to store region data, the method
         will report a failure. If @a count is equal or greater than the
@@ -10708 +10686 @@
       </desc>
       <param name="rectangles" type="octet" mod="ptr" dir="in">
-        <desc>Pointer to the <tt>RTRECT</tt> array to receive region data.</desc>
+        <desc>Pointer to the @c RTRECT array to receive region data.</desc>
       </param>
       <param name="count" type="unsigned long" dir="in">
-        <desc>Number of <tt>RTRECT</tt> elements in the @a rectangles array.</desc>
+        <desc>Number of @c RTRECT elements in the @a rectangles array.</desc>
       </param>
       <param name="countCopied" type="unsigned long" dir="return">
@@ -10740 +10718 @@
       </desc>
       <param name="rectangles" type="octet" mod="ptr" dir="in">
-        <desc>Pointer to the <tt>RTRECT</tt> array.</desc>
+        <desc>Pointer to the @c RTRECT array.</desc>
       </param>
       <param name="count" type="unsigned long" dir="in">
-        <desc>Number of <tt>RTRECT</tt> elements in the @a rectangles array.</desc>
+        <desc>Number of @c RTRECT elements in the @a rectangles array.</desc>
       </param>
     </method>
@@ -10870 +10848 @@
         after a timeout retry.
 
-        Specifying <tt>0</tt> for either @a width, @a height or @a bitsPerPixel
+        Specifying @c 0 for either @a width, @a height or @a bitsPerPixel
         parameters means that the corresponding values should be taken from the
         current video mode (i.e. left unchanged).
@@ -10876 +10854 @@
         If the guest OS supports multi-monitor configuration then the @a display
         parameter specifies the number of the guest display to send the hint to:
-        <tt>0</tt> is the primary display, <tt>1</tt> is the first secondary and
+        @c 0 is the primary display, @c 1 is the first secondary and
         so on. If the multi-monitor configuration is not supported, @a display
-        must be <tt>0</tt>.
+        must be @c 0.
 
         <result name="E_INVALIDARG">
@@ -10897 +10875 @@
         <note>
           Calling this method has no effect if <link
-          to="IGuest::supportsSeamless"/> returns <tt>false</tt>.
+          to="IGuest::supportsSeamless"/> returns @c false.
         </note>
       </desc>
@@ -11120 +11098 @@
       <desc>
         Ethernet MAC address of the adapter, 12 hexadecimal characters. When setting
-        it to NULL, VirtualBox will generate a unique MAC address.
+        it to @c null, VirtualBox will generate a unique MAC address.
       </desc>
     </attribute>
@@ -11557 +11535 @@
       <desc>
         Creates a new USB device filter. All attributes except
-        the filter name are set to <tt>null</tt> (any match),
-        <i>active</i> is <tt>false</tt> (the filter is not active).
+        the filter name are set to @c null (any match),
+        <i>active</i> is @c false (the filter is not active).
 
         The created filter can then be added to the list of filters using
@@ -11795 +11773 @@
         </li>
         <li><i>Any match</i>. Any value of the corresponding device attribute
-          will match the given filter. An empty or <tt>null</tt> string is
+          will match the given filter. An empty or @c null string is
           used to construct this type of filtering expressions.
 
@@ -11816 +11794 @@
         Visible name for this filter.
         This name is used to visually distinguish one filter from another,
-        so it can neither be <tt>null</tt> nor an empty string.
+        so it can neither be @c null nor an empty string.
       </desc>
     </attribute>
@@ -12300 +12278 @@
         Accessibility checks are performed each time the <link to="#accessible"/>
         attribute is read. A @c null string is returned if the last
-        accessibility check was successful. A non-null string indicates a
+        accessibility check was successful. A non-@c null string indicates a
         failure and should normally describe a reason of the failure (for
         example, a file read error).
@@ -12344 +12322 @@
         Assigns the machine object associated with this direct-type
         session or informs the session that it will be a remote one
-        (if @a machine == NULL).
+        (if @a machine == @c null).
 
         <result name="VBOX_E_INVALID_VM_STATE">
@@ -12826 +12804 @@
     </desc>
     <const name="Null"         value="0">
-      <desc><tt>null</tt> value. Never used by the API.</desc>
+      <desc>@c null value. Never used by the API.</desc>
     </const>
     <const name="IDE"       value="1"/>
@@ -12842 +12820 @@
 
     <const name="Null"         value="0">
-      <desc><tt>null</tt> value. Never used by the API.</desc>
+      <desc>@c null value. Never used by the API.</desc>
     </const>
     <const name="LsiLogic"  value="1"/>

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -125 +125 @@
     STDMETHOD(PowerUp) (IProgress **aProgress);
     STDMETHOD(PowerUpPaused) (IProgress **aProgress);
-    STDMETHOD(PowerDown)();
-    STDMETHOD(PowerDownAsync) (IProgress **aProgress);
+    STDMETHOD(PowerDown) (IProgress **aProgress);
     STDMETHOD(Reset)();
     STDMETHOD(Pause)();
@@ -136 +135 @@
     STDMETHOD(SaveState) (IProgress **aProgress);
     STDMETHOD(AdoptSavedState) (IN_BSTR aSavedStateFile);
-    STDMETHOD(DiscardSavedState)();
+    STDMETHOD(ForgetSavedState)(BOOL aRemove);
     STDMETHOD(GetDeviceActivity) (DeviceType_T aDeviceType,
                                  DeviceActivity_T *aDeviceActivity);

trunk/src/VBox/Main/include/MachineImpl.h

@@ -906 +906 @@
 
     // IInternalMachineControl methods
+    STDMETHOD(SetRemoveSavedState)(BOOL aRemove);
     STDMETHOD(UpdateState)(MachineState_T machineState);
     STDMETHOD(GetIPCId)(BSTR *id);
@@ -1006 +1007 @@
     HRESULT updateMachineStateOnClient();
 
+    HRESULT mRemoveSavedState;
+
     SnapshotData mSnapshotData;
 

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 #include <VBox/com/Guid.h>
 #include <VBox/com/ErrorInfo.h>
-#include <VBox/com/errorprint_legacy.h>
+#include <VBox/com/errorprint.h>
 #include <VBox/com/EventQueue.h>
 
@@ -45 +45 @@
 #include <iprt/stream.h>
 #include <iprt/thread.h>
-
-#define printf RTPrintf
 
 
@@ -68 +66 @@
 
     Bstr name;
-    printf ("Getting machine name...\n");
-    CHECK_RC_RET (machine->COMGETTER(Name) (name.asOutParam()));
-    printf ("Name: {%ls}\n", name.raw());
-
-    printf("Getting machine GUID...\n");
-    Bstr guid;    
-    CHECK_RC (machine->COMGETTER(Id) (guid.asOutParam()));
+    RTPrintf ("Getting machine name...\n");
+    CHECK_ERROR_RET (machine, COMGETTER(Name) (name.asOutParam()), rc);
+    RTPrintf ("Name: {%ls}\n", name.raw());
+
+    RTPrintf("Getting machine GUID...\n");
+    Bstr guid;
+    CHECK_ERROR (machine, COMGETTER(Id) (guid.asOutParam()));
     if (SUCCEEDED (rc) && !guid.isEmpty()) {
-        printf ("Guid::toString(): {%s}\n", Utf8Str(guid).c_str());
+        RTPrintf ("Guid::toString(): {%s}\n", Utf8Str(guid).c_str());
     } else {
-        printf ("WARNING: there's no GUID!");
+        RTPrintf ("WARNING: there's no GUID!");
     }
 
     ULONG memorySize;
-    printf ("Getting memory size...\n");
-    CHECK_RC_RET (machine->COMGETTER(MemorySize) (&memorySize));
-    printf ("Memory size: %d\n", memorySize);
+    RTPrintf ("Getting memory size...\n");
+    CHECK_ERROR_RET (machine, COMGETTER(MemorySize) (&memorySize), rc);
+    RTPrintf ("Memory size: %d\n", memorySize);
 
     MachineState_T machineState;
-    printf ("Getting machine state...\n");
-    CHECK_RC_RET (machine->COMGETTER(State) (&machineState));
-    printf ("Machine state: %d\n", machineState);
+    RTPrintf ("Getting machine state...\n");
+    CHECK_ERROR_RET (machine, COMGETTER(State) (&machineState), rc);
+    RTPrintf ("Machine state: %d\n", machineState);
 
     BOOL modified;
-    printf ("Are any settings modified?...\n");
-    CHECK_RC (machine->COMGETTER(SettingsModified) (&modified));
+    RTPrintf ("Are any settings modified?...\n");
+    CHECK_ERROR (machine, COMGETTER(SettingsModified) (&modified));
     if (SUCCEEDED (rc))
-        printf ("%s\n", modified ? "yes" : "no");
+        RTPrintf ("%s\n", modified ? "yes" : "no");
 
     ULONG memorySizeBig = memorySize * 10;
-    printf("Changing memory size to %d...\n", memorySizeBig);
-    CHECK_RC (machine->COMSETTER(MemorySize) (memorySizeBig));
+    RTPrintf("Changing memory size to %d...\n", memorySizeBig);
+    CHECK_ERROR (machine, COMSETTER(MemorySize) (memorySizeBig));
 
     if (SUCCEEDED (rc))
     {
-        printf ("Are any settings modified now?...\n");
-        CHECK_RC_RET (machine->COMGETTER(SettingsModified) (&modified));
-        printf ("%s\n", modified ? "yes" : "no");
+        RTPrintf ("Are any settings modified now?...\n");
+        CHECK_ERROR_RET (machine, COMGETTER(SettingsModified) (&modified), rc);
+        RTPrintf ("%s\n", modified ? "yes" : "no");
         ASSERT_RET (modified, 0);
 
         ULONG memorySizeGot;
-        printf ("Getting memory size again...\n");
-        CHECK_RC_RET (machine->COMGETTER(MemorySize) (&memorySizeGot));
-        printf ("Memory size: %d\n", memorySizeGot);
+        RTPrintf ("Getting memory size again...\n");
+        CHECK_ERROR_RET (machine, COMGETTER(MemorySize) (&memorySizeGot), rc);
+        RTPrintf ("Memory size: %d\n", memorySizeGot);
         ASSERT_RET (memorySizeGot == memorySizeBig, 0);
 
         if (readonlyMachine)
         {
-            printf ("Getting memory size of the counterpart readonly machine...\n");
+            RTPrintf ("Getting memory size of the counterpart readonly machine...\n");
             ULONG memorySizeRO;
             readonlyMachine->COMGETTER(MemorySize) (&memorySizeRO);
-            printf ("Memory size: %d\n", memorySizeRO);
+            RTPrintf ("Memory size: %d\n", memorySizeRO);
             ASSERT_RET (memorySizeRO != memorySizeGot, 0);
         }
 
-        printf ("Discarding recent changes...\n");
-        CHECK_RC_RET (machine->DiscardSettings());
-        printf ("Are any settings modified after discarding?...\n");
-        CHECK_RC_RET (machine->COMGETTER(SettingsModified) (&modified));
-        printf ("%s\n", modified ? "yes" : "no");
+        RTPrintf ("Discarding recent changes...\n");
+        CHECK_ERROR_RET (machine, DiscardSettings(), rc);
+        RTPrintf ("Are any settings modified after discarding?...\n");
+        CHECK_ERROR_RET (machine, COMGETTER(SettingsModified) (&modified), rc);
+        RTPrintf ("%s\n", modified ? "yes" : "no");
         ASSERT_RET (!modified, 0);
 
-        printf ("Getting memory size once more...\n");
-        CHECK_RC_RET (machine->COMGETTER(MemorySize) (&memorySizeGot));
-        printf ("Memory size: %d\n", memorySizeGot);
+        RTPrintf ("Getting memory size once more...\n");
+        CHECK_ERROR_RET (machine, COMGETTER(MemorySize) (&memorySizeGot), rc);
+        RTPrintf ("Memory size: %d\n", memorySizeGot);
         ASSERT_RET (memorySizeGot == memorySize, 0);
 
         memorySize = memorySize > 128 ? memorySize / 2 : memorySize * 2;
-        printf("Changing memory size to %d...\n", memorySize);
-        CHECK_RC_RET (machine->COMSETTER(MemorySize) (memorySize));
+        RTPrintf("Changing memory size to %d...\n", memorySize);
+        CHECK_ERROR_RET (machine, COMSETTER(MemorySize) (memorySize), rc);
     }
 
     Bstr desc;
-    printf ("Getting description...\n");
+    RTPrintf ("Getting description...\n");
     CHECK_ERROR_RET (machine, COMGETTER(Description) (desc.asOutParam()), rc);
-    printf ("Description is: \"%ls\"\n", desc.raw());
+    RTPrintf ("Description is: \"%ls\"\n", desc.raw());
 
     desc = L"This is an exemplary description (changed).";
-    printf ("Setting description to \"%ls\"...\n", desc.raw());
+    RTPrintf ("Setting description to \"%ls\"...\n", desc.raw());
     CHECK_ERROR_RET (machine, COMSETTER(Description) (desc), rc);
 
-    printf ("Saving machine settings...\n");
-    CHECK_RC (machine->SaveSettings());
+    RTPrintf ("Saving machine settings...\n");
+    CHECK_ERROR (machine, SaveSettings());
     if (SUCCEEDED (rc))
     {
-        printf ("Are any settings modified after saving?...\n");
-        CHECK_RC_RET (machine->COMGETTER(SettingsModified) (&modified));
-        printf ("%s\n", modified ? "yes" : "no");
+        RTPrintf ("Are any settings modified after saving?...\n");
+        CHECK_ERROR_RET (machine, COMGETTER(SettingsModified) (&modified), rc);
+        RTPrintf ("%s\n", modified ? "yes" : "no");
         ASSERT_RET (!modified, 0);
 
         if (readonlyMachine) {
-            printf ("Getting memory size of the counterpart readonly machine...\n");
+            RTPrintf ("Getting memory size of the counterpart readonly machine...\n");
             ULONG memorySizeRO;
             readonlyMachine->COMGETTER(MemorySize) (&memorySizeRO);
-            printf ("Memory size: %d\n", memorySizeRO);
+            RTPrintf ("Memory size: %d\n", memorySizeRO);
             ASSERT_RET (memorySizeRO == memorySize, 0);
         }
@@ -169 +167 @@
     Bstr extraDataKey = L"Blafasel";
     Bstr extraData;
-    printf ("Getting extra data key {%ls}...\n", extraDataKey.raw());
-    CHECK_RC_RET (machine->GetExtraData (extraDataKey, extraData.asOutParam()));
+    RTPrintf ("Getting extra data key {%ls}...\n", extraDataKey.raw());
+    CHECK_ERROR_RET (machine, GetExtraData (extraDataKey, extraData.asOutParam()), rc);
     if (!extraData.isEmpty()) {
-        printf ("Extra data value: {%ls}\n", extraData.raw());
+        RTPrintf ("Extra data value: {%ls}\n", extraData.raw());
     } else {
         if (extraData.isNull())
-            printf ("No extra data exists\n");
+            RTPrintf ("No extra data exists\n");
         else
-            printf ("Extra data is empty\n");
+            RTPrintf ("Extra data is empty\n");
     }
 
@@ -184 +182 @@
     else
         extraData.setNull();
-    printf (
+    RTPrintf (
         "Setting extra data key {%ls} to {%ls}...\n",
         extraDataKey.raw(), extraData.raw()
     );
-    CHECK_RC (machine->SetExtraData (extraDataKey, extraData));
+    CHECK_ERROR (machine, SetExtraData (extraDataKey, extraData));
 
     if (SUCCEEDED (rc)) {
-        printf ("Getting extra data key {%ls} again...\n", extraDataKey.raw());
-        CHECK_RC_RET (machine->GetExtraData (extraDataKey, extraData.asOutParam()));
+        RTPrintf ("Getting extra data key {%ls} again...\n", extraDataKey.raw());
+        CHECK_ERROR_RET (machine, GetExtraData (extraDataKey, extraData.asOutParam()), rc);
         if (!extraData.isEmpty()) {
-            printf ("Extra data value: {%ls}\n", extraData.raw());
+            RTPrintf ("Extra data value: {%ls}\n", extraData.raw());
         } else {
             if (extraData.isNull())
-                printf ("No extra data exists\n");
+                RTPrintf ("No extra data exists\n");
             else
-                printf ("Extra data is empty\n");
+                RTPrintf ("Extra data is empty\n");
         }
     }
@@ -222 +220 @@
         char homeDir [RTPATH_MAX];
         GetVBoxUserHomeDirectory (homeDir, sizeof (homeDir));
-        printf ("VirtualBox Home Directory = '%s'\n", homeDir);
-    }
-
-    printf ("Initializing COM...\n");
-
-    CHECK_RC_RET (com::Initialize());
+        RTPrintf ("VirtualBox Home Directory = '%s'\n", homeDir);
+    }
+
+    RTPrintf ("Initializing COM...\n");
+
+    rc = com::Initialize();
+    if (FAILED(rc))
+    {
+        RTPrintf("ERROR: failed to initialize COM!\n");
+        return rc;
+    }
 
     do
@@ -242 +245 @@
 
     Utf8Str nullUtf8Str;
-    printf ("nullUtf8Str='%s'\n", nullUtf8Str.raw());
+    RTPrintf ("nullUtf8Str='%s'\n", nullUtf8Str.raw());
 
     Utf8Str simpleUtf8Str = "simpleUtf8Str";
-    printf ("simpleUtf8Str='%s'\n", simpleUtf8Str.raw());
+    RTPrintf ("simpleUtf8Str='%s'\n", simpleUtf8Str.raw());
 
     Utf8Str utf8StrFmt = Utf8StrFmt ("[0=%d]%s[1=%d]",
                                      0, "utf8StrFmt", 1);
-    printf ("utf8StrFmt='%s'\n", utf8StrFmt.raw());
-
-#endif
-
-    printf ("Creating VirtualBox object...\n");
-    CHECK_RC (virtualBox.createLocalObject (CLSID_VirtualBox));
+    RTPrintf ("utf8StrFmt='%s'\n", utf8StrFmt.raw());
+
+#endif
+
+    RTPrintf ("Creating VirtualBox object...\n");
+    rc = virtualBox.createLocalObject (CLSID_VirtualBox);
+    if (FAILED(rc))
+        RTPrintf("ERROR: failed to create the VirtualBox object!\n");
+    else
+    {
+        rc = session.createInprocObject(CLSID_Session);
+        if (FAILED(rc))
+            RTPrintf("ERROR: failed to create a session object!\n");
+    }
+
     if (FAILED (rc))
     {
-        CHECK_ERROR_NOCALL();
-        break;
-    }
-
-    printf ("Creating Session object...\n");
-    CHECK_RC (session.createInprocObject (CLSID_Session));
-    if (FAILED (rc))
-    {
-        CHECK_ERROR_NOCALL();
+        com::ErrorInfo info;
+        if (!info.isFullAvailable() && !info.isBasicAvailable())
+        {
+            com::GluePrintRCMessage(rc);
+            RTPrintf("Most likely, the VirtualBox COM server is not running or failed to start.\n");
+        }
+        else
+            com::GluePrintErrorInfo(info);
         break;
     }
@@ -276 +287 @@
     ////////////////////////////////////////////////////////////////////////////
     {
-        printf ("Testing VirtualBox::COMGETTER(ProgressOperations)...\n");
+        RTPrintf ("Testing VirtualBox::COMGETTER(ProgressOperations)...\n");
 
         for (;;) {
@@ -284 +295 @@
                 COMGETTER(ProgressOperations)(ComSafeArrayAsOutParam(operations)));
 
-            printf ("operations: %d\n", operations.size());
+            RTPrintf ("operations: %d\n", operations.size());
             if (operations.size() == 0)
                 break; // No more operations left.
@@ -292 +303 @@
 
                 operations[i]->COMGETTER(Percent)(&percent);
-                printf ("operations[%u]: %ld\n", (unsigned)i, (long)percent);
+                RTPrintf ("operations[%u]: %ld\n", (unsigned)i, (long)percent);
             }
             RTThreadSleep (2000); // msec
@@ -306 +317 @@
             ComPtr <IVirtualBox> virtualBox2;
 
-            printf ("Creating one more VirtualBox object...\n");
+            RTPrintf ("Creating one more VirtualBox object...\n");
             CHECK_RC (virtualBox2.createLocalObject (CLSID_VirtualBox));
             if (FAILED (rc))
@@ -314 +325 @@
             }
 
-            printf ("IVirtualBox(virtualBox)=%p IVirtualBox(virtualBox2)=%p\n",
+            RTPrintf ("IVirtualBox(virtualBox)=%p IVirtualBox(virtualBox2)=%p\n",
                     (IVirtualBox *) virtualBox, (IVirtualBox *) virtualBox2);
             Assert ((IVirtualBox *) virtualBox == (IVirtualBox *) virtualBox2);
@@ -322 +333 @@
             unk2 = virtualBox2;
 
-            printf ("IUnknown(virtualBox)=%p IUnknown(virtualBox2)=%p\n",
+            RTPrintf ("IUnknown(virtualBox)=%p IUnknown(virtualBox2)=%p\n",
                     (IUnknown *) unk, (IUnknown *) unk2);
             Assert ((IUnknown *) unk == (IUnknown *) unk2);
@@ -329 +340 @@
             ComPtr <IVirtualBox> vb2 = unk;
 
-            printf ("IVirtualBox(IUnknown(virtualBox))=%p IVirtualBox(IUnknown(virtualBox2))=%p\n",
+            RTPrintf ("IVirtualBox(IUnknown(virtualBox))=%p IVirtualBox(IUnknown(virtualBox2))=%p\n",
                     (IVirtualBox *) vb, (IVirtualBox *) vb2);
             Assert ((IVirtualBox *) vb == (IVirtualBox *) vb2);
@@ -337 +348 @@
             ComPtr <IHost> host;
             CHECK_ERROR_BREAK (virtualBox, COMGETTER(Host)(host.asOutParam()));
-            printf (" IHost(host)=%p\n", (IHost *) host);
+            RTPrintf (" IHost(host)=%p\n", (IHost *) host);
             ComPtr <IUnknown> unk = host;
-            printf (" IUnknown(host)=%p\n", (IUnknown *) unk);
+            RTPrintf (" IUnknown(host)=%p\n", (IUnknown *) unk);
             ComPtr <IHost> host_copy = unk;
-            printf (" IHost(host_copy)=%p\n", (IHost *) host_copy);
+            RTPrintf (" IHost(host_copy)=%p\n", (IHost *) host_copy);
             ComPtr <IUnknown> unk_copy = host_copy;
-            printf (" IUnknown(host_copy)=%p\n", (IUnknown *) unk_copy);
+            RTPrintf (" IUnknown(host_copy)=%p\n", (IUnknown *) unk_copy);
             Assert ((IUnknown *) unk == (IUnknown *) unk_copy);
 
@@ -349 +360 @@
             ComPtr <IUnknown> unk_copy_copy;
             unk_copy.queryInterfaceTo (unk_copy_copy.asOutParam());
-            printf (" IUnknown(unk_copy)=%p\n", (IUnknown *) unk_copy_copy);
+            RTPrintf (" IUnknown(unk_copy)=%p\n", (IUnknown *) unk_copy_copy);
             Assert ((IUnknown *) unk_copy == (IUnknown *) unk_copy_copy);
             /* query IUnknown on IUnknown in the opposite direction */
             unk_copy_copy.queryInterfaceTo (unk_copy.asOutParam());
-            printf (" IUnknown(unk_copy_copy)=%p\n", (IUnknown *) unk_copy);
+            RTPrintf (" IUnknown(unk_copy_copy)=%p\n", (IUnknown *) unk_copy);
             Assert ((IUnknown *) unk_copy == (IUnknown *) unk_copy_copy);
 
@@ -363 +374 @@
             unk_copy_copy.setNull();
             unk = host;
-            printf (" IUnknown(host)=%p\n", (IUnknown *) unk);
+            RTPrintf (" IUnknown(host)=%p\n", (IUnknown *) unk);
             Assert (oldUnk == (IUnknown *) unk);
         }
 
-//        printf ("Will be now released (press Enter)...");
+//        RTPrintf ("Will be now released (press Enter)...");
 //        getchar();
     }
@@ -383 +394 @@
         Bstr version;
         CHECK_ERROR_BREAK (virtualBox, COMGETTER(Version) (version.asOutParam()));
-        printf ("VirtualBox version = %ls\n", version.raw());
+        RTPrintf ("VirtualBox version = %ls\n", version.raw());
     }
 #endif
@@ -391 +402 @@
     ////////////////////////////////////////////////////////////////////////////
     {
-        printf ("Calling IVirtualBox::Machines...\n");
+        RTPrintf ("Calling IVirtualBox::Machines...\n");
 
         com::SafeIfaceArray <IMachine> machines;
@@ -397 +408 @@
                            COMGETTER(Machines) (ComSafeArrayAsOutParam (machines)));
 
-        printf ("%u machines registered (machines.isNull()=%d).\n",
+        RTPrintf ("%u machines registered (machines.isNull()=%d).\n",
                 machines.size(), machines.isNull());
 
@@ -404 +415 @@
             Bstr name;
             CHECK_ERROR_BREAK (machines [i], COMGETTER(Name) (name.asOutParam()));
-            printf ("machines[%u]='%s'\n", i, Utf8Str (name).raw());
-        }
-
-#if 0
-        {
-            printf ("Testing [out] arrays...\n");
+            RTPrintf ("machines[%u]='%s'\n", i, Utf8Str (name).raw());
+        }
+
+#if 0
+        {
+            RTPrintf ("Testing [out] arrays...\n");
             com::SafeGUIDArray uuids;
             CHECK_ERROR_BREAK (virtualBox,
@@ -415 +426 @@
 
             for (size_t i = 0; i < uuids.size(); ++ i)
-                printf ("uuids[%u]=%Vuuid\n", i, &uuids [i]);
-        }
-
-        {
-            printf ("Testing [in] arrays...\n");
+                RTPrintf ("uuids[%u]=%Vuuid\n", i, &uuids [i]);
+        }
+
+        {
+            RTPrintf ("Testing [in] arrays...\n");
             com::SafeGUIDArray uuids (5);
             for (size_t i = 0; i < uuids.size(); ++ i)
@@ -426 +437 @@
                 id.create();
                 uuids [i] = id;
-                printf ("uuids[%u]=%Vuuid\n", i, &uuids [i]);
+                RTPrintf ("uuids[%u]=%Vuuid\n", i, &uuids [i]);
             }
 
@@ -441 +452 @@
     ////////////////////////////////////////////////////////////////////////////
 
-    printf("Getting IHost interface...\n");
+    RTPrintf("Getting IHost interface...\n");
     IHost *host;
     rc = virtualBox->GetHost(&host);
@@ -458 +469 @@
                 dvdDrive->GetDriveName(&driveName);
                 RTUtf16ToUtf8((PCRTUTF16)driveName, &driveNameUtf8);
-                printf("Host DVD drive name: %s\n", driveNameUtf8);
+                RTPrintf("Host DVD drive name: %s\n", driveNameUtf8);
                 RTStrFree(driveNameUtf8);
                 SysFreeString(driveName);
@@ -468 +479 @@
         } else
         {
-            printf("Could not get host DVD drive collection\n");
+            RTPrintf("Could not get host DVD drive collection\n");
         }
 
@@ -483 +494 @@
                 floppyDrive->GetDriveName(&driveName);
                 RTUtf16ToUtf8((PCRTUTF16)driveName, &driveNameUtf8);
-                printf("Host floppy drive name: %s\n", driveNameUtf8);
+                RTPrintf("Host floppy drive name: %s\n", driveNameUtf8);
                 RTStrFree(driveNameUtf8);
                 SysFreeString(driveName);
@@ -493 +504 @@
         } else
         {
-            printf("Could not get host floppy drive collection\n");
+            RTPrintf("Could not get host floppy drive collection\n");
         }
         host->Release();
     } else
     {
-        printf("Call failed\n");
-    }
-    printf ("\n");
+        RTPrintf("Call failed\n");
+    }
+    RTPrintf ("\n");
 #endif
 
@@ -513 +524 @@
         ComPtr <IHardDisk> hardDisk;
         rc = virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
-        printf ("virtualBox->GetHardDisk(null-uuid)=%08X\n", rc);
+        RTPrintf ("virtualBox->GetHardDisk(null-uuid)=%08X\n", rc);
 
 //        {
@@ -523 +534 @@
         Bstr version;
         rc = virtualBox->COMGETTER(Version) (version.asOutParam());
-        printf ("virtualBox->COMGETTER(Version)=%08X\n", rc);
+        RTPrintf ("virtualBox->COMGETTER(Version)=%08X\n", rc);
 
         {
@@ -535 +546 @@
         ComPtr <IMachine> machine;
         rc = session->COMGETTER(Machine)(machine.asOutParam());
-        printf ("session->COMGETTER(Machine)=%08X\n", rc);
+        RTPrintf ("session->COMGETTER(Machine)=%08X\n", rc);
 
 //        {
@@ -545 +556 @@
         SessionState_T state;
         rc = session->COMGETTER(State) (&state);
-        printf ("session->COMGETTER(State)=%08X\n", rc);
+        RTPrintf ("session->COMGETTER(State)=%08X\n", rc);
 
         {
@@ -561 +572 @@
         ComPtr <IHardDisk> hd;
         Bstr src = L"E:\\develop\\innotek\\images\\NewHardDisk.vdi";
-        printf ("Opening the existing hard disk '%ls'...\n", src.raw());
+        RTPrintf ("Opening the existing hard disk '%ls'...\n", src.raw());
         CHECK_ERROR_BREAK (virtualBox, OpenHardDisk (src, AccessMode_ReadWrite, hd.asOutParam()));
-        printf ("Enter to continue...\n");
+        RTPrintf ("Enter to continue...\n");
         getchar();
-        printf ("Registering the existing hard disk '%ls'...\n", src.raw());
+        RTPrintf ("Registering the existing hard disk '%ls'...\n", src.raw());
         CHECK_ERROR_BREAK (virtualBox, RegisterHardDisk (hd));
-        printf ("Enter to continue...\n");
+        RTPrintf ("Enter to continue...\n");
         getchar();
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -581 +592 @@
         ComPtr <IVirtualDiskImage> vdi;
         Bstr src = L"CreatorTest.vdi";
-        printf ("Unregistering the hard disk '%ls'...\n", src.raw());
+        RTPrintf ("Unregistering the hard disk '%ls'...\n", src.raw());
         CHECK_ERROR_BREAK (virtualBox, FindVirtualDiskImage (src, vdi.asOutParam()));
         ComPtr <IHardDisk> hd = vdi;
@@ -589 +600 @@
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -623 +634 @@
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -645 +656 @@
         };
 
-        printf ("\n");
+        RTPrintf ("\n");
 
         for (size_t i = 0; i < RT_ELEMENTS (Names); ++ i)
         {
             Bstr src = Names [i];
-            printf ("Searching for hard disk '%ls'...\n", src.raw());
+            RTPrintf ("Searching for hard disk '%ls'...\n", src.raw());
             rc = virtualBox->FindHardDisk (src, hd.asOutParam());
             if (SUCCEEDED (rc))
@@ -658 +669 @@
                 CHECK_ERROR_BREAK (hd, COMGETTER(Id) (id.asOutParam()));
                 CHECK_ERROR_BREAK (hd, COMGETTER(Location) (location.asOutParam()));
-                printf ("Found, UUID={%Vuuid}, location='%ls'.\n",
+                RTPrintf ("Found, UUID={%Vuuid}, location='%ls'.\n",
                         id.raw(), location.raw());
 
@@ -668 +679 @@
                                                       ComSafeArrayAsOutParam (values)));
 
-                printf ("Properties:\n");
+                RTPrintf ("Properties:\n");
                 for (size_t i = 0; i < names.size(); ++ i)
-                    printf (" %ls = %ls\n", names [i], values [i]);
+                    RTPrintf (" %ls = %ls\n", names [i], values [i]);
 
                 if (names.size() == 0)
-                    printf (" <none>\n");
+                    RTPrintf (" <none>\n");
 
 #if 0
@@ -679 +690 @@
                 Bstr value = Utf8StrFmt ("lalala (%llu)", RTTimeMilliTS());
 
-                printf ("Settings property %ls to %ls...\n", name.raw(), value.raw());
+                RTPrintf ("Settings property %ls to %ls...\n", name.raw(), value.raw());
                 CHECK_ERROR (hd, SetProperty (name, value));
 #endif
@@ -688 +699 @@
                 PRINT_ERROR_INFO (info);
             }
-            printf ("\n");
+            RTPrintf ("\n");
         }
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -702 +713 @@
         ComPtr <IMachine> machine;
         Bstr name = argc > 1 ? argv [1] : "dos";
-        printf ("Getting a machine object named '%ls'...\n", name.raw());
+        RTPrintf ("Getting a machine object named '%ls'...\n", name.raw());
         CHECK_ERROR_BREAK (virtualBox, FindMachine (name, machine.asOutParam()));
-        printf ("Accessing the machine in read-only mode:\n");
+        RTPrintf ("Accessing the machine in read-only mode:\n");
         readAndChangeMachineSettings (machine);
 #if 0
         if (argc != 2)
         {
-            printf ("Error: a string has to be supplied!\n");
+            RTPrintf ("Error: a string has to be supplied!\n");
         }
         else
@@ -719 +730 @@
     }
     while (0);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -735 +746 @@
         Bstr name = L"machina";
 
-        printf ("Creating a new machine object (base dir '%ls', name '%ls')...\n",
+        RTPrintf ("Creating a new machine object (base dir '%ls', name '%ls')...\n",
                 baseDir.raw(), name.raw());
         CHECK_ERROR_BREAK (virtualBox, CreateMachine (baseDir, name,
                                                       machine.asOutParam()));
 
-        printf ("Getting name...\n");
+        RTPrintf ("Getting name...\n");
         CHECK_ERROR_BREAK (machine, COMGETTER(Name) (name.asOutParam()));
-        printf ("Name: {%ls}\n", name.raw());
+        RTPrintf ("Name: {%ls}\n", name.raw());
 
         BOOL modified = FALSE;
-        printf ("Are any settings modified?...\n");
+        RTPrintf ("Are any settings modified?...\n");
         CHECK_ERROR_BREAK (machine, COMGETTER(SettingsModified) (&modified));
-        printf ("%s\n", modified ? "yes" : "no");
+        RTPrintf ("%s\n", modified ? "yes" : "no");
 
         ASSERT_BREAK (modified == TRUE);
 
         name = L"Kakaya prekrasnaya virtual'naya mashina!";
-        printf ("Setting new name ({%ls})...\n", name.raw());
+        RTPrintf ("Setting new name ({%ls})...\n", name.raw());
         CHECK_ERROR_BREAK (machine, COMSETTER(Name) (name));
 
-        printf ("Setting memory size to 111...\n");
+        RTPrintf ("Setting memory size to 111...\n");
         CHECK_ERROR_BREAK (machine, COMSETTER(MemorySize) (111));
 
         Bstr desc = L"This is an exemplary description.";
-        printf ("Setting description to \"%ls\"...\n", desc.raw());
+        RTPrintf ("Setting description to \"%ls\"...\n", desc.raw());
         CHECK_ERROR_BREAK (machine, COMSETTER(Description) (desc));
 
@@ -766 +777 @@
         CHECK_ERROR_BREAK (virtualBox, GetGuestOSType (type, guestOSType.asOutParam()));
 
-        printf ("Saving new machine settings...\n");
+        RTPrintf ("Saving new machine settings...\n");
         CHECK_ERROR_BREAK (machine, SaveSettings());
 
-        printf ("Accessing the newly created machine:\n");
+        RTPrintf ("Accessing the newly created machine:\n");
         readAndChangeMachineSettings (machine);
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -796 +807 @@
                 Bstr name;
                 CHECK_RC_BREAK (drive->COMGETTER(Name) (name.asOutParam()));
-                printf ("Host DVD drive: name={%ls}\n", name.raw());
+                RTPrintf ("Host DVD drive: name={%ls}\n", name.raw());
             }
             CHECK_RC_BREAK (rc);
@@ -808 +819 @@
                 Bstr name;
                 CHECK_RC_BREAK (drive->COMGETTER(Name) (name.asOutParam()));
-                printf ("Found by name: name={%ls}\n", name.raw());
+                RTPrintf ("Found by name: name={%ls}\n", name.raw());
             }
         }
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -905 +916 @@
                                COMGETTER(HardDisks)(ComSafeArrayAsOutParam (disks)));
 
-            printf ("%u base hard disks registered (disks.isNull()=%d).\n",
+            RTPrintf ("%u base hard disks registered (disks.isNull()=%d).\n",
                     disks.size(), disks.isNull());
 
@@ -919 +930 @@
                 CHECK_ERROR_BREAK (disks [i], COMGETTER(Format) (format.asOutParam()));
 
-                printf (" disks[%u]: '%ls'\n"
+                RTPrintf (" disks[%u]: '%ls'\n"
                         "  UUID:         {%Vuuid}\n"
                         "  State:        %s\n"
@@ -937 +948 @@
                     CHECK_ERROR_BREAK (disks [i],
                                        COMGETTER(LastAccessError)(error.asOutParam()));
-                    printf ("  Access Error: %ls\n", error.raw());
+                    RTPrintf ("  Access Error: %ls\n", error.raw());
                 }
 
                 /* get usage */
 
-                printf ("  Used by VMs:\n");
+                RTPrintf ("  Used by VMs:\n");
 
                 com::SafeGUIDArray ids;
@@ -949 +960 @@
                 if (ids.size() == 0)
                 {
-                    printf ("   <not used>\n");
+                    RTPrintf ("   <not used>\n");
                 }
                 else
@@ -955 +966 @@
                     for (size_t j = 0; j < ids.size(); ++ j)
                     {
-                        printf ("   {%Vuuid}\n", &ids [j]);
+                        RTPrintf ("   {%Vuuid}\n", &ids [j]);
                     }
                 }
@@ -965 +976 @@
                                COMGETTER(DVDImages) (ComSafeArrayAsOutParam (images)));
 
-            printf ("%u DVD images registered (images.isNull()=%d).\n",
+            RTPrintf ("%u DVD images registered (images.isNull()=%d).\n",
                     images.size(), images.isNull());
 
@@ -977 +988 @@
                 CHECK_ERROR_BREAK (images [i], COMGETTER(State) (&state));
 
-                printf (" images[%u]: '%ls'\n"
+                RTPrintf (" images[%u]: '%ls'\n"
                         "  UUID:         {%Vuuid}\n"
                         "  State:        %s\n",
@@ -993 +1004 @@
                     CHECK_ERROR_BREAK (images [i],
                                        COMGETTER(LastAccessError)(error.asOutParam()));
-                    printf ("  Access Error: %ls\n", error.raw());
+                    RTPrintf ("  Access Error: %ls\n", error.raw());
                 }
 
                 /* get usage */
 
-                printf ("  Used by VMs:\n");
+                RTPrintf ("  Used by VMs:\n");
 
                 com::SafeGUIDArray ids;
@@ -1005 +1016 @@
                 if (ids.size() == 0)
                 {
-                    printf ("   <not used>\n");
+                    RTPrintf ("   <not used>\n");
                 }
                 else
@@ -1011 +1022 @@
                     for (size_t j = 0; j < ids.size(); ++ j)
                     {
-                        printf ("   {%Vuuid}\n", &ids [j]);
+                        RTPrintf ("   {%Vuuid}\n", &ids [j]);
                     }
                 }
@@ -1018 +1029 @@
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -1028 +1039 @@
         ComPtr <IMachine> machine;
         Bstr name = argc > 1 ? argv [1] : "dos";
-        printf ("Getting a machine object named '%ls'...\n", name.raw());
+        RTPrintf ("Getting a machine object named '%ls'...\n", name.raw());
         CHECK_ERROR_BREAK (virtualBox, FindMachine (name, machine.asOutParam()));
         Guid guid;
         CHECK_RC_BREAK (machine->COMGETTER(Id) (guid.asOutParam()));
-        printf ("Opening a session for this machine...\n");
+        RTPrintf ("Opening a session for this machine...\n");
         CHECK_RC_BREAK (virtualBox->OpenSession (session, guid));
 #if 1
         ComPtr <IMachine> sessionMachine;
-        printf ("Getting sessioned machine object...\n");
+        RTPrintf ("Getting sessioned machine object...\n");
         CHECK_RC_BREAK (session->COMGETTER(Machine) (sessionMachine.asOutParam()));
-        printf ("Accessing the machine within the session:\n");
+        RTPrintf ("Accessing the machine within the session:\n");
         readAndChangeMachineSettings (sessionMachine, machine);
 #if 0
-        printf ("\n");
-        printf ("Enabling the VRDP server (must succeed even if the VM is saved):\n");
+        RTPrintf ("\n");
+        RTPrintf ("Enabling the VRDP server (must succeed even if the VM is saved):\n");
         ComPtr <IVRDPServer> vrdp;
         CHECK_ERROR_BREAK (sessionMachine, COMGETTER(VRDPServer) (vrdp.asOutParam()));
@@ -1053 +1064 @@
             BOOL enabled = FALSE;
             CHECK_ERROR_BREAK (vrdp, COMGETTER(Enabled) (&enabled));
-            printf ("VRDP server is %s\n", enabled ? "enabled" : "disabled");
+            RTPrintf ("VRDP server is %s\n", enabled ? "enabled" : "disabled");
         }
 #endif
@@ -1059 +1070 @@
 #if 0
         ComPtr <IConsole> console;
-        printf ("Getting the console object...\n");
+        RTPrintf ("Getting the console object...\n");
         CHECK_RC_BREAK (session->COMGETTER(Console) (console.asOutParam()));
-        printf ("Discarding the current machine state...\n");
+        RTPrintf ("Discarding the current machine state...\n");
         ComPtr <IProgress> progress;
         CHECK_ERROR_BREAK (console, DiscardCurrentState (progress.asOutParam()));
-        printf ("Waiting for completion...\n");
+        RTPrintf ("Waiting for completion...\n");
         CHECK_ERROR_BREAK (progress, WaitForCompletion (-1));
         ProgressErrorInfo ei (progress);
@@ -1074 +1085 @@
             CHECK_ERROR_BREAK (progress, COMGETTER(Initiator) (initiator.asOutParam()));
 
-            printf ("initiator(unk) = %p\n", (IUnknown *) initiator);
-            printf ("console(unk) = %p\n", (IUnknown *) ComPtr <IUnknown> ((IConsole *) console));
-            printf ("console = %p\n", (IConsole *) console);
-        }
-#endif
-        printf("Press enter to close session...");
+            RTPrintf ("initiator(unk) = %p\n", (IUnknown *) initiator);
+            RTPrintf ("console(unk) = %p\n", (IUnknown *) ComPtr <IUnknown> ((IConsole *) console));
+            RTPrintf ("console = %p\n", (IConsole *) console);
+        }
+#endif
+        RTPrintf("Press enter to close session...");
         getchar();
         session->Close();
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -1094 +1105 @@
         ComPtr <IMachine> machine;
         Bstr name = L"dos";
-        printf ("Getting a machine object named '%ls'...\n", name.raw());
+        RTPrintf ("Getting a machine object named '%ls'...\n", name.raw());
         CHECK_RC_BREAK (virtualBox->FindMachine (name, machine.asOutParam()));
         Guid guid;
         CHECK_RC_BREAK (machine->COMGETTER(Id) (guid.asOutParam()));
-        printf ("Opening a remote session for this machine...\n");
+        RTPrintf ("Opening a remote session for this machine...\n");
         ComPtr <IProgress> progress;
         CHECK_RC_BREAK (virtualBox->OpenRemoteSession (session, guid, Bstr("gui"),
                                                        NULL, progress.asOutParam()));
-        printf ("Waiting for the session to open...\n");
+        RTPrintf ("Waiting for the session to open...\n");
         CHECK_RC_BREAK (progress->WaitForCompletion (-1));
         ComPtr <IMachine> sessionMachine;
-        printf ("Getting sessioned machine object...\n");
+        RTPrintf ("Getting sessioned machine object...\n");
         CHECK_RC_BREAK (session->COMGETTER(Machine) (sessionMachine.asOutParam()));
         ComPtr <IConsole> console;
-        printf ("Getting console object...\n");
+        RTPrintf ("Getting console object...\n");
         CHECK_RC_BREAK (session->COMGETTER(Console) (console.asOutParam()));
-        printf ("Press enter to pause the VM execution in the remote session...");
+        RTPrintf ("Press enter to pause the VM execution in the remote session...");
         getchar();
         CHECK_RC (console->Pause());
-        printf ("Press enter to close this session...");
+        RTPrintf ("Press enter to close this session...");
         getchar();
         session->Close();
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -1128 +1139 @@
         ComPtr <IMachine> machine;
         Bstr name = "dos";
-        printf ("Getting a machine object named '%ls'...\n", name.raw());
+        RTPrintf ("Getting a machine object named '%ls'...\n", name.raw());
         CHECK_RC_BREAK (virtualBox->FindMachine (name, machine.asOutParam()));
         Guid guid;
         CHECK_RC_BREAK (machine->COMGETTER(Id) (guid.asOutParam()));
-        printf ("Opening an existing remote session for this machine...\n");
+        RTPrintf ("Opening an existing remote session for this machine...\n");
         CHECK_RC_BREAK (virtualBox->OpenExistingSession (session, guid));
         ComPtr <IMachine> sessionMachine;
-        printf ("Getting sessioned machine object...\n");
+        RTPrintf ("Getting sessioned machine object...\n");
         CHECK_RC_BREAK (session->COMGETTER(Machine) (sessionMachine.asOutParam()));
 
@@ -1145 +1156 @@
 #if 0
         ComPtr <IConsole> console;
-        printf ("Getting console object...\n");
+        RTPrintf ("Getting console object...\n");
         CHECK_RC_BREAK (session->COMGETTER(Console) (console.asOutParam()));
-        printf ("Press enter to pause the VM execution in the remote session...");
+        RTPrintf ("Press enter to pause the VM execution in the remote session...");
         getchar();
         CHECK_RC (console->Pause());
-        printf ("Press enter to close this session...");
+        RTPrintf ("Press enter to close this session...");
         getchar();
 #endif
@@ -1156 +1167 @@
     }
     while (FALSE);
-    printf ("\n");
+    RTPrintf ("\n");
 #endif
 
@@ -1167 +1178 @@
         ULONG uMemSize, uMemAvail;
         CHECK_ERROR_BREAK (host, COMGETTER(MemorySize) (&uMemSize));
-        printf("Total memory (MB): %u\n", uMemSize);
+        RTPrintf("Total memory (MB): %u\n", uMemSize);
         CHECK_ERROR_BREAK (host, COMGETTER(MemoryAvailable) (&uMemAvail));
-        printf("Free memory (MB): %u\n", uMemAvail);
+        RTPrintf("Free memory (MB): %u\n", uMemAvail);
     } while (0);
 #endif
@@ -1187 +1198 @@
             Bstr interfaceName;
             networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
-            printf("Found %d network interfaces, testing with %lS...\n", hostNetworkInterfaces.size(), interfaceName.raw());
+            RTPrintf("Found %d network interfaces, testing with %lS...\n", hostNetworkInterfaces.size(), interfaceName.raw());
             Guid interfaceGuid;
             networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
@@ -1197 +1208 @@
             networkInterface->COMGETTER(Id)(interfaceGuid2.asOutParam());
             if (interfaceGuid2 != interfaceGuid)
-                printf("Failed to retrieve an interface by name %lS.\n", interfaceName.raw());
+                RTPrintf("Failed to retrieve an interface by name %lS.\n", interfaceName.raw());
             // Find the interface by its guid
             networkInterface.setNull();
@@ -1205 +1216 @@
             networkInterface->COMGETTER(Name)(interfaceName2.asOutParam());
             if (interfaceName != interfaceName2)
-                printf("Failed to retrieve an interface by GUID %lS.\n", Bstr(interfaceGuid.toString()).raw());
+                RTPrintf("Failed to retrieve an interface by GUID %lS.\n", Bstr(interfaceGuid.toString()).raw());
         }
         else
         {
-            printf("No network interfaces found!\n");
+            RTPrintf("No network interfaces found!\n");
         }
     } while (0);
@@ -1235 +1246 @@
         Bstr name = argc > 1 ? argv [1] : "dsl";
         Bstr sessionType = argc > 2 ? argv [2] : "vrdp";
-        printf ("Getting a machine object named '%ls'...\n", name.raw());
+        RTPrintf ("Getting a machine object named '%ls'...\n", name.raw());
         CHECK_RC_BREAK (virtualBox->FindMachine (name, machine.asOutParam()));
 
@@ -1241 +1252 @@
         Guid guid;
         CHECK_RC_BREAK (machine->COMGETTER(Id) (guid.asOutParam()));
-        printf ("Opening a remote session for this machine...\n");
+        RTPrintf ("Opening a remote session for this machine...\n");
         ComPtr <IProgress> progress;
         CHECK_RC_BREAK (virtualBox->OpenRemoteSession (session, guid, sessionType,
                                                        NULL, progress.asOutParam()));
-        printf ("Waiting for the session to open...\n");
+        RTPrintf ("Waiting for the session to open...\n");
         CHECK_RC_BREAK (progress->WaitForCompletion (-1));
         ComPtr <IMachine> sessionMachine;
-        printf ("Getting sessioned machine object...\n");
+        RTPrintf ("Getting sessioned machine object...\n");
         CHECK_RC_BREAK (session->COMGETTER(Machine) (sessionMachine.asOutParam()));
 
@@ -1266 +1277 @@
         // Get console
         ComPtr <IConsole> console;
-        printf ("Getting console object...\n");
+        RTPrintf ("Getting console object...\n");
         CHECK_RC_BREAK (session->COMGETTER(Console) (console.asOutParam()));
 
         RTThreadSleep(5000); // Sleep for 5 seconds
 
-        printf("\nMetrics collected with VM running: --------------------\n");
+        RTPrintf("\nMetrics collected with VM running: --------------------\n");
         queryMetrics(virtualBox, collector, ComSafeArrayAsInParam(objects));
 
         // Pause
-        //printf ("Press enter to pause the VM execution in the remote session...");
+        //RTPrintf ("Press enter to pause the VM execution in the remote session...");
         //getchar();
         CHECK_RC (console->Pause());
@@ -1281 +1292 @@
         RTThreadSleep(5000); // Sleep for 5 seconds
 
-        printf("\nMetrics collected with VM paused: ---------------------\n");
+        RTPrintf("\nMetrics collected with VM paused: ---------------------\n");
         queryMetrics(virtualBox, collector, ComSafeArrayAsInParam(objects));
 
-        printf("\nDrop collected metrics: ----------------------------------------\n");
+        RTPrintf("\nDrop collected metrics: ----------------------------------------\n");
         CHECK_ERROR_BREAK (collector,
             SetupMetrics(ComSafeArrayAsInParam(baseMetrics),
@@ -1297 +1308 @@
         machine.queryInterfaceTo(&vmObject[0]);
 
-        printf("\nDisable collection of VM metrics: ------------------------------\n");
+        RTPrintf("\nDisable collection of VM metrics: ------------------------------\n");
         CHECK_ERROR_BREAK (collector,
             DisableMetrics(ComSafeArrayAsInParam(baseMetrics),
@@ -1308 +1319 @@
         queryMetrics(virtualBox, collector, ComSafeArrayAsInParam(objects));
 
-        printf("\nRe-enable collection of all metrics: ---------------------------\n");
+        RTPrintf("\nRe-enable collection of all metrics: ---------------------------\n");
         CHECK_ERROR_BREAK (collector,
             EnableMetrics(ComSafeArrayAsInParam(baseMetrics),
@@ -1320 +1331 @@
 
         // Power off
-        printf ("Press enter to power off VM...");
+        RTPrintf ("Press enter to power off VM...");
         getchar();
         CHECK_RC (console->PowerDown());
-        printf ("Press enter to close this session...");
+        RTPrintf ("Press enter to close this session...");
         getchar();
         session->Close();
@@ -1356 +1367 @@
             RTPrintf ("Disks:");
             for (unsigned i = 0; i < retDisks.size(); i++)
-                printf (" %ls", Bstr (retDisks [i]).raw());
+                RTPrintf (" %ls", Bstr (retDisks [i]).raw());
             RTPrintf ("\n");
         }
@@ -1382 +1393 @@
                 for (unsigned a = 0; a < retTypes.size(); ++a)
                 {
-                    printf (" %d %ls %ls %ls\n",
+                    RTPrintf (" %d %ls %ls %ls\n",
                             retTypes [a],
                             Bstr (retOrigValues [a]).raw(),
@@ -1424 +1435 @@
     }
     while (FALSE);
-    printf ("\n");
-#endif
-
-    printf ("Press enter to release Session and VirtualBox instances...");
+    RTPrintf ("\n");
+#endif
+
+    RTPrintf ("Press enter to release Session and VirtualBox instances...");
     getchar();
 
@@ -1435 +1446 @@
     while (0);
 
-    printf("Press enter to shutdown COM...");
+    RTPrintf("Press enter to shutdown COM...");
     getchar();
 
     com::Shutdown();
 
-    printf ("tstAPI FINISHED.\n");
+    RTPrintf ("tstAPI FINISHED.\n");
 
     return rc;

trunk/src/VBox/Main/webservice/samples/perl/clienttest.pl

@@ -39 +39 @@
 my $optMode;
 my $vmname;
+my $disk;
 
 while (my $this = shift(@ARGV))
@@ -66 +67 @@
         {
             die "[$cmd] Missing parameter: You must specify the name of the VM to start.\nStopped";
+        }
+    }
+    elsif ($this eq 'openhd')
+    {
+        $optMode = $this;
+
+        if (!($disk = shift(@ARGV)))
+        {
+            die "[$cmd] Missing parameter: You must specify the name of the disk to open.\nStopped";
         }
     }
@@ -148 +158 @@
     vboxService->IWebsessionManager_logoff($vbox);
 }
+elsif ($optMode eq "openhd")
+{
+    my $harddisk = vboxService->IVirtualBox_openHardDisk($vbox, $disk, 1, 0, "", 0, "");
+}

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -26 +26 @@
 #include <VBox/com/Guid.h>
 #include <VBox/com/ErrorInfo.h>
-#include <VBox/com/errorprint2.h>
+#include <VBox/com/errorprint.h>
 #include <VBox/com/EventQueue.h>
 #include <VBox/com/VirtualBox.h>

trunk/src/VBox/Main/webservice/websrv-cpp.xsl

@@ -10 +10 @@
         all SOAP calls into COM/XPCOM method calls.
 
-     Copyright (C) 2006-2008 Sun Microsystems, Inc.
+     Copyright (C) 2006-2009 Sun Microsystems, Inc.
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -66 +66 @@
 #include <VBox/com/Guid.h>
 #include <VBox/com/ErrorInfo.h>
-#include <VBox/com/errorprint2.h>
+#include <VBox/com/errorprint.h>
 #include <VBox/com/EventQueue.h>
 #include <VBox/com/VirtualBox.h>