Changeset 33558 in vbox for trunk/src/VBox/Main/GuestImpl.cpp

Timestamp:

Oct 28, 2010 1:37:37 PM (15 years ago)

Author:

vboxsync

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

67164

Message:

Guest Copy/Guest Additions: First working version of host-triggered Guest Additions updates.

File:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -54 +54 @@
     enum TaskType
     {
+        /** Update Guest Additions by directly copying the required installer
+         *  off the .ISO file, transfer it to the guest and execute the installer
+         *  with system priviledges. */
         UpdateGuestAdditions = 100
     };
@@ -148 +151 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock appLock(this COMMA_LOCKVAL_SRC_POS);
+    /*
+     * Do *not* take a write lock here since we don't (and won't)
+     * touch any class-specific data (of IGuest) here - only the member functions
+     * which get called here can do that.
+     */
 
     HRESULT rc = S_OK;
@@ -202 +209 @@
             }
 
-            /** @todo Only Windows! */
+            /** @todo Only Windows! Don't use percent (like %TEMP%) env vars -- Windows
+             *        will quote it like "%TEMP%" which results in a *not* working command
+             *        line! */
             Utf8Str strInstallerPath = "C:\\Windows\\VBoxWindowsAdditions.exe";
 
@@ -214 +223 @@
 
                     default:
-                        rc = setError(VBOX_E_IPRT_ERROR, tr("An unknown error occured, rc=%Rrc"), vrc);
+                        rc = setError(VBOX_E_IPRT_ERROR, tr("An unknown error occured (%Rrc)"), vrc);
                         break;
                 }
@@ -220 +229 @@
             else
             {
-                /* Okay, we're ready to transfer the bits! */
+                /* Okay, we're ready to start our copy routine on the guest! */
                 if (aTask->progress)
                     aTask->progress->SetCurrentOperationProgress(15);
@@ -231 +240 @@
                 if (RTStrPrintf(szOutput, sizeof(szOutput), "--output=%s", strInstallerPath.c_str()))
                 {
-                    args.push_back(Bstr("vbox_cat").raw()); /* The actual (internal) tool to use (as argv[0]). */
-                    args.push_back(Bstr(szOutput).raw());   /* We want to write a file ... */
+                    args.push_back(Bstr(VBOXSERVICE_TOOL_CAT).raw()); /* The actual (internal) tool to use (as argv[0]). */
+                    args.push_back(Bstr(szOutput).raw());             /* We want to write a file ... */
                 }
                 else
@@ -247 +256 @@
                      * system rights, no username/password specified).
                      */
