Changeset 42693 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Aug 8, 2012 10:37:51 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79897

Message:

Guest Control 2.0: Update.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)

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

@@ -1659 +1659 @@
     {
 #ifndef VBOX_WITH_GUEST_CONTROL2
+        Assert(!fFlags);
         rc = pContext->pGuest->CopyToGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
                                            Bstr(pContext->strUsername).raw(), Bstr(pContext->strPassword).raw(),
                                            fFlags, pProgress.asOutParam());
 #else
-        Assert(!fFlags);
         SafeArray<CopyFileFlag_T> copyFlags;
         rc = pContext->pGuestSession->CopyTo(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
@@ -1674 +1674 @@
     {
 #ifndef VBOX_WITH_GUEST_CONTROL2
+        Assert(!fFlags);
         rc = pContext->pGuest->CopyFromGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
                                              Bstr(pContext->strUsername).raw(), Bstr(pContext->strPassword).raw(),
                                              fFlags, pProgress.asOutParam());
 #else
-        Assert(!fFlags);
         SafeArray<CopyFileFlag_T> copyFlags;
         rc = pContext->pGuestSession->CopyFrom(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
@@ -2809 +2809 @@
         HRESULT rc = S_OK;
         ComPtr<IProgress> pProgress;
+
+        SafeArray<AdditionsUpdateFlag_T> updateFlags;
         CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(strSource).raw(),
                                                 /* Wait for whole update process to complete. */
-                                                AdditionsUpdateFlag_None,
+                                                ComSafeArrayAsInParam(updateFlags),
                                                 pProgress.asOutParam()));
         if (FAILED(rc))