Changeset 21462 for trunk/src/kernel32/oslibmisc.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/oslibmisc.cpp (modified) (3 diffs)

trunk/src/kernel32/oslibmisc.cpp

@@ -23 +23 @@
 #include <malloc.h>  /*PLF Wed  98-03-18 05:15:04*/
 #include "oslibmisc.h"
+#include "win32api.h"
 #include <misc.h>
 #include <odincrt.h>
@@ -346 +347 @@
 void OSLibSetBeginLibpath(char *lpszBeginlibpath)
 {
-    DosSetExtLIBPATH(lpszBeginlibpath, BEGIN_LIBPATH);
+    PSZ psz = NULL;
+    if (lpszBeginlibpath) {
+        psz = (PSZ)malloc(strlen(lpszBeginlibpath) + 1);
+        CharToOemA(lpszBeginlibpath, psz);
+    }
+    DosSetExtLIBPATH(psz, BEGIN_LIBPATH);
+    if (psz) {
+        free(psz);
+    }
 }
 //******************************************************************************
@@ -353 +362 @@
 {
     DosQueryExtLIBPATH(lpszBeginlibpath, BEGIN_LIBPATH);
+    OemToCharA(lpszBeginlibpath, lpszBeginlibpath);
 }
 //******************************************************************************