Aric Stewart : imm32: Explicitly handle all WM_IME_XXX messages in the IME class.

Alexandre Julliard julliard at winehq.org
Wed Oct 3 13:20:36 CDT 2012


Module: wine
Branch: master
Commit: fb5dbd608fbe09f1e3b09745b47233c8ed051446
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb5dbd608fbe09f1e3b09745b47233c8ed051446

Author: Aric Stewart <aric at codeweavers.com>
Date:   Wed Oct  3 07:12:44 2012 -0500

imm32: Explicitly handle all WM_IME_XXX messages in the IME class.

---

 dlls/imm32/imm.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 015b8ab..6f262f5 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2888,12 +2888,18 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
         case WM_CREATE:
         case WM_NCCREATE:
             return TRUE;
-        case WM_IME_COMPOSITION:
         case WM_IME_STARTCOMPOSITION:
         case WM_IME_ENDCOMPOSITION:
-        case WM_IME_SELECT:
-        case WM_IME_CONTROL:
+        case WM_IME_COMPOSITION:
+        case WM_IME_SETCONTEXT:
         case WM_IME_NOTIFY:
+        case WM_IME_CONTROL:
+        case WM_IME_COMPOSITIONFULL:
+        case WM_IME_SELECT:
+        case WM_IME_CHAR:
+        case WM_IME_REQUEST:
+        case WM_IME_KEYDOWN:
+        case WM_IME_KEYUP:
         {
            ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0));
            if (immHkl->UIWnd)
@@ -2902,7 +2908,7 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
         }
         default:
             if ((uMsg == WM_MSIME_RECONVERTOPTIONS) ||
-                (uMsg ==WM_MSIME_SERVICE) ||
+                (uMsg == WM_MSIME_SERVICE) ||
                 (uMsg == WM_MSIME_MOUSE) ||
                 (uMsg == WM_MSIME_RECONVERTREQUEST) ||
                 (uMsg == WM_MSIME_RECONVERT) ||




More information about the wine-cvs mailing list