[PATCH v2 0/2] MR1245: comctl32:edit test fixes for flaky failures (message sequences)

[Jinoh Kang (＠iamahuman)]

--
  v2: comctl32/tests: Flush events before testing edit control IME messages.
      comctl32/tests: Flush events before testing edit control SetFocus() messages.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1245

[PATCH v2 1/2] comctl32/tests: Flush events before testing edit control SetFocus() messages.

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 dlls/comctl32/tests/edit.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c
index 5f23fff2c9c..870b2b3cbc5 100644
--- a/dlls/comctl32/tests/edit.c
+++ b/dlls/comctl32/tests/edit.c
@@ -3445,12 +3445,13 @@ static void test_change_focus(void)
     SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc);
 
     SetCursorPos(400, 400);
+    while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
 
     SetFocus(parent_wnd);
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
     SetFocus(hwnd);
     while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
-    ok_sequence(sequences, COMBINED_SEQ_INDEX, setfocus_combined_seq, "Set focus", TRUE);
+    ok_sequence(sequences, COMBINED_SEQ_INDEX, setfocus_combined_seq, "Set focus", FALSE);
 
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
     SetFocus(parent_wnd);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1245

[PATCH v2 2/2] comctl32/tests: Flush events before testing edit control IME messages.

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 dlls/comctl32/tests/edit.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c
index 870b2b3cbc5..fb0c8e68764 100644
--- a/dlls/comctl32/tests/edit.c
+++ b/dlls/comctl32/tests/edit.c
@@ -3623,6 +3623,7 @@ static void test_ime(void)
     /* Test IME messages when EIMES_GETCOMPSTRATONCE is not set */
     old_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_ime_subclass_proc);
     SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)old_proc);
+    while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
 
     himc = ImmGetContext(hwnd);
     ret = ImmSetCompositionStringA(himc, SCS_SETSTR, "Wine", 4, NULL, 0);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1245