Changeset 21463 for trunk/src/user32/win32wbase.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/user32/win32wbase.cpp (modified) (4 diffs)

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