Changeset 42716 in vbox for trunk/src

Timestamp:

Aug 9, 2012 3:49:46 PM (12 years ago)

Author:

vboxsync

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main

Files:

• include/GuestProcessImpl.h (modified) (2 diffs)
• src-client/GuestCtrlImpl.cpp (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (1 diff)
• src-client/GuestProcessImpl.cpp (modified) (6 diffs)
• src-client/GuestSessionImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/GuestProcessImpl.h

@@ -76 +76 @@
     inline int checkPID(uint32_t uPID);
     void close(void);
+    Utf8Str errorMsg(void) { return mData.mErrorMsg; }
     bool isReady(void);
     ULONG getPID(void) { return mData.mPID; }
     ULONG getProcessID(void) { return mData.mProcessID; }
+    int rc(void) { mData.mRC; }
     int readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS, void *pvData, size_t cbData, size_t *pcbRead);
     int startProcess(void);
@@ -102 +104 @@
     int sendCommand(uint32_t uFunction, uint32_t uParms, PVBOXHGCMSVCPARM paParms);
     int setErrorInternal(int rc, const Utf8Str &strMessage);
-    int setErrorExternal(void);
+    HRESULT setErrorExternal(void);
     int signalWaiters(ProcessWaitResult_T enmWaitResult);
     static DECLCALLBACK(int) startProcessThread(RTTHREAD Thread, void *pvUser);
-    HRESULT waitResultToErrorEx(const GuestProcessWaitResult &waitResult, bool fLog);
     /** @}  */
 

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

@@ -2675 +2675 @@
     }
 
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     HRESULT hr = S_OK;
 #if 1

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

@@ -629 +629 @@
         strmBlk.DumpToLog();
 #endif
-        /* Node ID. */
-        rc = strmBlk.GetInt64Ex("node_id", &mNodeID);
-        if (RT_FAILURE(rc)) throw rc;
+        /* Node ID, optional because we don't include this
+         * in older VBoxService (< 4.2) versions. */
+        mNodeID = strmBlk.GetInt64("node_id");
         /* Object name. */
         mName = strmBlk.GetString("name");

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

@@ -886 +886 @@
 
     if (mData.mStatus != ProcessStatus_Started)
-        return VERR_NOT_AVAILABLE;
+        return VINF_SUCCESS; /* Nothing to read anymore. */
 
     uint32_t uContextID = 0;
@@ -1016 +1016 @@
 }
 
-int GuestProcess::setErrorExternal(void)
+HRESULT GuestProcess::setErrorExternal(void)
 {
     return RT_SUCCESS(mData.mRC)
@@ -1207 +1207 @@
     LogFlowThisFuncEnter();
 
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     if (mData.mParent->getProtocolVersion() < 2)
         return VERR_NOT_SUPPORTED;
@@ -1387 +1389 @@
 }
 
