Module: wine Branch: master Commit: e2a725621a5ad940bb6cb7c1b00d5fc2510e594e URL: https://gitlab.winehq.org/wine/wine/-/commit/e2a725621a5ad940bb6cb7c1b00d5fc...
Author: Zhiyi Zhang zzhang@codeweavers.com Date: Fri Aug 12 11:32:54 2022 +0800
comctl32/edit: Don't repaint immediately when losing focus.
Ignore some messages for the parent window because the "Kill focus" message sequence starts succeeding with this commit but sometimes those messages appear on Wine and cause random test failures. Those messages are not interested in the tests so ignore them.
Signed-off-by: Zhiyi Zhang zzhang@codeweavers.com
---
dlls/comctl32/edit.c | 2 +- dlls/comctl32/tests/edit.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 4596d0bec67..3111cda2a4b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3402,7 +3402,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) */ static LRESULT EDIT_WM_KillFocus(HTHEME theme, EDITSTATE *es) { - UINT flags = RDW_INVALIDATE | RDW_UPDATENOW; + UINT flags = RDW_INVALIDATE;
es->flags &= ~EF_FOCUSED; DestroyCaret(); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 5727fa2a4e1..5f23fff2c9c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -900,6 +900,10 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_GETMINMAXINFO && message != WM_PAINT && message != WM_CTLCOLOREDIT && + message != WM_WINDOWPOSCHANGING && + message != WM_WINDOWPOSCHANGED && + message != WM_MOVE && + message != WM_MOUSEACTIVATE && message < 0xc000) { add_message(sequences, COMBINED_SEQ_INDEX, &msg); @@ -3451,7 +3455,7 @@ static void test_change_focus(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(parent_wnd); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", FALSE);
/* Test message sequences without waiting for posted messages */ SetFocus(parent_wnd); @@ -3463,7 +3467,7 @@ static void test_change_focus(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(parent_wnd); ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_sent_only_combined_seq, - "Kill focus sent only", TRUE); + "Kill focus sent only", FALSE);
SetCursorPos(orig_pos.x, orig_pos.y);