user32/tests: Fix existing winevents in test_DestroyWindow() message sequences.

Signed-off-by: Connor McAdams <cmcadams@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Connor McAdams 2021-09-21 19:50:41 -04:00 committed by Alexandre Julliard
parent 18d2df2bdf
commit a622753186
1 changed files with 6 additions and 6 deletions

View File

@ -11485,16 +11485,16 @@ static void test_scrollwindowex(void)
} }
static const struct message destroy_window_with_children[] = { 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 */ { HCBT_DESTROYWND, hook|lparam, 0, WND_PARENT_ID }, /* parent */
{ 0x0090, sent|optional }, { 0x0090, sent|optional },
{ HCBT_DESTROYWND, hook|lparam, 0, WND_POPUP_ID }, /* popup */ { HCBT_DESTROYWND, hook|lparam, 0, WND_POPUP_ID }, /* popup */
{ 0x0090, sent|optional }, { 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_DESTROY, sent|wparam|lparam, 0, WND_POPUP_ID }, /* popup */
{ WM_CAPTURECHANGED, 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 */ { 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_PARENT_ID }, /* parent */
{ WM_DESTROY, sent|wparam|lparam, 0, WND_CHILD_ID + 2 }, /* child2 */ { WM_DESTROY, sent|wparam|lparam, 0, WND_CHILD_ID + 2 }, /* child2 */
{ WM_DESTROY, sent|wparam|lparam, 0, WND_CHILD_ID + 1 }, /* child1 */ { WM_DESTROY, sent|wparam|lparam, 0, WND_CHILD_ID + 1 }, /* child1 */
@ -18548,6 +18548,9 @@ START_TEST(msg)
test_set_hook(); test_set_hook();
test_recursive_hook(); test_recursive_hook();
} }
test_DestroyWindow();
test_DispatchMessage();
test_SendMessageTimeout();
/* Fix message sequences before removing 4 lines below */ /* Fix message sequences before removing 4 lines below */
if (pUnhookWinEvent && hEvent_hook) if (pUnhookWinEvent && hEvent_hook)
@ -18558,9 +18561,6 @@ START_TEST(msg)
} }
hEvent_hook = 0; hEvent_hook = 0;
test_DestroyWindow();
test_DispatchMessage();
test_SendMessageTimeout();
test_edit_messages(); test_edit_messages();
test_quit_message(); test_quit_message();
test_notify_message(); test_notify_message();