Changeset 33776 in vbox for trunk/src

Timestamp:

Nov 4, 2010 3:15:08 PM (14 years ago)

Author:

vboxsync

Message:

Main/IGuest::updateGuestAdditions: Introduced additional flags parameter for later use.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/GuestImpl.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -1298 +1298 @@
         ComPtr<IProgress> progress;
         CHECK_ERROR_BREAK(guest, UpdateGuestAdditions(Bstr(Utf8Source).raw(),
+                                                      0 /* Flags, not used. */,
                                                       progress.asOutParam()));
         rc = showProgress(progress);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -364 +364 @@
     CGuest guest = session().GetConsole().GetGuest();
 #ifdef DEBUG_andy
-    CProgress progressInstall = guest.UpdateGuestAdditions("c:\\Downloads\\VBoxGuestAdditions-r67158.iso");
+    CProgress progressInstall = guest.UpdateGuestAdditions("c:\\Downloads\\VBoxGuestAdditions_3.2.8.iso", 0);
 #else
-    CProgress progressInstall = guest.UpdateGuestAdditions(strSource);
+    CProgress progressInstall = guest.UpdateGuestAdditions(strSource, 0 /* Flags, not used. */);
 #endif
     bool fResult = guest.isOk();

trunk/src/VBox/Main/GuestImpl.cpp

@@ -2400 +2400 @@
 }
 
-STDMETHODIMP Guest::UpdateGuestAdditions(IN_BSTR aSource, IProgress **aProgress)
+STDMETHODIMP Guest::UpdateGuestAdditions(IN_BSTR aSource, ULONG aFlags, IProgress **aProgress)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -2408 +2408 @@
     CheckComArgOutPointerValid(aProgress);
 
+    if (aFlags != 0) /* Flags are not supported at the moment. */
+        return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
+
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -2445 +2448 @@
 
     if (SUCCEEDED(rc))
+    {
         /* Return progress to the caller. */
         progress.queryInterfaceTo(aProgress);
-
+    }
     return rc;
 #endif /* VBOX_WITH_GUEST_CONTROL */

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

@@ -7695 +7695 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="5a4f265c-0c0e-495a-8ff6-7d68682e276b"
+     uuid="ded6983f-5c81-4bf9-90af-73f65fd9b728"
      wsmap="managed"
      >
@@ -7974 +7974 @@
       <param name="flags" type="unsigned long" dir="out">
         <desc>
-          Additional flags of process status (not used at the moment).
+          Additional flags of process status. Not used at the moment and
+          must be set to 0.
         </desc>
       </param>
@@ -8069 +8070 @@
         <desc>
           Path to the Guest Additions .ISO file to use for the upate.
+        </desc>
+      </param>
+      <param name="flags" type="unsigned long" dir="in">
+        <desc>
+          Additional flags for update process. Not used at the moment and
+          must be set to 0.
         </desc>
       </param>

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

@@ -105 +105 @@
                                      ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemShared, ULONG *aMemCache,
                                      ULONG *aPageTotal, ULONG *aMemAllocTotal, ULONG *aMemFreeTotal, ULONG *aMemBalloonTotal, ULONG *aMemSharedTotal);
-    STDMETHOD(UpdateGuestAdditions)(IN_BSTR aSource, IProgress **aProgress);
+    STDMETHOD(UpdateGuestAdditions)(IN_BSTR aSource, ULONG aFlags, IProgress **aProgress);
 
     // Public methods that are not in IDL (only called internally).