Zhiyi Zhang : comctl32/edit: Let DefWindowProcW() handle WM_IME_CHAR.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b3b1cec07703c2ae2c330465d9d6fb7ac1794497
URL:    https://gitlab.winehq.org/wine/wine/-/commit/b3b1cec07703c2ae2c330465d9d6fb7...

Author: Zhiyi Zhang <zzhang(a)codeweavers.com>
Date:   Fri Aug 12 11:32:54 2022 +0800

comctl32/edit: Let DefWindowProcW() handle WM_IME_CHAR.

So that WM_IME_CHAR will be converted to WM_CHAR in DefWindowProcW().

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>

---

 dlls/comctl32/edit.c       | 1 -
 dlls/comctl32/tests/edit.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c
index fbec6972fee..2fb97b174b3 100644
--- a/dlls/comctl32/edit.c
+++ b/dlls/comctl32/edit.c
@@ -4859,7 +4859,6 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
         }
         break;
 
-    case WM_IME_CHAR:
     case WM_CHAR:
     {
         WCHAR charW = wParam;
diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c
index 94d17ba8730..e588df8170b 100644
--- a/dlls/comctl32/tests/edit.c
+++ b/dlls/comctl32/tests/edit.c
@@ -3606,7 +3606,7 @@ static void test_ime(void)
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
     SendMessageA(hwnd, WM_IME_CHAR, '0', 1);
     while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
-    ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", TRUE);
+    ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", FALSE);
 
     /* Test IME messages when EIMES_GETCOMPSTRATONCE is set */
     lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE);
@@ -3627,7 +3627,7 @@ static void test_ime(void)
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
     SendMessageA(hwnd, WM_IME_CHAR, '0', 1);
     while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
-    ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", TRUE);
+    ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_char_seq, "WM_IME_CHAR", FALSE);
 
     ImmReleaseContext(hwnd, himc);
     DestroyWindow(hwnd);