[PATCH 0/2] MR3242: comctl32/tests: Add Korean IME specific test sequences.
Windows with Korean locale has a different IME message sequence. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53890 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3242
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Windows with Korean locale has a different IME message sequence. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53890 --- dlls/comctl32/tests/edit.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index f45b898dc12..bce0215ef19 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3588,6 +3588,21 @@ static const struct message wm_ime_composition_seq[] = {0} }; +static const struct message wm_ime_composition_korean_seq[] = +{ + {WM_IME_ENDCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'i'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'n'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'e'}, + {WM_CHAR, sent | wparam, 'W'}, + {WM_CHAR, sent | wparam, 'i'}, + {WM_CHAR, sent | wparam, 'n'}, + {WM_CHAR, sent | wparam, 'e'}, + {0} +}; + static const struct message wm_ime_char_seq[] = { {WM_IME_CHAR, sent | wparam, '0'}, @@ -3648,13 +3663,17 @@ static LRESULT CALLBACK edit_ime_subclass_proc(HWND hwnd, UINT message, WPARAM w static void test_ime(void) { + static const HKL korean_hkl = (HKL)0x04120412; WNDPROC old_proc; LRESULT lr; HIMC himc; HWND hwnd; BOOL ret; + HKL hkl; MSG msg; + hkl = GetKeyboardLayout(0); + hwnd = create_editcontrol(WS_POPUP | WS_VISIBLE, 0); /* Test EM_{GET|SET}IMESTATUS */ @@ -3731,7 +3750,11 @@ static void test_ime(void) /* Note that the following message loop is necessary to get the WM_CHAR messages because they * are posted. Same for the later message loops in this function. */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); + if (hkl == korean_hkl) + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_korean_seq, + "korean WM_IME_COMPOSITION", TRUE); + else + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -3751,8 +3774,12 @@ static void test_ime(void) ret = ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); ok(ret, "ImmNotifyIME failed.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, eimes_getcompstratonce_seq, - "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + if (hkl == korean_hkl) + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_korean_seq, + "Korean WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + else + ok_sequence(sequences, COMBINED_SEQ_INDEX, eimes_getcompstratonce_seq, + "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR with EIMES_GETCOMPSTRATONCE */ flush_sequences(sequences, NUM_MSG_SEQUENCES); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3242
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Windows with Korean locale has a different IME message sequence. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53890 --- dlls/user32/tests/msg.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0ee1eaa393e..23957a7adf8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12821,6 +12821,21 @@ static const struct message edit_wm_ime_composition_seq[] = {0} }; +static const struct message edit_wm_ime_composition_korean_seq[] = +{ + {WM_IME_ENDCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'i'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'n'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'e'}, + {WM_CHAR, sent | wparam, 'W'}, + {WM_CHAR, sent | wparam, 'i'}, + {WM_CHAR, sent | wparam, 'n'}, + {WM_CHAR, sent | wparam, 'e'}, + {0} +}; + static const struct message edit_wm_ime_char_seq[] = { {WM_IME_CHAR, sent | wparam, '0'}, @@ -12836,6 +12851,13 @@ static const struct message edit_eimes_getcompstratonce_seq[] = {0} }; +static const struct message edit_eimes_getcompstratonce_korean_seq[] = +{ + {WM_IME_ENDCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {0} +}; + static LRESULT CALLBACK edit_ime_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); @@ -12881,13 +12903,17 @@ static LRESULT CALLBACK edit_ime_subclass_proc(HWND hwnd, UINT message, WPARAM w static DWORD WINAPI test_edit_ime_messages(void *unused_arg) { + static const HKL korean_hkl = (HKL)0x04120412; WNDPROC old_proc; LRESULT lr; HIMC himc; HWND hwnd; BOOL ret; + HKL hkl; MSG msg; + hkl = GetKeyboardLayout(0); + hwnd = CreateWindowA(WC_EDITA, "Test", WS_POPUP | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowA failed.\n"); @@ -12965,7 +12991,11 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) /* Note that the following message loop is necessary to get the WM_CHAR messages because they * are posted. Same for the later message loops in this function. */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(edit_wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); + if (hkl == korean_hkl) + ok_sequence(edit_wm_ime_composition_korean_seq, + "korean WM_IME_COMPOSITION", TRUE); + else + ok_sequence(edit_wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR */ flush_sequence(); @@ -12985,8 +13015,12 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) ret = ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); ok(ret, "ImmNotifyIME failed.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(edit_eimes_getcompstratonce_seq, - "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + if (hkl == korean_hkl) + ok_sequence(edit_eimes_getcompstratonce_korean_seq, + "korean WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + else + ok_sequence(edit_eimes_getcompstratonce_seq, + "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR with EIMES_GETCOMPSTRATONCE */ flush_sequence(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3242
This merge request was approved by Jinoh Kang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3242
participants (3)
-
Jinoh Kang (＠iamahuman) -
Zhiyi Zhang
-
Zhiyi Zhang (＠zhiyi)