Changeset 34398 in vbox

Timestamp:

Nov 26, 2010 4:24:58 PM (14 years ago)

Author:

vboxsync

Message:

Guest Additions update: Don't wait when showing modal progress dialog in GUI.

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) (7 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)

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

@@ -1450 +1450 @@
             ComPtr<IProgress> progress;
             CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(Utf8Source).raw(),
-                                                    0 /* Flags, not used. */,
+                                                    AdditionsUpdateFlag_None,
                                                     progress.asOutParam()));
             if (FAILED(rc))

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_3.2.8.iso", 0);
+    CProgress progressInstall = guest.UpdateGuestAdditions("c:\\Downloads\\VBoxGuestAdditions_3.2.8.iso",
+                                                           AdditionsUpdateFlag_WaitForUpdateStartOnly);
 #else
-    CProgress progressInstall = guest.UpdateGuestAdditions(strSource, 0 /* Flags, not used. */);
+    /* Since we are going to show a modal progress dialog we don't want to wait for the whole
+     * update progress being complete - the user might need to interact with the VM to confirm (WHQL)
+     * popups - instead we only wait until the actual update process was started. */
+    CProgress progressInstall = guest.UpdateGuestAdditions(strSource,
+                                                           AdditionsUpdateFlag_WaitForUpdateStartOnly);
 #endif
     bool fResult = guest.isOk();

trunk/src/VBox/Main/GuestImpl.cpp

@@ -79 +79 @@
     /* Task data. */
     Utf8Str strSource;
+    ULONG uFlags;
 };
 
@@ -417 +418 @@
                 if (SUCCEEDED(rc))
                 {
+                    /* If the caller does not want to wait for out guest update process to end,
+                     * complete the progress object now so that the caller can do other work. */
+                    if (aTask->uFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly)
+                        aTask->progress->notifyComplete(S_OK);
+
                     LogRel(("Guest Additions update is running ...\n"));
                     while (SUCCEEDED(progressInstaller->COMGETTER(Completed(&fCompleted))))
@@ -466 +472 @@
     /* Clean up */
     aTask->rc = rc;
-    aTask->progress->SetCurrentOperationProgress(99);
+    if (SUCCEEDED(   aTask->progress->COMGETTER(Completed(&fCompleted)))
+                  && !fCompleted)
+        aTask->progress->SetCurrentOperationProgress(99);
 
     if (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
@@ -479 +487 @@
         }
 
-        aTask->progress->notifyComplete(rc);
+        if (SUCCEEDED(   aTask->progress->COMGETTER(Completed(&fCompleted)))
+                      && !fCompleted)
+            aTask->progress->notifyComplete(rc);
     }
     else /* The task was canceled, set error code to prevent assertions. */
     {
         LogRel(("Guest Additions update was canceled\n"));
-        aTask->progress->notifyComplete(VBOX_E_IPRT_ERROR,
-                                        COM_IIDOF(IGuest),
-                                        Guest::getStaticComponentName(),
-                                        "Automatic Guest Additions update was canceled");
+        if (SUCCEEDED(   aTask->progress->COMGETTER(Completed(&fCompleted)))
+                      && !fCompleted)
+            aTask->progress->notifyComplete(VBOX_E_IPRT_ERROR,
+                                            COM_IIDOF(IGuest),
+                                            Guest::getStaticComponentName(),
+                                            "Automatic Guest Additions update was canceled");
     }
 
@@ -2334 +2346 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    /* Validate flags. */
-    if (aFlags != CopyFileFlag_None)
-    {
-        if (   !(aFlags & CopyFileFlag_Recursive)
-            && !(aFlags & CopyFileFlag_Update)
-            && !(aFlags & CopyFileFlag_FollowLinks))
-        {
-            return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
-        }
-    }
+    if (aFlags != 0) /* Flags are not supported at the moment. */
+        return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
 
     HRESULT rc = S_OK;
@@ -2627 +2631 @@
     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();
+
+    /* Validate flags. */
+    if (aFlags)
+    {
+        if (!(aFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly))
+            return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
+    }
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -2656 +2664 @@
          * to the Guest Additions .ISO we want to mount. */
         task->strSource = (Utf8Str(aSource));
+        task->uFlags = aFlags;
 
         rc = task->startThread();

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

@@ -7767 +7767 @@
     </desc>
 
-    <const name="None"     value="0">
+    <const name="None"                    value="0">
       <desc>Guest Additions are not loaded.</desc>
     </const>
-    <const name="System"   value="1">
+    <const name="System"                  value="1">
       <desc>Guest drivers are loaded.</desc>
     </const>
-    <const name="Userland" value="2">
+    <const name="Userland"                value="2">
       <desc>Common components (such as application services) are loaded.</desc>
     </const>
-    <const name="Desktop"  value="3">
+    <const name="Desktop"                 value="3">
       <desc>Per-user desktop components are loaded.</desc>
+    </const>
+  </enum>
+
+  <enum
+    name="AdditionsUpdateFlag"
+    uuid="726a818d-18d6-4389-94e8-3e9e6826171a"
+  >
+    <desc>
+      Guest Additions update flags.
+    </desc>
+
+    <const name="None"                    value="0">
+      <desc>No flag set.</desc>
+    </const>
+    <const name="WaitForUpdateStartOnly"  value="1">
+      <desc>Only wait for the update process being started and do not
+        wait while peforming the actual update.</desc>
     </const>
   </enum>
@@ -8186 +8203 @@
       <param name="flags" type="unsigned long" dir="in">
         <desc>
-          Copy flags.
+          Copy flags. Not used at the moment and must be set to 0.
         </desc>
       </param>
@@ -8283 +8300 @@
       <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.
+          Flags for Guest Additions update.
         </desc>
       </param>