-                    rc = pGuest->executeProcessInternal(Bstr("vbox_cat").raw(),
+                    rc = pGuest->executeProcessInternal(Bstr(VBOXSERVICE_TOOL_CAT).raw(),
                                                         ExecuteProcessFlag_WaitForProcessStartOnly,
                                                         ComSafeArrayAsInParam(args),
@@ -270 +279 @@
                                && !fCompleted)
                         {
+                            /* cbLength contains remaining bytes of our installer file
+                             * opened above to read. */
                             cbToRead = RT_MIN(cbLength, _64K);
-                            vrc = RTFileRead(iso.file, (uint8_t*)aInputData.raw(), cbToRead, &cbRead);
-                            if (   cbRead
-                                && RT_SUCCESS(vrc))
+                            if (cbToRead)
                             {
-                                aInputData.resize(cbRead);
-
-                                /* Did we reach the end of the content
-                                 * we want to transfer (last chunk)? */
-                                ULONG uFlags = ProcessInputFlag_None;
-                                if (cbRead < _64K)
-                                    uFlags |= ProcessInputFlag_EndOfFile;
-
-                                /* Transfer the current chunk ... */
-                                ULONG uBytesWritten;
-                                rc = SetProcessInput(uPID, uFlags,
-                                                     ComSafeArrayAsInParam(aInputData), &uBytesWritten);
-                                if (FAILED(rc))
+                                vrc = RTFileRead(iso.file, (uint8_t*)aInputData.raw(), cbToRead, &cbRead);
+                                if (   cbRead
+                                    && RT_SUCCESS(vrc))
                                 {
-                                    break;
-                                }
-                                else
-                                {
+                                    /* Did we reach the end of the content
+                                     * we want to transfer (last chunk)? */
+                                    ULONG uFlags = ProcessInputFlag_None;
+                                    if (cbRead < _64K)
+                                    {
+                                        uFlags |= ProcessInputFlag_EndOfFile;
+                                        if (cbRead > 0) /* Don't allow an empty array! */
+                                            aInputData.resize(cbRead); /* Adjust array size (less than 64K read). */
+                                    }
+
+                                    /* Transfer the current chunk ... */
+                                    ULONG uBytesWritten;
+                                    rc = SetProcessInput(uPID, uFlags,
+                                                         ComSafeArrayAsInParam(aInputData), &uBytesWritten);
+                                    if (FAILED(rc))
+                                        break;
+
+                                    Assert(cbLength >= uBytesWritten);
                                     cbLength -= uBytesWritten;
-                                }
-
-                                /* Progress canceled by Main API? */
-                                if (   SUCCEEDED(progressCopy->COMGETTER(Canceled(&fCanceled)))
-                                    && fCanceled)
-                                {
-                                    break;
+
+                                    /* Progress canceled by Main API? */
+                                    if (   SUCCEEDED(progressCopy->COMGETTER(Canceled(&fCanceled)))
+                                        && fCanceled)
+                                    {
+                                        break;
+                                    }
                                 }
                             }
@@ -324 +337 @@
                 /** @todo Only Windows! */
                 installerArgs.push_back(Bstr(strInstallerPath).raw()); /* The actual (internal) installer image (as argv[0]). */
-                installerArgs.push_back(Bstr("/S").raw());             /* We want to install in silent mode. */
-                installerArgs.push_back(Bstr("/l").raw());             /* ... and logging enabled. */
+                /* Note that starting at Windows Vista the lovely session 0 separation applies:
+                 * This means that if we run an application with the profile/security context
+                 * of VBoxService (system rights!) we're not able to show any UI. */
+                installerArgs.push_back(Bstr("/S").raw());      /* We want to install in silent mode. */
+                installerArgs.push_back(Bstr("/l").raw());      /* ... and logging enabled. */
+                /* Don't quit VBoxService during upgrade because it still is used for this
+                 * piece of code we're in right now (that is, here!) ... */
+                installerArgs.push_back(Bstr("/no_vboxservice_exit").raw());
 
                 /*
-                 * Start built-in "vbox_cat" tool (inside VBoxService) to
-                 * copy over/pipe the data into a file on the guest (with
-                 * system rights, no username/password specified).
+                 * Start the just copied over installer with system rights
+                 * in silent mode on the guest.
                  */
                 ComPtr<IProgress> progressInstaller;
@@ -2264 +2282 @@
                     if (RTStrPrintf(szOutput, sizeof(szOutput), "--output=%s", Utf8Dest.c_str()))
                     {
-                        args.push_back(Bstr("vbox_cat").raw()); /* The actual (internal) tool to use (as argv[0]). */
-                        args.push_back(Bstr(szOutput).raw());   /* We want to write a file ... */
+                        args.push_back(Bstr(VBOXSERVICE_TOOL_CAT).raw()); /* The actual (internal) tool to use (as argv[0]). */
+                        args.push_back(Bstr(szOutput).raw());             /* We want to write a file ... */
                     }
                     else
@@ -2280 +2298 @@
                          * actual copying, start the guest part now.
                          */
-                        rc = ExecuteProcess(Bstr("vbox_cat").raw(),
+                        rc = ExecuteProcess(Bstr(VBOXSERVICE_TOOL_CAT).raw(),
                                             ExecuteProcessFlag_WaitForProcessStartOnly,
                                             ComSafeArrayAsInParam(args),
@@ -2377 +2395 @@
         std::auto_ptr<TaskGuest> task(new TaskGuest(TaskGuest::UpdateGuestAdditions, this, progress));
 
-        /* Assign data. */
+        /* Assign data - in that case aSource is the full path
+         * to the Guest Additions .ISO we want to mount. */
         task->strSource = (Utf8Str(aSource));