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

Timestamp:

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

Author:

dmik

Message:

Undo interpreting strings as ANSI for certain OSLib APIs modified in the previous commits as it breaks the common logic where many other OSLib calls (e.g. all dealig with file names) seem to expect the OEM (OS/2) encoding.

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1984 +1984 @@
 //******************************************************************************
 //******************************************************************************
+static void OSLibSetBeginLibpathA(char *lpszBeginlibpath)
+{
+    PSZ psz = NULL;
+    if (lpszBeginlibpath) {
+        psz = (PSZ)malloc(strlen(lpszBeginlibpath) + 1);
+        CharToOemA(lpszBeginlibpath, psz);
+    }
+    OSLibSetBeginLibpath(psz);
+    if (psz) {
+        free(psz);
+    }
+}
+//******************************************************************************
+//******************************************************************************
+static void OSLibQueryBeginLibpathA(char *lpszBeginlibpath, int size)
+{
+    OSLibQueryBeginLibpath(lpszBeginlibpath, size);
+    OemToCharA(lpszBeginlibpath, lpszBeginlibpath);
+}
+//******************************************************************************
+//******************************************************************************
 BOOL WINAPI CreateProcessA( LPCSTR lpApplicationName, LPSTR lpCommandLine,
                             LPSECURITY_ATTRIBUTES lpProcessAttributes,
@@ -2200 +2221 @@
             if(oldlibpath)
             {
-                OSLibQueryBeginLibpath(oldlibpath, 4096);
+                OSLibQueryBeginLibpathA(oldlibpath, 4096);
 
                 char *tmp = strrchr(szAppName, '\\');
                 if(tmp) *tmp = 0;
 
-                OSLibSetBeginLibpath(szAppName);
+                OSLibSetBeginLibpathA(szAppName);
                 if(tmp) *tmp = '\\';
 
@@ -2358 +2379 @@
 
     if(oldlibpath) {
-        OSLibSetBeginLibpath(oldlibpath);
+        OSLibSetBeginLibpathA(oldlibpath);
         free(oldlibpath);
     }