Changeset 21308 for trunk/src/user32/pmwindow.cpp

Timestamp:

Jun 18, 2009, 6:27:45 PM (16 years ago)

Author:

ydario

Message:

Minor updates, backout imm changes.

File:

• trunk/src/user32/pmwindow.cpp (modified) (5 diffs)

trunk/src/user32/pmwindow.cpp

@@ -61 +61 @@
 #include "user32api.h"
 #include <kbdhook.h>
+#include <heapstring.h>
+
+#include <os2im.h>
+#include <im32.h>
 
 #define DBG_LOCALLOG    DBG_pmwindow
@@ -140 +144 @@
 #endif
 
+extern "C" ULONG OSLibImSetMsgQueueProperty( ULONG, ULONG );
+
 //******************************************************************************
 // Initialize PM; create hab, message queue and register special Win32 window classes
@@ -194 +200 @@
     BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
     dprintf(("InitPM: WinSetCP was %sOK", rc ? "" : "not "));
+
+    /* IM instace is created per message queue, that is, thread */
+    if( IsDBCSEnv())
+        OSLibImSetMsgQueueProperty( hmq, MQP_INSTANCE_PERMQ );
 
     //CD polling window class
@@ -1004 +1014 @@
         dprintf(("OS2: %s %x %x %x", (msg == WM_HSCROLL) ? "WM_HSCROLL" : "WM_VSCROLL", win32wnd->getWindowHandle(), mp1, mp2));
         win32wnd->DispatchMsgA(pWinMsg);
+        break;
+
+    case WM_IMEREQUEST:
+    case WM_IMECONTROL:
+    case WM_IMENOTIFY:
+        if( pWinMsg->message )
+        {
+            win32wnd->DispatchMsgA( pWinMsg );
+
+            if(( pWinMsg->message = WM_IME_NOTIFY_W ) &&
+               ( pWinMsg->wParam == IMN_SETOPENSTATUS_W ))
+            {
+                MSG m;
+
+                m.message = WM_IME_NOTIFY_W;
+                m.wParam = IMN_SETCONVERSIONMODE_W;
+                m.lParam = 0;
+
+                win32wnd->DispatchMsgA( &m );
+            }
+        }
+        else
+            goto RunDefWndProc;
         break;
 
@@ -2210 +2243 @@
         break;
 
+    case WM_IMEREQUEST:
+    case WM_IMECONTROL:
+    case WM_IMENOTIFY:
+        if( pWinMsg->message )
+        {
+            dprintf(("Frame window received IME message"));
+            win32wnd->DispatchMsgA( pWinMsg );
+
+            if(( pWinMsg->message = WM_IME_NOTIFY_W ) &&
+               ( pWinMsg->wParam == IMN_SETOPENSTATUS_W ))
+            {
+                MSG m;
+
+                m.message = WM_IME_NOTIFY_W;
+                m.wParam = IMN_SETCONVERSIONMODE_W;
+                m.lParam = 0;
+
+                win32wnd->DispatchMsgA( &m );
+            }
+        }
+        else
+            goto RunDefWndProc;
+        break;
+
 #ifdef DEBUG
     case WM_DDE_INITIATE: