Changeset 95274 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Jun 14, 2022 10:48:33 AM (3 years ago)

Author:

vboxsync

Message:

FE/VBoxAutostart/adi: Added experimental support for running VBoxSVC session 0 (service session). Did some minor cleanup for the patch posted at comment 95. Disabled by default for now. bugref:9341

File:

• trunk/src/VBox/Runtime/r3/win/process-win.cpp (modified) (10 diffs)

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -1612 +1612 @@
                                   RTENV hEnv, DWORD dwCreationFlags,
                                   STARTUPINFOW *pStartupInfo, PROCESS_INFORMATION *pProcInfo,
-                                  uint32_t fFlags, const char *pszExec, uint32_t idDesiredSession)
+                                  uint32_t fFlags, const char *pszExec, uint32_t idDesiredSession,
+                                  HANDLE hUserToken)
 {
     /*
@@ -1642 +1643 @@
     DWORD   dwErr       = NO_ERROR;
     HANDLE  hTokenLogon = INVALID_HANDLE_VALUE;
-    int rc;
-    if (fFlags & RTPROC_FLAGS_AS_IMPERSONATED_TOKEN)
+    int rc = VINF_SUCCESS;
+    if (fFlags & RTPROC_FLAGS_TOKEN_SUPPLIED)
+        hTokenLogon = hUserToken;
+    else if (fFlags & RTPROC_FLAGS_AS_IMPERSONATED_TOKEN)
         rc = rtProcWinGetThreadTokenHandle(GetCurrentThread(), &hTokenLogon);
     else if (pwszUser == NULL)
@@ -1850 +1853 @@
         if (hTokenUserDesktop != INVALID_HANDLE_VALUE)
             CloseHandle(hTokenUserDesktop);
-        if (hTokenLogon != INVALID_HANDLE_VALUE)
+        if (   !(fFlags & RTPROC_FLAGS_TOKEN_SUPPLIED)
+            && hTokenLogon != INVALID_HANDLE_VALUE)
             CloseHandle(hTokenLogon);
 
@@ -2088 +2092 @@
                                  RTENV hEnv, DWORD dwCreationFlags,
                                  STARTUPINFOW *pStartupInfo, PROCESS_INFORMATION *pProcInfo,
-                                 uint32_t fFlags, const char *pszExec, uint32_t idDesiredSession)
+                                 uint32_t fFlags, const char *pszExec, uint32_t idDesiredSession,
+                                 HANDLE hUserToken)
 {
     /*
@@ -2096 +2101 @@
      * Note! This method is very slow on W2K.
      */
-    if (!(fFlags & (RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_AS_IMPERSONATED_TOKEN)))
+    if (!(fFlags & (RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_AS_IMPERSONATED_TOKEN | RTPROC_FLAGS_TOKEN_SUPPLIED)))
     {
         AssertPtr(pwszUser);
@@ -2104 +2109 @@
             return rc;
     }
-    return rtProcWinCreateAsUser2(pwszUser, pwszPassword, ppwszExec, pwszCmdLine,
-                                  hEnv, dwCreationFlags, pStartupInfo, pProcInfo, fFlags, pszExec, idDesiredSession);
+    return rtProcWinCreateAsUser2(pwszUser, pwszPassword, ppwszExec, pwszCmdLine, hEnv, dwCreationFlags,
+                                  pStartupInfo, pProcInfo, fFlags, pszExec, idDesiredSession, hUserToken);
 }
 
@@ -2282 +2287 @@
         AssertReturn(!(fFlags & RTPROC_FLAGS_DESIRED_SESSION_ID), VERR_INVALID_FLAGS);
 
+    HANDLE hUserToken = NULL;
+    if (fFlags & RTPROC_FLAGS_TOKEN_SUPPLIED)
+        hUserToken = *(HANDLE *)pvExtraData;
+
     /*
      * Initialize the globals.
@@ -2287 +2296 @@
     int rc = RTOnce(&g_rtProcWinInitOnce, rtProcWinInitOnce, NULL);
     AssertRCReturn(rc, rc);
-    if (pszAsUser || (fFlags & (RTPROC_FLAGS_PROFILE | RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_AS_IMPERSONATED_TOKEN)))
+    if (   pszAsUser
+        || (fFlags & (RTPROC_FLAGS_PROFILE | RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_AS_IMPERSONATED_TOKEN
+                      | RTPROC_FLAGS_TOKEN_SUPPLIED)))
     {
         rc = RTOnce(&g_rtProcWinResolveOnce, rtProcWinResolveOnce, NULL);
@@ -2445 +2456 @@
              */
             if (   pszAsUser == NULL
-                && !(fFlags & (RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_AS_IMPERSONATED_TOKEN)))
+                && !(fFlags & (RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_AS_IMPERSONATED_TOKEN | RTPROC_FLAGS_TOKEN_SUPPLIED)))
             {
                 /* Create the environment block first. */
@@ -2483 +2494 @@
                     if (RT_SUCCESS(rc))
                     {
-                        rc = rtProcWinCreateAsUser(pwszUser, pwszPassword,
-                                                   &pwszExec, pwszCmdLine, hEnv, dwCreationFlags,
-                                                   &StartupInfo, &ProcInfo, fFlags, pszExec, idDesiredSession);
+                        rc = rtProcWinCreateAsUser(pwszUser, pwszPassword, &pwszExec, pwszCmdLine, hEnv, dwCreationFlags,
+                                                   &StartupInfo, &ProcInfo, fFlags, pszExec, idDesiredSession,
+                                                   hUserToken);
 
                         if (pwszPassword && *pwszPassword)