-HRESULT GuestProcess::waitResultToErrorEx(const GuestProcessWaitResult &waitResult, bool fLog)
-{
-    int rc = waitResult.mRC;
-
-    Utf8Str strMsg;
-    ProcessStatus_T procStatus = mData.mStatus;
-
-    switch (procStatus)
-    {
-        case ProcessStatus_Started:
-            strMsg = Utf8StrFmt(tr("Guest process \"%s\" was started (PID %RU32)"),
-                                mData.mProcess.mCommand.c_str(), mData.mPID);
-            break;
-
-        case ProcessStatus_TerminatedNormally:
-            strMsg = Utf8StrFmt(tr("Guest process \"%s\" (PID %RU32) terminated normally (exit code: %ld)"),
-                                mData.mProcess.mCommand.c_str(), mData.mPID, mData.mExitCode);
-            break;
-
-        case ProcessStatus_TerminatedSignal:
-        {
-            strMsg = Utf8StrFmt(tr("Guest process \"%s\" (PID %RU32) terminated through signal (signal: %ld)"),
-                                mData.mProcess.mCommand.c_str(), mData.mPID, mData.mExitCode);
-            break;
-        }
-
-        case ProcessStatus_TerminatedAbnormally:
-        {
-            strMsg = Utf8StrFmt(tr("Guest process \"%s\" (PID %RU32) terminated abnormally (exit code: %ld)"),
-                                mData.mProcess.mCommand.c_str(), mData.mPID, mData.mExitCode);
-            break;
-        }
-
-        case ProcessStatus_TimedOutKilled:
-        {
-            strMsg = Utf8StrFmt(tr("Guest process \"%s\" (PID %RU32) timed out and was killed"),
-                                mData.mProcess.mCommand.c_str(), mData.mPID);
-            break;
-        }
-
-        case ProcessStatus_TimedOutAbnormally:
-        {
-            strMsg = Utf8StrFmt(tr("Guest process \"%s\" (PID %RU32) timed out and could not be killed\n"),
-                                mData.mProcess.mCommand.c_str(), mData.mPID);
-            break;
-        }
-
-        case ProcessStatus_Down:
-        {
-            strMsg = Utf8StrFmt(tr("Guest process \"%s\" (PID %RU32) was killed because guest OS is shutting down\n"),
-                                mData.mProcess.mCommand.c_str(), mData.mPID);
-            break;
-        }
-
-        case ProcessStatus_Error:
-        {
-            strMsg = Utf8StrFmt(tr("Guest process \"%s\" could not be started: ", mData.mProcess.mCommand.c_str()));
-
-            /* Note: It's not required that the process has been started before. */
-            if (mData.mPID)
-            {
-                strMsg += Utf8StrFmt(tr("Error rc=%Rrc occured (PID %RU32)"), rc, mData.mPID);
-            }
-            else
-            {
-                switch (rc) /* rc contains the IPRT error code from guest side. */
-                {
-                    case VERR_FILE_NOT_FOUND: /* This is the most likely error. */
-                        strMsg += Utf8StrFmt(tr("The specified file was not found on guest"));
-                        break;
-
-                    case VERR_PATH_NOT_FOUND:
-                        strMsg += Utf8StrFmt(tr("Could not resolve path to specified file was not found on guest"));
-                        break;
-
-                    case VERR_BAD_EXE_FORMAT:
-                        strMsg += Utf8StrFmt(tr("The specified file is not an executable format on guest"));
-                        break;
-
-                    case VERR_AUTHENTICATION_FAILURE:
-                        strMsg += Utf8StrFmt(tr("The specified user was not able to logon on guest"));
-                        break;
-
-                    case VERR_INVALID_NAME:
-                        strMsg += Utf8StrFmt(tr("The specified file is an invalid name"));
-                        break;
-
-                    case VERR_TIMEOUT:
-                        strMsg += Utf8StrFmt(tr("The guest did not respond within time"));
-                        break;
-
-                    case VERR_CANCELLED:
-                        strMsg += Utf8StrFmt(tr("The execution operation was canceled"));
-                        break;
-
-                    case VERR_PERMISSION_DENIED:
-                        strMsg += Utf8StrFmt(tr("Invalid user/password credentials"));
-                        break;
-
-                    case VERR_MAX_PROCS_REACHED:
-                        strMsg += Utf8StrFmt(tr("Maximum number of parallel guest processes has been reached"));
-                        break;
-
-                    default:
-                        strMsg += Utf8StrFmt(tr("Reported error %Rrc"), rc);
-                        break;
-                }
-            }
-
-            break;
-        }
-
-        case ProcessStatus_Undefined:
-        default:
-
-            /* Silently skip this request. */
-            break;
-    }
-
-    HRESULT hr = S_OK;
-    if (RT_FAILURE(rc))
-    {
-        Assert(!strMsg.isEmpty());
-        hr = setError(VBOX_E_IPRT_ERROR, "%s", strMsg.c_str());
-    }
-
-    if (fLog)
-    {
-        Assert(!strMsg.isEmpty());
-
-        strMsg.append("\n");
-        LogRel(("%s", strMsg.c_str()));
-    }
-
-    return hr;
-}
-
 int GuestProcess::writeData(uint32_t uHandle, uint32_t uFlags,
                             void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten)
@@ -1534 +1399 @@
 
     if (mData.mStatus != ProcessStatus_Started)
-        return VERR_NOT_AVAILABLE;
+        return VINF_SUCCESS; /* Not available for writing (anymore). */
 
     uint32_t uContextID = 0;
@@ -1670 +1535 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     int rc = terminateProcess();

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

@@ -144 +144 @@
 }
 
