Commit fb5dbd60 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard

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

parent e9f3030c
...@@ -2888,12 +2888,18 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, ...@@ -2888,12 +2888,18 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
case WM_CREATE: case WM_CREATE:
case WM_NCCREATE: case WM_NCCREATE:
return TRUE; return TRUE;
case WM_IME_COMPOSITION:
case WM_IME_STARTCOMPOSITION: case WM_IME_STARTCOMPOSITION:
case WM_IME_ENDCOMPOSITION: case WM_IME_ENDCOMPOSITION:
case WM_IME_SELECT: case WM_IME_COMPOSITION:
case WM_IME_CONTROL: case WM_IME_SETCONTEXT:
case WM_IME_NOTIFY: 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)); ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0));
if (immHkl->UIWnd) if (immHkl->UIWnd)
...@@ -2902,7 +2908,7 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, ...@@ -2902,7 +2908,7 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
} }
default: default:
if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || if ((uMsg == WM_MSIME_RECONVERTOPTIONS) ||
(uMsg ==WM_MSIME_SERVICE) || (uMsg == WM_MSIME_SERVICE) ||
(uMsg == WM_MSIME_MOUSE) || (uMsg == WM_MSIME_MOUSE) ||
(uMsg == WM_MSIME_RECONVERTREQUEST) || (uMsg == WM_MSIME_RECONVERTREQUEST) ||
(uMsg == WM_MSIME_RECONVERT) || (uMsg == WM_MSIME_RECONVERT) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment