Connor McAdams : user32/tests: Fix existing winevents in test_DestroyWindow() message sequences.
Alexandre Julliard
julliard at winehq.org
Wed Sep 22 16:04:37 CDT 2021
Module: wine
Branch: master
Commit: a6227531867b8bc5c0c0b94f04443711d62d6baa
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6227531867b8bc5c0c0b94f04443711d62d6baa
Author: Connor McAdams <cmcadams at codeweavers.com>
Date: Tue Sep 21 19:50:41 2021 -0400
user32/tests: Fix existing winevents in test_DestroyWindow() message sequences.
Signed-off-by: Connor McAdams <cmcadams at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/tests/msg.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 7b75b65193b..ba5ef5f4c82 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -11485,16 +11485,16 @@ static void test_scrollwindowex(void)
}
static const struct message destroy_window_with_children[] = {
- { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, /* popup */
+ { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* popup */
{ HCBT_DESTROYWND, hook|lparam, 0, WND_PARENT_ID }, /* parent */
{ 0x0090, sent|optional },
{ HCBT_DESTROYWND, hook|lparam, 0, WND_POPUP_ID }, /* popup */
{ 0x0090, sent|optional },
- { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, /* popup */
+ { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* popup */
{ WM_DESTROY, sent|wparam|lparam, 0, WND_POPUP_ID }, /* popup */
{ WM_CAPTURECHANGED, sent|wparam|lparam, 0, WND_POPUP_ID }, /* popup */
{ WM_NCDESTROY, sent|wparam|lparam, 0, WND_POPUP_ID }, /* popup */
- { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, /* parent */
+ { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* parent */
{ WM_DESTROY, sent|wparam|lparam, 0, WND_PARENT_ID }, /* parent */
{ WM_DESTROY, sent|wparam|lparam, 0, WND_CHILD_ID + 2 }, /* child2 */
{ WM_DESTROY, sent|wparam|lparam, 0, WND_CHILD_ID + 1 }, /* child1 */
@@ -18548,6 +18548,9 @@ START_TEST(msg)
test_set_hook();
test_recursive_hook();
}
+ test_DestroyWindow();
+ test_DispatchMessage();
+ test_SendMessageTimeout();
/* Fix message sequences before removing 4 lines below */
if (pUnhookWinEvent && hEvent_hook)
@@ -18558,9 +18561,6 @@ START_TEST(msg)
}
hEvent_hook = 0;
- test_DestroyWindow();
- test_DispatchMessage();
- test_SendMessageTimeout();
test_edit_messages();
test_quit_message();
test_notify_message();
More information about the wine-cvs
mailing list