Changeset 34172 in vbox

Timestamp:

Nov 18, 2010 1:41:41 PM (14 years ago)

Author:

vboxsync

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

67896

Message:

Main/GuestImpl: Improved error/cancel handling for automatic Guest Additions updates.

File:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -158 +158 @@
 
     HRESULT rc = S_OK;
+    BOOL fCompleted;
+    BOOL fCanceled;
 
     try
@@ -164 +166 @@
         AssertPtr(pGuest);
 
-        if (aTask->progress)
-            aTask->progress->SetCurrentOperationProgress(10);
+        aTask->progress->SetCurrentOperationProgress(10);
 
         bool fIsWindows = false;
@@ -233 +234 @@
             {
                 /* Okay, we're ready to start our copy routine on the guest! */
-                if (aTask->progress)
-                    aTask->progress->SetCurrentOperationProgress(15);
-
                 LogRel(("Automatic update of Guest Additions started\n"));
+                aTask->progress->SetCurrentOperationProgress(15);
 
                 /* Prepare command line args. */
@@ -248 +247 @@
                 if (SUCCEEDED(rc))
                 {
-                    ComPtr<IProgress> progressCopy;
+                    ComPtr<IProgress> progressCat;
                     ULONG uPID;
 
@@ -263 +262 @@
                                                         Bstr("").raw() /* Password */,
                                                         5 * 1000 /* Wait 5s for getting the process started. */,
-                                                        &uPID, progressCopy.asOutParam(), &vrc);
-                    if (RT_FAILURE(vrc))
+                                                        &uPID, progressCat.asOutParam(), &vrc);
+                    if (   RT_FAILURE(vrc)
+                        || FAILED(rc))
                     {
                         switch (vrc)
@@ -271 +271 @@
                              * (< 4.0) which does not support automatic updating and/or has not the internal tool "vbox_cat". */
                             case VERR_INVALID_PARAMETER:
-                                rc = setError(VBOX_E_NOT_SUPPORTED,
+                                rc = setError(VBOX_E_IPRT_ERROR,
                                               tr("Currently installed Guest Additions don't support automatic updating, please update them manually"));
                                 break;
@@ -277 +277 @@
                              * no Guest Additions (on a supported automatic updating OS) are installed at all. */
                             case VERR_TIMEOUT:
-                                rc = setError(VBOX_E_NOT_SUPPORTED,
+                                rc = setError(VBOX_E_IPRT_ERROR,
                                               tr("Guest Additions seem not to be installed on the guest or are not responding, please update them manually"));
                                 break;
 
                             default:
+                                rc = setError(E_FAIL,
+                                              tr("Error copying Guest Additions installer (%Rrc)"), vrc);
                                 break;
                         }
@@ -288 +290 @@
                     {
                         LogRel(("Copying Guest Additions installer to guest ...\n"));
-
-                        if (aTask->progress)
-                            aTask->progress->SetCurrentOperationProgress(20);
+                        aTask->progress->SetCurrentOperationProgress(20);
 
                         /* Wait for process to exit ... */
-                        BOOL fCompleted = FALSE;
-                        BOOL fCanceled = FALSE;
-
-                        size_t cbRead;
-                        size_t cbToRead;
                         SafeArray<BYTE> aInputData(_64K);
-                        while (   SUCCEEDED(progressCopy->COMGETTER(Completed(&fCompleted)))
+                        while (   SUCCEEDED(progressCat->COMGETTER(Completed(&fCompleted)))
                                && !fCompleted)
                         {
+                            size_t cbRead;
                             /* cbLength contains remaining bytes of our installer file
                              * opened above to read. */
-                            cbToRead = RT_MIN(cbLength, _64K);
+                            size_t cbToRead = RT_MIN(cbLength, _64K);
                             if (cbToRead)
                             {
@@ -321 +317 @@
                                     }
 
+                                    /*
+                                     * Task canceled by caller?
+                                     * Then let the started process (cat) know by specifying end-of-file
+                                     * for the netxt input event that hopefully leads to a graceful exit ...
+                                     */
+                                    if (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
+                                        && fCanceled)
+                                    {
+                                        uFlags |= ProcessInputFlag_EndOfFile;
+                                    }
+
                                     /* Transfer the current chunk ... */
+                                #ifdef DEBUG_andy
+                                    LogRel(("Copying Guest Additions (%u bytes left) ...\n", cbLength));
+                                #endif
                                     ULONG uBytesWritten;
-                                    rc = SetProcessInput(uPID, uFlags,
-                                                         ComSafeArrayAsInParam(aInputData), &uBytesWritten);
+                                    rc = pGuest->SetProcessInput(uPID, uFlags,
+                                                                 ComSafeArrayAsInParam(aInputData), &uBytesWritten);
                                     if (FAILED(rc))
                                         break;
 
+                                    /* If task was canceled above also cancel the process execution. */
+                                    if (fCanceled)
+                                        progressCat->Cancel();
+
+                                #ifdef DEBUG_andy
+                                    LogRel(("Copying Guest Additions (%u bytes written) ...\n", uBytesWritten));
+                                #endif
                                     Assert(cbLength >= uBytesWritten);
                                     cbLength -= uBytesWritten;
-
-                                    /* Progress canceled by Main API? */
-                                    if (   SUCCEEDED(progressCopy->COMGETTER(Canceled(&fCanceled)))
-                                        && fCanceled)
-                                    {
-                                        break;
-                                    }
-                                    if (aTask->progress)
-                                    {
-                                        if (SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
-                                            && fCanceled)
-                                            break;
-                                    }
                                 }
+                            }
+
+                            /* Internal progress canceled? */
+                            if (   SUCCEEDED(progressCat->COMGETTER(Canceled(&fCanceled)))
+                                && fCanceled)
+                            {
+                                aTask->progress->Cancel();
+                                break;
                             }
                         }
@@ -351 +363 @@
             RTIsoFsClose(&iso);
 
-            if (SUCCEEDED(rc))
+            if (   SUCCEEDED(rc)
+                && (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
+                    && !fCanceled
+                   )
+               )
             {
                 /*
@@ -357 +373 @@
                  * (with system rights).
                  */
-                if (aTask->progress)
-                    aTask->progress->SetCurrentOperationProgress(66);
+                LogRel(("Preparing to execute Guest Additions update ...\n"));
+                aTask->progress->SetCurrentOperationProgress(66);
 
                 /* Prepare command line args for installer. */
@@ -400 +416 @@
         }
     }
-    catch(HRESULT aRC)
+    catch (HRESULT aRC)
     {
         rc = aRC;
@@ -406 +422 @@
 
     /* Clean up */
-    if (aTask->progress)
-        aTask->progress->SetCurrentOperationProgress(99);
-
-    /* Assign data. */
-    if (rc == S_OK)
-    {
-    }
-
     aTask->rc = rc;
-
-    if (!aTask->progress.isNull())
+    aTask->progress->SetCurrentOperationProgress(99);
+
+    if (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
+        && !fCanceled)
+    {
+        /* Task completed, regardless whether successful/failed. */
+
+        /* Assign data. */
+        if (rc == S_OK)
+        {
+            /* No data to assign yet. */
+        }
+
         aTask->progress->notifyComplete(rc);
+    }
+    else /* The task was canceled, set error code to prevent assertions. */
+    {
+        LogRel(("Automatic Guest Additions update was canceled\n"));
+        aTask->progress->notifyComplete(VBOX_E_IPRT_ERROR,
+                                        COM_IIDOF(IGuest),
+                                        Guest::getStaticComponentName(),
+                                        "Automatic Guest Additions update was canceled");
+    }
 
     LogFlowFunc(("rc=%Rhrc\n", rc));
@@ -2577 +2605 @@
 
         /* Initialize our worker task. */
-        std::auto_ptr<TaskGuest> task(new TaskGuest(TaskGuest::UpdateGuestAdditions, this, progress));
+        TaskGuest *pTask = new TaskGuest(TaskGuest::UpdateGuestAdditions, this, progress);
+        AssertPtr(pTask);
+        std::auto_ptr<TaskGuest> task(pTask);
 
         /* Assign data - in that case aSource is the full path