Changeset 21529 for trunk/src

Timestamp:

Dec 21, 2010, 1:40:08 AM (15 years ago)

Author:

dmik

Message:

Fixed completely broken national (non-Latin1) character input in Odin. There were two problems:
1) When translating OS2 WM_CHAR to Win32 WM_CHAR in UNICODE mode, ANSI->UNICODE conversion of the character was not done.
2) When hosting windows on threads created with CreateThread(), characters in WM_CHAR were wrongly converted from OS/2 codepage to ANSI codepage while they already were in ANSI due to the message queue begin switched to it at thread startup.
3) The main thread's message queue is now also switched to ANSI at startup so the conversion from step 2) should normally not take place now.

Location:

trunk/src

Files:

• kernel32/thread.cpp (modified) (1 diff)
• user32/pmwindow.cpp (modified) (3 diffs)
• user32/win32wbase.cpp (modified) (1 diff)

trunk/src/kernel32/thread.cpp

@@ -687 +687 @@
     winteb->o.odin.hmq = OSLibWinQueryMsgQueue(winteb->o.odin.hab);
     rc = OSLibWinSetCp(winteb->o.odin.hmq, GetDisplayCodepage());
-    dprintf(("WinSetCP was %sOK", rc ? "" : "not "));
+    dprintf(("WinSetCP(%d) was %sOK", GetDisplayCodepage(), rc ? "" : "not "));
     hookInit(winteb->o.odin.hab);
 

trunk/src/user32/pmwindow.cpp

@@ -201 +201 @@
     hookInit(hab);
 
-    //BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
-    //dprintf(("InitPM: WinSetCP was %s OK", rc ? " " : "not "));
+    BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
+    dprintf(("InitPM: WinSetCP(%d) was %sOK", GetDisplayCodepage(), rc ? "" : "not "));
 
     /* IM instace is created per message queue, that is, thread */
@@ -948 +948 @@
         {
             MSG extramsg;
-            char cpfrom[10] = {0};
-            char cpto[10] = {0};
-            ULONG  ulCpSize, ulCP, mp2l;
-
-            mp2l = (ULONG)mp2 & 0x0000FFFF;
             memcpy(&extramsg, pWinMsg, sizeof(MSG));
             extramsg.message = WINWM_CHAR;
-            DosQueryCp(sizeof(ulCP), &ulCP, &ulCpSize);
-            sprintf(cpfrom,"IBM-%d\0", ulCP);
-            sprintf(cpto,"IBM-%d\0", GetDisplayCodepage());
-            if (cp2cp(cpfrom, cpto, (char*)&mp2l, (char*)&extramsg.wParam, 1))
-                extramsg.wParam = (ULONG)mp2l;
+
+            // convert character code if needed (normally not as both
+            // Win32ThreadProc() and InitPM() set the HMQ code page to the
+            // Windows ANSI code page)
+            ULONG cpFrom = WinQueryCp(HMQ_CURRENT);
+            ULONG cpTo = GetDisplayCodepage();
+            if (cpFrom != cpTo) {
+                char from[3], to[3];
+                *((USHORT*)&from) = SHORT1FROMMP(mp2);
+                from[2] = '\0';
+                if (WinCpTranslateString(hab, cpFrom, from, cpTo, 3, to)) {
+                    extramsg.wParam = *((USHORT*)&to);
+                    dprintf(("OS2: WM_CHAR cp%d->cp%d: %08X->%08X", cpFrom, cpTo,
+                             (int)SHORT1FROMMP(mp2), (int)extramsg.wParam));
+                } else {
+                    dprintf(("ERROR: cp%d->cp%d failed!", cpFrom, cpTo));
+                }
+            } else {
+                extramsg.wParam = SHORT1FROMMP(mp2);
+            }
 
             if(SHORT1FROMMP(mp1) & KC_DEADKEY)
@@ -1485 +1495 @@
     }
 
-        case WM_CHAR:
-                {
-                        dprintf(("PMFRAME:WM_CHAR"));
-                        break;
-                }
+    case WM_CHAR:
+        {
+            dprintf(("PMFRAME:WM_CHAR"));
+            break;
+        }
 
     case WM_ADJUSTWINDOWPOS:

trunk/src/user32/win32wbase.cpp

@@ -1287 +1287 @@
 ULONG Win32BaseWindow::MsgChar(MSG *msg)
 {
-    return IsWindowUnicode() ? DispatchMsgW( msg ) : DispatchMsgA( msg );
+    if (IsWindowUnicode()) {
+        // Unicode windows expect the character code in UTF-16 while we save it
+        // in ascii format, so we need to convert before sending to the window
+        if (msg->message == WINWM_CHAR) {
+            CHAR  charA;
+            WCHAR charW;
+
+            charA = msg->wParam;
+            MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
+            msg->wParam= charW;
+            dprintf(("MsgChar: Convert to Unicode src=%x res=%x", charA, charW));
+        }
+        return DispatchMsgW(msg);
+    }
+    return DispatchMsgA(msg);
 }
 //******************************************************************************