儲存庫 vbox 的更動 50062

時間撮記:

2014-1-13 下午04:22:56 (11 年 以前)

作者:

vboxsync

訊息:

IPRT/process-win.cpp: Fixed environment creation for RTProcCreateEx(), regression from r75892.

檔案:

• trunk/src/VBox/Runtime/r3/win/process-win.cpp (修改) (7 筆差異)

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

@@ -645 +645 @@
                 }
             }
+            else
+                break;
             pwch += RTUtf16Len(pwch) + 1;
-            if (*pwch)
+            if (!*pwch)
                 break;
         }
@@ -674 +676 @@
 static int rtProcWinCreateEnvFromToken(HANDLE hToken, RTENV hEnv, PRTUTF16 *ppwszBlock)
 {
+    Assert(hToken);
+    Assert(hEnv != NIL_RTENV);
+
     RTLDRMOD hUserenv;
     int rc = RTLdrLoadSystem("Userenv.dll", true /*fNoUnload*/, &hUserenv);
@@ -723 +728 @@
  */
 static int rtProcWinCreateEnvFromAccount(PRTUTF16 pwszUser, PRTUTF16 pwszPassword, PRTUTF16 pwszDomain,
-                                              RTENV hEnv, PRTUTF16 *ppwszBlock)
+                                         RTENV hEnv, PRTUTF16 *ppwszBlock)
 {
     HANDLE hToken;
@@ -867 +872 @@
             phToken = fFound ? &hTokenUserDesktop : &hTokenLogon;
             RTLDRMOD hUserenv;
-            int rc = RTLdrLoadSystem("Userenv.dll", true /*fNoUnload*/, &hUserenv);
+            rc = RTLdrLoadSystem("Userenv.dll", true /*fNoUnload*/, &hUserenv);
             if (RT_SUCCESS(rc))
             {
@@ -909 +914 @@
                                                            TRUE,         /* fInheritHandles */
                                                            dwCreationFlags,
-                                                           pwszzBlock,
+                                                           /** @todo Warn about exceeding 8192 bytes
+                                                            *        on XP and up. */
+                                                           pwszzBlock,   /* lpEnvironment */
                                                            NULL,         /* pCurrentDirectory */
                                                            pStartupInfo,
@@ -1058 +1065 @@
     AssertReturn(!pszPassword || pszAsUser, VERR_INVALID_PARAMETER);
     AssertPtrNullReturn(pszPassword, VERR_INVALID_POINTER);
-    /** @todo search the PATH (add flag for this). */
 
     /*
@@ -1195 +1201 @@
                 PROCESS_INFORMATION ProcInfo;
                 RT_ZERO(ProcInfo);
-                DWORD               dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
+                DWORD dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
                 if (fFlags & RTPROC_FLAGS_DETACHED)
                     dwCreationFlags |= DETACHED_PROCESS;