Changeset 21673

Timestamp:

Jul 22, 2011, 12:47:57 AM (14 years ago)

Author:

dmik

Message:

CreateProcessA: Add support for CREATE_UNICODE_ENVIRONMENT.

This also fixes CreateProcessW calls which didn't handle the environment properly.

File:

• trunk/src/kernel32/wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/wprocess.cpp ¶

@@ -2382 +2382 @@
 
     if(lpEnvironment) {
-        newenv = CreateNewEnvironment((char *)lpEnvironment);
+        char *envA = (char *)lpEnvironment;
+        if(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT) {
+            // process the CREATE_UNICODE_ENVIRONMENT on our own --
+            // O32_CreateProcessA() is not aware of it
+            dwCreationFlags &= ~CREATE_UNICODE_ENVIRONMENT;
+
+            WCHAR *tmp = (WCHAR *)lpEnvironment;
+            int sizeW = 0;
+            while (*tmp) {
+                int lenW = lstrlenW(tmp);
+                sizeW += lenW + 1;
+                tmp += lenW + 1;
+            }
+            sizeW++; // terminating null
+            int sizeA = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)lpEnvironment, sizeW,
+                                            NULL, 0, 0, NULL);
+            envA = (char *)malloc(sizeA);
+            if(envA == NULL) {
+                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+                rc = FALSE;
+                goto finished;
+            }
+            WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)lpEnvironment, sizeW,
+                                envA, sizeA, 0, NULL);
+        }
+        newenv = CreateNewEnvironment(envA);
+        if(envA != (char *)lpEnvironment)
+            free(envA);
         if(newenv == NULL) {
             SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -2625 +2652 @@
     if(lpCurrentDirectory)
         astring3 = UnicodeToAsciiString((LPWSTR)lpCurrentDirectory);
+    if(lpEnvironment) {
+        // use a special flag instead of converting the environment here
+        dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT;
+    }
     rc = CreateProcessA(astring1, astring2, lpProcessAttributes, lpThreadAttributes,
                         bInheritHandles, dwCreationFlags, lpEnvironment,