Changeset 21463 for trunk/src

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.

Location:

trunk/src

Files:

• kernel32/oslibmisc.cpp (modified) (3 diffs)
• kernel32/wprocess.cpp (modified) (3 diffs)
• user32/oslibwin.cpp (modified) (3 diffs)
• user32/win32wbase.cpp (modified) (4 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>
@@ -347 +346 @@
 void OSLibSetBeginLibpath(char *lpszBeginlibpath)
 {
-    PSZ psz = NULL;
-    if (lpszBeginlibpath) {
-        psz = (PSZ)malloc(strlen(lpszBeginlibpath) + 1);
-        CharToOemA(lpszBeginlibpath, psz);
-    }
-    DosSetExtLIBPATH(psz, BEGIN_LIBPATH);
-    if (psz) {
-        free(psz);
-    }
+    DosSetExtLIBPATH(lpszBeginlibpath, BEGIN_LIBPATH);
 }
 //******************************************************************************
@@ -362 +353 @@
 {
     DosQueryExtLIBPATH(lpszBeginlibpath, BEGIN_LIBPATH);
-    OemToCharA(lpszBeginlibpath, lpszBeginlibpath);
 }
 //******************************************************************************

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);
     }

trunk/src/user32/oslibwin.cpp

@@ -562 +562 @@
 LONG OSLibWinQueryWindowText(HWND hwnd, LONG length, LPSTR lpsz)
 {
-    LONG retLen = WinQueryWindowText(hwnd, length, lpsz);
-    OemToCharBuffA(lpsz, lpsz, retLen);
-    lpsz[retLen] = '\0';
-    return retLen;
+  return WinQueryWindowText(hwnd, length, lpsz);
 }
 //******************************************************************************
@@ -571 +568 @@
 BOOL OSLibWinSetWindowText(HWND hwnd, LPSTR lpsz)
 {
-    PSZ psz = NULL;
-    if(lpsz) {
-        psz = (PSZ)_smalloc(strlen(lpsz) + 1);
-        CharToOemA(lpsz, psz);
-    }
-    BOOL rc = WinSetWindowText(hwnd, psz);
-    if (psz) {
-        _sfree(psz);
-    }
-    return rc;
+  return WinSetWindowText(hwnd, lpsz);
 }
 //******************************************************************************
@@ -586 +574 @@
 BOOL OSLibWinSetTitleBarText(HWND hwnd, LPSTR lpsz)
 {
-    PSZ psz = NULL;
-    if(lpsz) {
-        psz = (PSZ)_smalloc(strlen(lpsz) + 1);
-        CharToOemA(lpsz, psz);
-    }
-    BOOL rc = WinSetWindowText(WinWindowFromID(hwnd, FID_TITLEBAR), psz);
-    if (psz) {
-        _sfree(psz);
-    }
-    return rc;
+  return WinSetWindowText(WinWindowFromID(hwnd, FID_TITLEBAR), lpsz);
 }
 //******************************************************************************

trunk/src/user32/win32wbase.cpp

@@ -528 +528 @@
 //******************************************************************************
 //******************************************************************************
+static BOOL OSLibWinSetTitleBarTextA(HWND hwnd, LPSTR lpsz)
+{
+    LPSTR psz = NULL;
+    if(lpsz) {
+        psz = (LPSTR)_smalloc(strlen(lpsz) + 1);
+        CharToOemA(lpsz, psz);
+    }
+    BOOL rc = OSLibWinSetTitleBarText(hwnd, psz);
+    if (psz) {
+        _sfree(psz);
+    }
+    return rc;
+}
+//******************************************************************************
+//******************************************************************************
 BOOL Win32BaseWindow::MsgCreate(HWND hwndOS2)
 {
@@ -620 +635 @@
 
         if(fOS2Look) {
-            OSLibWinSetTitleBarText(OS2HwndFrame, windowNameA);
+            OSLibWinSetTitleBarTextA(OS2HwndFrame, windowNameA);
         }
     }
@@ -1635 +1650 @@
             }
             if(fOS2Look) {
-                OSLibWinSetTitleBarText(OS2HwndFrame, getWindowNameA());
+                OSLibWinSetTitleBarTextA(OS2HwndFrame, getWindowNameA());
             }
         }
@@ -2211 +2226 @@
             }
             if(fOS2Look) {
-                OSLibWinSetTitleBarText(OS2HwndFrame, getWindowNameA());
+                OSLibWinSetTitleBarTextA(OS2HwndFrame, getWindowNameA());
             }
         }