Changeset 21461

Timestamp:

Sep 28, 2010, 10:10:19 PM (15 years ago)

Author:

dmik

Message:

Fixed: Title bar in OS/2 look and feel mode displayed text with national characters in wrong encoding.

Location:

trunk

Files:

• include/win32api.h (modified) (1 diff)
• src/user32/oslibwin.cpp (modified) (3 diffs)

trunk/include/win32api.h

@@ -200 +200 @@
 BOOL    WIN32API CloseHandle(HANDLE);
 
-BOOL    WIN32API CharToOemBuffA( LPCSTR s, LPSTR d, DWORD len );
+BOOL    WIN32API OemToCharA(LPCSTR s, LPSTR d);
+BOOL    WIN32API OemToCharBuffA(LPCSTR s, LPSTR d, DWORD len);
+BOOL    WIN32API CharToOemA(LPCSTR s, LPSTR d);
+BOOL    WIN32API CharToOemBuffA(LPCSTR s, LPSTR d, DWORD len);
 LPSTR   WIN32API CharPrevA(LPCSTR start, LPCSTR ptr);
 

trunk/src/user32/oslibwin.cpp

@@ -562 +562 @@
 LONG OSLibWinQueryWindowText(HWND hwnd, LONG length, LPSTR lpsz)
 {
-  return WinQueryWindowText(hwnd, length, lpsz);
+    LONG retLen = WinQueryWindowText(hwnd, length, lpsz);
+    OemToCharBuffA(lpsz, lpsz, retLen);
+    lpsz[retLen] = '\0';
+    return retLen;
 }
 //******************************************************************************
@@ -568 +571 @@
 BOOL OSLibWinSetWindowText(HWND hwnd, LPSTR lpsz)
 {
-  return WinSetWindowText(hwnd, 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;
 }
 //******************************************************************************
@@ -574 +586 @@
 BOOL OSLibWinSetTitleBarText(HWND hwnd, LPSTR lpsz)
 {
-  return WinSetWindowText(WinWindowFromID(hwnd, FID_TITLEBAR), 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;
 }
 //******************************************************************************