Changeset 43052 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 28, 2012 3:59:13 PM (12 years ago)

Author:

vboxsync

Message:

Main/GuestSessionImplTasks: Set a higher timeout for Windows Guest Additions setup, error handling.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -150 +150 @@
     {
         HRESULT hr2 = mProgress->notifyComplete(hr,
-                                               COM_IIDOF(IGuestSession),
-                                               GuestSession::getStaticComponentName(),
-                                               strMsg.c_str());
+                                                COM_IIDOF(IGuestSession),
+                                                GuestSession::getStaticComponentName(),
+                                                strMsg.c_str());
         if (FAILED(hr2))
             return hr2;
@@ -841 +841 @@
         rc = pProcess->waitFor(ProcessWaitForFlag_Terminate,
                                10 * 60 * 1000 /* 10 mins Timeout */, waitRes);
+        LogFlowThisFunc(("waitFor rc=%Rrc, waitRes=%ld\n", rc, waitRes));
         if (waitRes.mResult == ProcessWaitResult_Terminate)
         {
@@ -863 +864 @@
         else
         {
+            /** @todo Unify error handling. */
             if (RT_FAILURE(rc))
+            {
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                     Utf8StrFmt(GuestSession::tr("Error while waiting running %s: %Rrc"),
                                                procInfo.mName.c_str(), rc));
+            }
             else
             {
-                setProgressErrorMsg(VBOX_E_IPRT_ERROR, pProcess->errorMsg());
+                if (pProcess->errorMsg().isEmpty())
+                {
+                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                        Utf8StrFmt(GuestSession::tr("Running %s returned unexpectedly with status %ld"),
+                                                   procInfo.mName.c_str(), waitRes.mResult));
+                }
+                else
+                    setProgressErrorMsg(VBOX_E_IPRT_ERROR, pProcess->errorMsg());
                 rc = VERR_GENERAL_FAILURE; /* Fudge. */
             }
@@ -1140 +1151 @@
                         GuestProcessStartupInfo siInstaller;
                         siInstaller.mName = "VirtualBox Windows Guest Additions Installer";
+                        /* Set a running timeout of 5 minutes -- the Windows Guest Additions
+                         * setup can take quite a while, so be on the safe side. */
+                        siInstaller.mTimeoutMS = 5 * 60 * 1000;
                         siInstaller.mArguments.push_back(Utf8Str("/S")); /* We want to install in silent mode. */
                         siInstaller.mArguments.push_back(Utf8Str("/l")); /* ... and logging enabled. */
@@ -1192 +1206 @@
                         {
                             hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                      Utf8StrFmt(GuestSession::tr("Error while copying file \"%s\" to \"%s\" on the guest: %Rrc"),
-                                                                 itFiles->strSource.c_str(), itFiles->strDest.c_str(), rc));
+                                                     Utf8StrFmt(GuestSession::tr("Error while copying file \"%s\" to \"%s\" on the guest: %Rrc"),
+                                                                itFiles->strSource.c_str(), itFiles->strDest.c_str(), rc));
                             break;
                         }
@@ -1226 +1240 @@
                         rc = runFileOnGuest(pSession, itFiles->mProcInfo);
                         if (RT_FAILURE(rc))
-                        {
-                            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                      Utf8StrFmt(GuestSession::tr("Error while running installer file \"%s\" on the guest: %Rrc"),
-                                                                 itFiles->strDest.c_str(), rc));
                             break;
-                        }
                     }