+/** @todo Merge this and the above call and let the above call do the open/close file handling so that the
+ *        inner code only has to deal with file handles. No time now ... */
 SessionTaskCopyTo::SessionTaskCopyTo(GuestSession *pSession,
                                      PRTFILE pSourceFile, size_t cbSourceOffset, uint64_t cbSourceSize,
@@ -746 +748 @@
         {
             hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                     Utf8StrFmt(GuestSession::tr("Invalid installation medium \"%s\" detected: %Rrc"),
+                                     Utf8StrFmt(GuestSession::tr("Unable to open Guest Additions .ISO file \"%s\": %Rrc"),
                                      mSource.c_str(), rc));
         }
@@ -759 +761 @@
                 if (RT_FAILURE(rc))
                     hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                             Utf8StrFmt(GuestSession::tr("Could not seek to setup file on installation medium \"%s\": %Rrc"),
-                                             mSource.c_str(), rc));
+                                             Utf8StrFmt(GuestSession::tr("Unable to retrievev setup file \"%s\" information on \"%s\": %Rrc"),
+                                             strInstallerImage.c_str(), mSource.c_str(), rc));
             }
             else
@@ -768 +770 @@
                     case VERR_FILE_NOT_FOUND:
                         hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                 Utf8StrFmt(GuestSession::tr("Setup file was not found on installation medium \"%s\""),
-                                                 mSource.c_str()));
+                                                 Utf8StrFmt(GuestSession::tr("Installer \"%s\" was not found on \"%s\""),
+                                                 strInstallerImage.c_str(), mSource.c_str()));
                         break;
 
                     default:
                         hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                 Utf8StrFmt(GuestSession::tr("An unknown error (%Rrc) occured while retrieving information of setup file on installation medium \"%s\""),
-                                                 rc, mSource.c_str()));
+                                                 Utf8StrFmt(GuestSession::tr("Error while retrieving information for installer \"%s\" on \"%s\": %Rrc"),
+                                                 strInstallerImage.c_str(), mSource.c_str(), rc));
                         break;
                 }
@@ -849 +851 @@
                  * (with system rights).
                  */
-                LogRel(("Starting Guest Additions installer ...\n"));
+                LogRel(("Verifying Guest Additions installer ...\n"));
                 rc = setProgress(60);
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                /* Determine where the installer image ended up and if it has the
+                 * correct size. */
+                GuestFsObjData objData;
+                int64_t cbSizeOnGuest;
+                rc = pSession->fileQuerySizeInternal(strInstallerDest, &cbSizeOnGuest);
+                if (RT_FAILURE(rc))
+                {
+                    /** @todo Windows only! */
+
+                    /* Because older Guest Additions have problems with environment variable
+                     * expansion in parameters we have to check an alternative location on Windows.
+                     * So check for "%TEMP%\VBoxWindowsAdditions.exe" in a screwed up way. */
+                    rc = pSession->fileQuerySizeInternal("C:\\Windows\\system32\\EMPVBoxWindowsAdditions.exe", &cbSizeOnGuest);
+                    if (RT_SUCCESS(rc))
+                        strInstallerDest = "C:\\Windows\\system32\\EMPVBoxWindowsAdditions.exe";
+                }
+
+                if (   RT_SUCCESS(rc)
+                    && cbSize == (uint64_t)cbSizeOnGuest)
+                {
+                    LogRel(("Guest Additions installer successfully verified\n"));
+                    rc = setProgress(65);
+                }
+                else
+                {
+                    if (RT_FAILURE(rc))
+                    {
+                        hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Unable to find Guest Additions installer on guest: %Rrc"), rc));
+                    }
+                    else
+                    {
+                        hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Guest Additions installer was not transfered fully (%RI64/%RU64)"),
+                                                            cbSizeOnGuest, cbSize));
+                        rc = VERR_GENERAL_FAILURE; /* Fudge. */
+                    }
+                }
             }
 
@@ -904 +948 @@
                         }
                         else /* Yay, success! */
+                        {
+                            /** @todo Add code for verifying the update. */
+                            LogRel(("Updating Guest Additions successful\n"));
                             hr = setProgressSuccess();
+                        }
                     }
                     else
@@ -912 +960 @@
                                                      Utf8StrFmt(GuestSession::tr("Error while waiting for Guest Additions update: %Rrc"), rc));
                         else
-                            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                     Utf8StrFmt(GuestSession::tr("Error installing Guest Additions update: %Rrc"),
-                                                                waitRes.mRC));
+                        {
+                            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, pProcess->errorMsg());
+                            rc = VERR_GENERAL_FAILURE; /* Fudge. */
+                        }
                     }
                 }
+                if (!pProcess.isNull())
+                    pProcess->close();
             }
             RTIsoFsClose(&iso);