Changeset 34881 in vbox

Timestamp:

Dec 9, 2010 12:29:01 PM (14 years ago)

Author:

vboxsync

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

68694

Message:

Automatic Guest Additions update/Main: Pass error information to external progress object.

File:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -329 +329 @@
 
                             /* Resize buffer to reflect amount we just have read. */
-                            aInputData.resize(cbRead);
+                            if (cbRead > 0)
+                                aInputData.resize(cbRead);
 
                             ULONG uFlags = ProcessInputFlag_None;
@@ -429 +430 @@
         }
         else /* Everything else is not supported (yet). */
-            throw setError(VBOX_E_NOT_SUPPORTED, tr("Guest OS not supported for automatic Guest Additions updating"));
+            throw TaskGuest::setProgressErrorInfo(VBOX_E_NOT_SUPPORTED, aTask->progress,
+                                                  Guest::tr("Detected guest OS (%s) does not support automatic Guest Additions updating, please update manually"),
+                                                  osType.c_str());
 
         /*
@@ -460 +463 @@
         if (RT_FAILURE(vrc))
         {
-            rc = setError(VBOX_E_FILE_ERROR, tr("Invalid installation medium detected"));
+            rc = TaskGuest::setProgressErrorInfo(VBOX_E_FILE_ERROR, aTask->progress,
+                                                 Guest::tr("Invalid installation medium (%s) detected"),
+                                                 aTask->strSource.c_str());
         }
         else
@@ -472 +477 @@
             {
                 vrc = RTFileSeek(iso.file, cbOffset, RTFILE_SEEK_BEGIN, NULL);
+                if (RT_FAILURE(vrc))
+                    rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
+                                                         Guest::tr("Could not seek to setup file on installation medium (%Rrc)"), vrc);
             }
-
-            /* Specify the ouput path on the guest side. */
-            Utf8Str strInstallerPath = "%TEMP%\\VBoxWindowsAdditions.exe";
-
-            if (RT_FAILURE(vrc))
+            else
             {
                 switch (vrc)
                 {
                     case VERR_FILE_NOT_FOUND:
-                        rc = setError(VBOX_E_IPRT_ERROR, tr("Setup file was not found on installation medium"));
+                        rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
+                                                             Guest::tr("Setup file was not found on installation medium"));
                         break;
 
                     default:
-                        rc = setError(VBOX_E_IPRT_ERROR, tr("An unknown error occured (%Rrc)"), vrc);
+                        rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
+                                                             Guest::tr("An unknown error occured while retrieving information of setup file (%Rrc)"), vrc);
                         break;
                 }
             }
-            else
+
+            /* Specify the ouput path on the guest side. */
+            Utf8Str strInstallerPath = "%TEMP%\\VBoxWindowsAdditions.exe";
+
+            if (RT_SUCCESS(vrc))
             {
                 /* Okay, we're ready to start our copy routine on the guest! */
@@ -536 +546 @@
                              * support the guest execution feature in this version). */
                             case VERR_NOT_FOUND:
-                                rc = setError(VBOX_E_NOT_SUPPORTED,
-                                              tr("Guest Additions seem not to be installed or are not ready to update yet"));
+                                rc = TaskGuest::setProgressErrorInfo(VBOX_E_NOT_SUPPORTED, aTask->progress,
+                                                                     Guest::tr("Guest Additions seem not to be installed or are not ready to update yet"));
                                 break;
 
@@ -543 +553 @@
                              * execution but not the built-in "vbox_cat" tool of VBoxService (< 4.0). */
                             case VERR_INVALID_PARAMETER:
-                                rc = setError(VBOX_E_NOT_SUPPORTED,
-                                              tr("Installed Guest Additions do not support automatic updating"));
+                                rc = TaskGuest::setProgressErrorInfo(VBOX_E_NOT_SUPPORTED, aTask->progress,
+                                                                     Guest::tr("Installed Guest Additions do not support automatic updating"));
                                 break;
 
                             default:
