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

Timestamp:

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

Author:

ydario

Message:

User32 updates.

File:

• trunk/src/user32/win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/win32wbase.cpp

@@ -70 +70 @@
 #include "callwrap.h"
 
-#include <imm.h>
-
 #define DBG_LOCALLOG    DBG_win32wbase
 #include "dbglocal.h"
@@ -1560 +1558 @@
 LRESULT Win32BaseWindow::DefWindowProcA(UINT Msg, WPARAM wParam, LPARAM lParam)
 {
+
+    dprintf(("DefWndProc: winmsg: %x for %x Msg %s", Msg, Win32Hwnd, GetMsgText(HIWORD(lParam))));
+
     switch(Msg)
     {
@@ -2125 +2126 @@
 
     case WM_IME_CHAR:
-        if( IsDBCSLeadByte(( CHAR )( wParam >> 8 )))
+        if( wParam & 0xFF00 ) // DBCS ?
             SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam >> 8 ), lParam );
         SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam & 0xFF ), lParam );
         break;
-
-    case WM_IME_KEYDOWN:
-        return SendMessageA( getWindowHandle(), WM_KEYDOWN, wParam, lParam );
-
-    case WM_IME_KEYUP:
-        return SendMessageA( getWindowHandle(), WM_KEYUP, wParam, lParam );
-
-    case WM_IME_COMPOSITION:
-    case WM_IME_COMPOSITIONFULL:
-    case WM_IME_CONTROL:
-    case WM_IME_ENDCOMPOSITION:
-    case WM_IME_NOTIFY:
-    case WM_IME_REQUEST:
-    case WM_IME_SELECT:
-    case WM_IME_SETCONTEXT:
-    case WM_IME_STARTCOMPOSITION:
-    {
-        HWND hwndIME = ImmGetDefaultIMEWnd( getWindowHandle());
-
-        if( hwndIME )
-        {
-            BOOL result = ImmIsUIMessageA( hwndIME, Msg, wParam, lParam );
-
-            switch( Msg )
-            {
-                case WM_IME_SETCONTEXT :
-                    return result;
-
-                case WM_IME_CONTROL :
-                    // todo : IMC_GETSTATUSWINDOWPOS return POINTS structure
-                    return !result;
-
-                case WM_IME_REQUEST :
-                    // todo
-                    return 0;
-            }
-        }
-        break;
-    }
 
     default:
@@ -2247 +2209 @@
         SendMessageW( getWindowHandle(), WM_CHAR, wParam, lParam );
         return 0;
-
-    case WM_IME_KEYDOWN:
-        return SendMessageW( getWindowHandle(), WM_KEYDOWN, wParam, lParam );
-
-    case WM_IME_KEYUP:
-        return SendMessageW( getWindowHandle(), WM_KEYUP, wParam, lParam );
-
-    case WM_IME_COMPOSITION:
-    case WM_IME_COMPOSITIONFULL:
-    case WM_IME_CONTROL:
-    case WM_IME_ENDCOMPOSITION:
-    case WM_IME_NOTIFY:
-    case WM_IME_REQUEST:
-    case WM_IME_SELECT:
-    case WM_IME_SETCONTEXT:
-    case WM_IME_STARTCOMPOSITION:
-    {
-        HWND hwndIME = ImmGetDefaultIMEWnd( getWindowHandle());
-
-        if( hwndIME )
-        {
-            BOOL result = ImmIsUIMessageW( hwndIME, Msg, wParam, lParam );
-
-            switch( Msg )
-            {
-                case WM_IME_SETCONTEXT :
-                    return result;
-
-                case WM_IME_CONTROL :
-                    // todo : IMC_GETSTATUSWINDOWPOS return POINTS structure
-                    return !result;
-
-                case WM_IME_REQUEST :
-                    // todo
-                    return 0;
-            }
-        }
-        return 0;
-    }
 
     default: