Connor McAdams : user32/tests: Add missing winevents to test_TrackPopupMenuEmpty() message sequences.
Alexandre Julliard
julliard at winehq.org
Tue Sep 28 16:01:58 CDT 2021
Module: wine
Branch: master
Commit: 16444944a224838c9392f869408a06f53bb61a6b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=16444944a224838c9392f869408a06f53bb61a6b
Author: Connor McAdams <cmcadams at codeweavers.com>
Date: Mon Sep 27 18:28:12 2021 -0400
user32/tests: Add missing winevents to test_TrackPopupMenuEmpty() 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 | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 633bd19dc46..abb0dc1d97f 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -2250,15 +2250,22 @@ static const struct message WmTrackPopupMenuCapture[] = {
static const struct message WmTrackPopupMenuEmpty[] = {
{ HCBT_CREATEWND, hook },
+ { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
{ WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 },
+ { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
{ WM_INITMENU, sent|lparam, 0, 0 },
+ { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
{ WM_INITMENUPOPUP, sent|lparam, 0, 0 },
{ 0x0093, sent|optional },
{ 0x0094, sent|optional },
{ 0x0094, sent|optional },
+ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
+ { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
+ { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
{ WM_CAPTURECHANGED, sent },
{ WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 },
{ HCBT_DESTROYWND, hook },
+ { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
{ WM_UNINITMENUPOPUP, sent|lparam, 0, 0 },
{ 0 }
};
@@ -18745,6 +18752,7 @@ START_TEST(msg)
test_hotkey();
test_layered_window();
test_TrackPopupMenu();
+ test_TrackPopupMenuEmpty();
/* Fix message sequences before removing 4 lines below */
if (pUnhookWinEvent && hEvent_hook)
@@ -18755,7 +18763,6 @@ START_TEST(msg)
}
hEvent_hook = 0;
- test_TrackPopupMenuEmpty();
test_DoubleSetCapture();
/* keep it the last test, under Windows it tends to break the tests
* which rely on active/foreground windows being correct.
More information about the wine-cvs
mailing list