-                                rc = setError(E_FAIL,
-                                              tr("Error copying Guest Additions installer (%Rrc)"), vrc);
+                                rc = TaskGuest::setProgressErrorInfo(E_FAIL, aTask->progress,
+                                                                     Guest::tr("Error copying Guest Additions setup file to guest path \"%s\" (%Rrc)"),
+                                                                     strInstallerPath.c_str(), vrc);
                                 break;
                         }
@@ -573 +584 @@
                                     && RT_SUCCESS(vrc))
                                 {
-                                    /* Did we reach the end of the content
-                                     * we want to transfer (last chunk)? */
+                                    /* Resize buffer to reflect amount we just have read. */
+                                    if (cbRead > 0)
+                                        aInputData.resize(cbRead);
+
+                                    /* Did we reach the end of the content we want to transfer (last chunk)? */
                                     ULONG uFlags = ProcessInputFlag_None;
-                                    if (cbRead < _1M)
-                                    {
-                                        uFlags |= ProcessInputFlag_EndOfFile;
-                                        if (cbRead > 0) /* Don't allow an empty array! */
-                                            aInputData.resize(cbRead); /* Adjust array size (less than 64K read). */
-                                    }
-
-                                    /*
-                                     * 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)
+                                    if (   (cbRead < _1M)
+                                        /* ... or does the user want to cancel? */
+                                        || (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
+                                            && fCanceled)
+                                       )
                                     {
                                         uFlags |= ProcessInputFlag_EndOfFile;
@@ -602 +607 @@
                                                                  ComSafeArrayAsInParam(aInputData), &uBytesWritten);
                                     if (FAILED(rc))
+                                    {
+                                        rc = TaskGuest::setProgressErrorInfo(rc, aTask->progress, pGuest);
                                         break;
+                                    }
 
                                     /* If task was canceled above also cancel the process execution. */
@@ -714 +722 @@
                             else
                             {
-                                rc = setError(VBOX_E_IPRT_ERROR,
-                                              tr("Guest Additions update failed with exit code=%u (Status=%u, Flags=%u)"),
-                                              uRetExitCode, uRetStatus, uRetFlags);
+                                rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
+                                                                     Guest::tr("Guest Additions update failed with exit code=%u (status=%u, flags=%u)"),
+                                                                     uRetExitCode, uRetStatus, uRetFlags);
                             }
                         }
                         else if (fCanceled)
                         {
-                            rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("Guest Additions update was canceled with exit code=%u (Status=%u, Flags=%u)"),
-                                          uRetExitCode, uRetStatus, uRetFlags);
+                            rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
+                                                                 Guest::tr("Guest Additions update was canceled by the guest with exit code=%u (status=%u, flags=%u)"),
+                                                                 uRetExitCode, uRetStatus, uRetFlags);
                         }
                         else
-                            AssertMsgFailed(("Unknown Guest Additions update status!"));
+                            AssertMsgFailed(("Unknown Guest Additions update status!\n"));
                     }
                 }
+                else
+                    rc = TaskGuest::setProgressErrorInfo(rc, aTask->progress, pGuest);
             }
         }
@@ -739 +749 @@
     /* Clean up */
     aTask->rc = rc;
-
-    if (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
-        && !fCanceled
-        && SUCCEEDED(aTask->progress->COMGETTER(Completed(&fCompleted)))
-        && !fCompleted)
-    {
-        if (FAILED(rc))
-        {
-            aTask->progress->notifyComplete(rc,
-                                            COM_IIDOF(IGuest),
-                                            Guest::getStaticComponentName(),
-                                            rc == VBOX_E_NOT_SUPPORTED
-                                            ? Guest::tr("Automatic Guest Additions update not supported")
-                                            : Guest::tr("Automatic Guest Additions update failed"));
-        }
-        else
-            AssertMsgFailed(("Automatic Guest Additions update neither canceled nor completed and did *not* fail!? D'oh!\n"));
-    }
 
     LogFlowFunc(("rc=%Rhrc\n", rc));
@@ -1360 +1352 @@
 
         default:
-            AssertMsgFailed(("Unknown guest control notification received, u32Function=%u", u32Function));
+            AssertMsgFailed(("Unknown guest control notification received, u32Function=%u\n", u32Function));
             rc = VERR_INVALID_PARAMETER;
             break;