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@codeweavers.com>

comctl32/edit: Let DefWindowProcW() handle WM_IME_CHAR.
b3b1cec0 · Zhiyi Zhang · Alexandre Julliard · 3b97566f · b3b1cec0 · b3b1cec0
Commit b3b1cec0 authored Aug 12, 2022 by Zhiyi Zhang Committed by Alexandre Julliard Aug 16, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

edit.c dlls/comctl32/edit.c +0 -1

edit.c dlls/comctl32/tests/edit.c +2 -2

No files found.
--- 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;

--- 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);