user32/tests: Add missing winevents to test_menu_messages() message sequences.
Signed-off-by: Connor McAdams <cmcadams@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
04965f6e47
commit
21e3bb1bfb
|
@ -15571,11 +15571,21 @@ static const struct message wm_popup_menu_1[] =
|
|||
{ WM_MENUSELECT, sent|wparam, MAKEWPARAM(1,MF_HILITE|MF_POPUP) },
|
||||
{ WM_INITMENUPOPUP, sent|lparam, 0, 1 },
|
||||
{ HCBT_CREATEWND, hook|optional }, /* Win9x doesn't create a window */
|
||||
{ EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ WM_MENUSELECT, sent|wparam, MAKEWPARAM(200,MF_HILITE) },
|
||||
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'E', 0xf0000001 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001, 0, 0x40000000 },
|
||||
{ EVENT_OBJECT_INVOKED, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_MENU, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't create a window */
|
||||
{ EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ WM_UNINITMENUPOPUP, sent|lparam, 0, 0 },
|
||||
{ WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 },
|
||||
{ WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 },
|
||||
|
@ -15599,19 +15609,38 @@ static const struct message wm_popup_menu_2[] =
|
|||
{ WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(0,MF_HILITE|MF_POPUP) }, /* Win9x */
|
||||
{ WM_INITMENUPOPUP, sent|lparam|optional, 0, 0 }, /* Win9x */
|
||||
{ HCBT_CREATEWND, hook },
|
||||
{ EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ WM_MENUSELECT, sent }, /*|wparam, MAKEWPARAM(0,MF_HILITE|MF_POPUP) - XP
|
||||
|wparam, MAKEWPARAM(100,MF_HILITE) - Win9x */
|
||||
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'F', 0xf0000001 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RIGHT, 0x10000001 },
|
||||
{ WM_INITMENUPOPUP, sent|lparam|optional, 0, 0 }, /* Win9x doesn't send it */
|
||||
{ HCBT_CREATEWND, hook|optional }, /* Win9x doesn't send it */
|
||||
{ EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(100,MF_HILITE) },
|
||||
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RIGHT, 0xd0000001 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001 },
|
||||
{ EVENT_OBJECT_INVOKED, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_MENU, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ HCBT_DESTROYWND, hook },
|
||||
{ EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ WM_UNINITMENUPOPUP, sent|lparam, 0, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't send it */
|
||||
{ EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ WM_UNINITMENUPOPUP, sent|lparam, 0, 0 },
|
||||
{ WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 },
|
||||
{ WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 },
|
||||
|
@ -15635,19 +15664,38 @@ static const struct message wm_popup_menu_3[] =
|
|||
{ WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(0,MF_HILITE|MF_POPUP) }, /* Win9x */
|
||||
{ WM_INITMENUPOPUP, sent|lparam|optional, 0, 0 }, /* Win9x */
|
||||
{ HCBT_CREATEWND, hook },
|
||||
{ EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ WM_MENUSELECT, sent }, /*|wparam, MAKEWPARAM(0,MF_HILITE|MF_POPUP) - XP
|
||||
|wparam, MAKEWPARAM(100,MF_HILITE) - Win9x */
|
||||
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'F', 0xf0000001 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RIGHT, 0x10000001 },
|
||||
{ WM_INITMENUPOPUP, sent|lparam|optional, 0, 0 }, /* Win9x doesn't send it */
|
||||
{ HCBT_CREATEWND, hook|optional }, /* Win9x doesn't send it */
|
||||
{ EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(100,MF_HILITE) },
|
||||
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RIGHT, 0xd0000001 },
|
||||
{ HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001 },
|
||||
{ EVENT_OBJECT_INVOKED, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_MENU, 100 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ HCBT_DESTROYWND, hook },
|
||||
{ EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ WM_UNINITMENUPOPUP, sent|lparam, 0, 0 },
|
||||
{ EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't send it */
|
||||
{ EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ WM_UNINITMENUPOPUP, sent|lparam, 0, 0 },
|
||||
{ WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 },
|
||||
{ WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 },
|
||||
|
@ -18595,6 +18643,8 @@ START_TEST(msg)
|
|||
test_SetActiveWindow();
|
||||
test_restore_messages();
|
||||
test_invalid_window();
|
||||
test_menu_messages();
|
||||
test_paintingloop();
|
||||
|
||||
if (!pTrackMouseEvent)
|
||||
win_skip("TrackMouseEvent is not available\n");
|
||||
|
@ -18618,8 +18668,6 @@ START_TEST(msg)
|
|||
}
|
||||
hEvent_hook = 0;
|
||||
|
||||
test_menu_messages();
|
||||
test_paintingloop();
|
||||
test_defwinproc();
|
||||
test_desktop_winproc();
|
||||
test_clipboard_viewers();
|
||||
|
|
Loading…
Reference in New Issue