Changeset 34883 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2010 12:50:18 PM (14 years ago)

Author:

vboxsync

Message:

Automatic Guest Additions update/Main: Removed not needed release logging, pass more error information, added abort handling while executing Guest Additions setup.

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -442 +442 @@
         {
             if (osType.contains("64", Utf8Str::CaseInsensitive))
-            {
-                LogRel(("Automatic update of Windows guest (64-bit) selected\n"));
                 installerImage = "VBOXWINDOWSADDITIONS_AMD64.EXE";
-            }
             else
-            {
-                LogRel(("Automatic update of Windows guest (32-bit) selected\n"));
                 installerImage = "VBOXWINDOWSADDITIONS_X86.EXE";
-            }
             /* Since the installers are located in the root directory,
              * no further path processing needs to be done (yet). */
@@ -694 +688 @@
 
                     LogRel(("Guest Additions update is running ...\n"));
-                    while (SUCCEEDED(progressInstaller->COMGETTER(Completed(&fCompleted))))
+                    while (   SUCCEEDED(progressInstaller->COMGETTER(Completed(&fCompleted)))
+                           && !fCompleted)
                     {
+                        if (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
+                            && fCanceled)
+                        {
+                            progressInstaller->Cancel();
+                            break;
+                        }
                         /* Progress canceled by Main API? */
                         if (   SUCCEEDED(progressInstaller->COMGETTER(Canceled(&fCanceled)))
@@ -702 +703 @@
                             break;
                         }
-                        if (fCompleted)
-                            break;
                         RTThreadSleep(1);
                     }
@@ -727 +726 @@
                             }
                         }
-                        else if (fCanceled)
+                        else if (   SUCCEEDED(progressInstaller->COMGETTER(Canceled(&fCanceled)))
+                                 && fCanceled)
                         {
                             rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
@@ -734 +734 @@
                         }
                         else
-                            AssertMsgFailed(("Unknown Guest Additions update status!\n"));
+                        {
+                            /* Guest Additions update was canceled by the user. */
+                        }
                     }
+                    else
+                        rc = TaskGuest::setProgressErrorInfo(rc, aTask->progress, pGuest);
                 }
                 else