Changeset 21544 for trunk/src

Timestamp:

Jan 7, 2011, 1:51:26 AM (15 years ago)

Author:

dmik

Message:

user32: Fixed incorrect code page translation of window title text (seen if the target window PM thread is already switched to the Windows ANSI code page as in case of windows created on threads other than main, like in Java). See #24.

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/oslibwin.cpp

@@ -30 +30 @@
 #include "pmwindow.h"
 #include "initterm.h"
+#include "codepage.h"
 
 #define DBG_LOCALLOG    DBG_oslibwin
@@ -574 +575 @@
 BOOL OSLibWinSetTitleBarText(HWND hwnd, LPSTR lpsz)
 {
-  return WinSetWindowText(WinWindowFromID(hwnd, FID_TITLEBAR), lpsz);
+    // convert character code if needed (normally, only on the main
+    // thread since Win32ThreadProc() sets the HMQ code page to the
+    // Windows ANSI code page so that all threads created by Win32 API
+    // will be already in the ANSI code page)
+    ULONG cpFrom, cpTo;
+    cpFrom = cpTo = GetDisplayCodepage();
+    HMQ hmq = (HMQ)WinQueryWindowULong(hwnd, QWL_HMQ);
+    if (hmq)
+        cpTo = WinQueryCp(hmq);
+
+    LPSTR psz = NULL;
+    if(lpsz && cpFrom != cpTo) {
+        int size = (strlen(lpsz) + 1) * 2; // count for DBCS just in case
+        psz = (LPSTR)_smalloc(size);
+        if (WinCpTranslateString(GetThreadHAB(), cpFrom, lpsz, cpTo, size, psz)) {
+            dprintf(("OSLibWinSetTitleBarTextCp: cp%d->cp%d", cpFrom, cpTo));
+            lpsz = psz;
+        } else {
+            dprintf(("OSLibWinSetTitleBarTextCp: ERROR: cp%d->cp%d failed!", cpFrom, cpTo));
+        }
+    }
+    BOOL rc = WinSetWindowText(WinWindowFromID(hwnd, FID_TITLEBAR), lpsz);
+    if (psz) {
+        _sfree(psz);
+    }
+    return rc;
 }
 //******************************************************************************

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)
 {
@@ -635 +620 @@
 
         if(fOS2Look) {
-            OSLibWinSetTitleBarTextA(OS2HwndFrame, windowNameA);
+            OSLibWinSetTitleBarText(OS2HwndFrame, windowNameA);
         }
     }
@@ -1664 +1649 @@
             }
             if(fOS2Look) {
-                OSLibWinSetTitleBarTextA(OS2HwndFrame, getWindowNameA());
+                OSLibWinSetTitleBarText(OS2HwndFrame, getWindowNameA());
             }
         }
@@ -2240 +2225 @@
             }
             if(fOS2Look) {
-                OSLibWinSetTitleBarTextA(OS2HwndFrame, getWindowNameA());
+                OSLibWinSetTitleBarText(OS2HwndFrame, getWindowNameA());
             }
         }