Changeset 21462 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Sep 29, 2010, 12:04:46 AM (15 years ago)

Author:

dmik

Message:

Fixed: CreateProcess could not start programs with national characters in names on systems where the OS/2 codepage is not equal to the Windows ANSI codepage (like the .ru locale). Continuation of r21461.

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1918 +1918 @@
 //******************************************************************************
 //******************************************************************************
+static BOOL WINAPI O32_CreateProcessA(LPCSTR lpApplicationName, LPCSTR lpCommandLine,
+                                      LPSECURITY_ATTRIBUTES lpProcessAttributes,
+                                      LPSECURITY_ATTRIBUTES lpThreadAttributes,
+                                      BOOL bInheritHandles, DWORD dwCreationFlags,
+                                      LPVOID lpEnvironment, LPCSTR lpCurrentDirectory,
+                                      LPSTARTUPINFOA lpStartupInfo,
+                                      LPPROCESS_INFORMATION lpProcessInfo)
+{
+    LPSTR lpstr;
+    DWORD cb;
+    BOOL rc;
+
+    #define ALLOC_OEM(v) \
+        if (v) { \
+            lpstr = (LPSTR)_smalloc(strlen(v) + 1); \
+            CharToOemA(v,  lpstr); \
+            v = lpstr; \
+        }
+    #define FREE_OEM(v) \
+        if (v) \
+            _sfree((void*)v); \
+
+
+    // this converts all string arguments from ANSI to OEM expected by
+    // O32_CreateProcess()
+
+    ALLOC_OEM(lpApplicationName)
+    ALLOC_OEM(lpCommandLine)
+    ALLOC_OEM(lpCurrentDirectory)
+
+    if (lpEnvironment) {
+        cb = 0;
+        lpstr = (LPSTR)lpEnvironment;
+        while (lpstr[cb]) {
+            cb += strlen(&lpstr[cb]) + 1;
+        }
+        ++cb;
+        lpstr = (LPSTR)_smalloc(cb);
+        CharToOemBuffA((LPSTR)lpEnvironment, lpstr, cb);
+        lpEnvironment = lpstr;
+    }
+
+    ALLOC_OEM(lpStartupInfo->lpReserved)
+    ALLOC_OEM(lpStartupInfo->lpDesktop)
+    ALLOC_OEM(lpStartupInfo->lpTitle)
+
+    rc = O32_CreateProcess(lpApplicationName, lpCommandLine,
+                           lpProcessAttributes, lpThreadAttributes,
+                           bInheritHandles, dwCreationFlags,
+                           lpEnvironment, lpCurrentDirectory,
+                           lpStartupInfo, lpProcessInfo);
+
+    FREE_OEM(lpStartupInfo->lpTitle)
+    FREE_OEM(lpStartupInfo->lpDesktop)
+    FREE_OEM(lpStartupInfo->lpReserved)
+
+    FREE_OEM(lpEnvironment)
+
+    FREE_OEM(lpCurrentDirectory)
+    FREE_OEM(lpCommandLine)
+    FREE_OEM(lpApplicationName)
+
+    return rc;
+}
+//******************************************************************************
+//******************************************************************************
 BOOL WINAPI CreateProcessA( LPCSTR lpApplicationName, LPSTR lpCommandLine,
                             LPSECURITY_ATTRIBUTES lpProcessAttributes,
@@ -1926 +1992 @@
                             LPPROCESS_INFORMATION lpProcessInfo )
 {
- STARTUPINFOA startinfo;
- TEB *pThreadDB = (TEB*)GetThreadTEB();
- char *cmdline = NULL, *newenv = NULL, *oldlibpath = NULL;
- BOOL  rc;
+    STARTUPINFOA startinfo;
+    TEB *pThreadDB = (TEB*)GetThreadTEB();
+    char *cmdline = NULL, *newenv = NULL, *oldlibpath = NULL;
+    BOOL  rc;
+    LPSTR lpstr;
 
     dprintf(("KERNEL32: CreateProcessA %s cline:%s inherit:%d cFlags:%x Env:%x CurDir:%s StartupFlags:%x\n",
@@ -2097 +2164 @@
 
     trylaunchagain:
-      if(O32_CreateProcess(szAppName, lpCommandLine, lpProcessAttributes,
-                         lpThreadAttributes, bInheritHandles, dwCreationFlags,
-                         lpEnvironment, lpCurrentDirectory, lpStartupInfo,
-                         lpProcessInfo) == TRUE)
+      if (O32_CreateProcessA(szAppName, lpCommandLine, lpProcessAttributes,
+                             lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                             lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                             lpProcessInfo) == TRUE)
       {
         if (dwCreationFlags & DEBUG_PROCESS && pThreadDB != NULL)
@@ -2224 +2291 @@
                  cmdline));
 
-        rc = O32_CreateProcess(lpszExecutable, (LPCSTR)cmdline,lpProcessAttributes,
-                               lpThreadAttributes, bInheritHandles, dwCreationFlags,
-                               lpEnvironment, lpCurrentDirectory, lpStartupInfo,
-                               lpProcessInfo);
+        rc = O32_CreateProcessA(lpszExecutable, (LPCSTR)cmdline,lpProcessAttributes,
+                                lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                                lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                                lpProcessInfo);
     }
     else
@@ -2244 +2311 @@
                  szNELoader,
                  cmdline));
-        rc = O32_CreateProcess(szNELoader, (LPCSTR)cmdline, lpProcessAttributes,
-                               lpThreadAttributes, bInheritHandles, dwCreationFlags,
-                               lpEnvironment, lpCurrentDirectory, lpStartupInfo,
-                               lpProcessInfo);
+        rc = O32_CreateProcessA(szNELoader, (LPCSTR)cmdline, lpProcessAttributes,
+                                lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                                lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                                lpProcessInfo);
     }
     else {//os/2 app??
-        rc = O32_CreateProcess(szAppName, (LPCSTR)lpCommandLine, lpProcessAttributes,
-                               lpThreadAttributes, bInheritHandles, dwCreationFlags,
-                               lpEnvironment, lpCurrentDirectory, lpStartupInfo,
-                               lpProcessInfo);
+        rc = O32_CreateProcessA(szAppName, (LPCSTR)lpCommandLine, lpProcessAttributes,
+                                lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                                lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                                lpProcessInfo);
     }
     if(!lpEnvironment) {