user32/tests: Add missing winevents to test_defwinproc() message sequences.
Signed-off-by: Connor McAdams <cmcadams@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
86198569f6
commit
51bf6cc0fd
|
@ -16005,17 +16005,20 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] =
|
|||
{ WM_WINDOWPOSCHANGING, sent|optional },
|
||||
{ WM_GETMINMAXINFO, sent|defwinproc },
|
||||
{ WM_NCCALCSIZE, sent|optional },
|
||||
{ EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ WM_NCPAINT, sent|optional },
|
||||
{ WM_GETTEXT, sent|defwinproc|optional },
|
||||
{ WM_ERASEBKGND, sent|optional },
|
||||
{ WM_WINDOWPOSCHANGED, sent|optional },
|
||||
{ HCBT_ACTIVATE, hook },
|
||||
{ EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE },
|
||||
{ WM_ACTIVATEAPP, sent|wparam, TRUE },
|
||||
{ WM_NCACTIVATE, sent|wparam, TRUE },
|
||||
{ WM_GETTEXT, sent|defwinproc|optional },
|
||||
{ WM_ACTIVATE, sent|wparam, TRUE },
|
||||
{ HCBT_SETFOCUS, hook },
|
||||
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ WM_SETFOCUS, sent|defwinproc },
|
||||
{ WM_NCPAINT, sent },
|
||||
{ WM_GETTEXT, sent|defwinproc|optional },
|
||||
|
@ -16026,6 +16029,9 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] =
|
|||
{ WM_NCCALCSIZE, sent|optional },
|
||||
{ WM_NCPAINT, sent|optional },
|
||||
{ WM_ERASEBKGND, sent|optional },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */
|
||||
{ EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ WM_ACTIVATE, sent|wparam, TRUE },
|
||||
{ WM_SYNCPAINT, sent|optional },
|
||||
{ WM_PAINT, sent },
|
||||
|
@ -16043,12 +16049,15 @@ static const struct message WmRestoreActiveMinimizedOverlappedSeq[] =
|
|||
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE },
|
||||
{ WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
|
||||
{ WM_NCCALCSIZE, sent|optional },
|
||||
{ EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win7. */
|
||||
{ WM_MOVE, sent|optional },
|
||||
{ WM_SIZE, sent|optional },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win7. */
|
||||
{ WM_GETTEXT, sent|optional },
|
||||
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED },
|
||||
{ WM_GETMINMAXINFO, sent|defwinproc },
|
||||
{ WM_NCCALCSIZE, sent },
|
||||
{ EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win8+. */
|
||||
{ WM_NCPAINT, sent },
|
||||
{ WM_GETTEXT, sent|defwinproc|optional },
|
||||
{ WM_ERASEBKGND, sent },
|
||||
|
@ -16058,7 +16067,11 @@ static const struct message WmRestoreActiveMinimizedOverlappedSeq[] =
|
|||
{ WM_NCCALCSIZE, sent|optional },
|
||||
{ WM_NCPAINT, sent|optional },
|
||||
{ WM_ERASEBKGND, sent|optional },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */
|
||||
{ EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||
{ HCBT_SETFOCUS, hook },
|
||||
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||
{ WM_SETFOCUS, sent },
|
||||
/* Note this WM_ACTIVATE messages even if the window is already active */
|
||||
{ WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 },
|
||||
|
@ -18658,6 +18671,11 @@ START_TEST(msg)
|
|||
test_nullCallback();
|
||||
test_dbcs_wm_char();
|
||||
test_unicode_wm_char();
|
||||
test_defwinproc();
|
||||
test_desktop_winproc();
|
||||
test_clipboard_viewers();
|
||||
test_keyflags();
|
||||
test_hotkey();
|
||||
|
||||
/* Fix message sequences before removing 4 lines below */
|
||||
if (pUnhookWinEvent && hEvent_hook)
|
||||
|
@ -18668,11 +18686,6 @@ START_TEST(msg)
|
|||
}
|
||||
hEvent_hook = 0;
|
||||
|
||||
test_defwinproc();
|
||||
test_desktop_winproc();
|
||||
test_clipboard_viewers();
|
||||
test_keyflags();
|
||||
test_hotkey();
|
||||
test_layered_window();
|
||||
test_TrackPopupMenu();
|
||||
test_TrackPopupMenuEmpty();
|
||||
|
|
Loading…
Reference in New Issue