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

Timestamp:

Jun 18, 2009, 12:04:13 PM (16 years ago)

Author:

ydario

Message:

User32 updates.

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
@@ -144 +140 @@
 #endif
 
-extern "C" ULONG OSLibImSetMsgQueueProperty( ULONG, ULONG );
-
 //******************************************************************************
 // Initialize PM; create hab, message queue and register special Win32 window classes
@@ -200 +194 @@
     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
@@ -1014 +1004 @@
         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;
 
@@ -2243 +2210 @@
         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: