Changeset 57800 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Sep 17, 2015 9:04:31 AM (9 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Use the newly introduced RTPROC_FLAGS_OVERWRITE_WITH_PROFILE flag to correctly load the required user profile.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1956 +1956 @@
 #ifdef RT_OS_WINDOWS
                                 /* Make sure to also load the profile data on a Windows guest. */
-                                | RTPROC_FLAGS_PROFILE /** @todo Not implemented for non-Windows yet. */
+                                | RTPROC_FLAGS_PROFILE                /** @todo Not implemented for non-Windows yet. */
+                                | RTPROC_FLAGS_OVERWRITE_WITH_PROFILE
 #endif
                                 | RTPROC_FLAGS_HIDDEN; /** @todo More flags from startup info? */
+            /*
+             * Create the session process' environment block.
+             */
+            RTENV hEnv = NIL_RTENV;
+            if (RT_SUCCESS(rc))
+            {
+                /** @todo At the moment a session process does not have the ability to use the
+                 *        per-session environment variables itself, only the session's guest
+                 *        processes do so. Implement that later, also needs tweaking of
+                 *        VbglR3GuestCtrlSessionGetOpen(). */
+                rc = RTEnvClone(&hEnv, RTENV_DEFAULT);
+
+                if (g_cVerbosity > 3)
+                {
+                    VBoxServiceVerbose(4, "Environment variables:\n");
+
+                    uint32_t cVars = RTEnvCountEx(hEnv);
+                    for (uint32_t iVar = 0; iVar < cVars; iVar++)
+                    {
+                        char szVar[_1K];
+                        char szValue[_16K];
+                        rc2 = RTEnvGetByIndexEx(hEnv, iVar, szVar, sizeof(szVar), szValue, sizeof(szValue));
+                        if (RT_SUCCESS(rc2))
+                            VBoxServiceVerbose(4, "\t%s=%s\n", szVar, szValue);
+                        else if (rc2 == VERR_BUFFER_OVERFLOW)
+                            VBoxServiceVerbose(4, "\t%s=%s [VERR_BUFFER_OVERFLOW]\n", szVar, szValue);
+                        else
+                        {
+                            VBoxServiceVerbose(4, "\tUnable to enumerate environment variable #%RU32: %Rrc\n", iVar, rc2);
+                            /* Keep going. */
+                        }
+                    }
+                }
+            }
 
 #if 0 /* Pipe handling not needed (yet). */
@@ -2021 +2056 @@
                     hStdOutAndErr.enmType = RTHANDLETYPE_FILE;
 
-                    rc = RTProcCreateEx(pszExeName, papszArgs, RTENV_DEFAULT, uProcFlags,
+                    rc = RTProcCreateEx(pszExeName, papszArgs, hEnv, uProcFlags,
                                         &hStdIn, &hStdOutAndErr, &hStdOutAndErr,
                                         !fAnonymous ? pSessionThread->StartupInfo.szUser : NULL,
@@ -2033 +2068 @@
             }
 #endif
+            if (hEnv != NIL_RTENV)
+                RTEnvDestroy(hEnv);
         }
         else