user32/tests: Add missing winevents to test_SetActiveWindow() message sequences.
Signed-off-by: Connor McAdams <cmcadams@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
37b2e37edf
commit
9196caea07
|
@ -14565,6 +14565,7 @@ static const struct message SetActiveWindowSeq0[] =
|
||||||
{ WM_NCACTIVATE, sent|wparam, 0 },
|
{ WM_NCACTIVATE, sent|wparam, 0 },
|
||||||
{ WM_GETTEXT, sent|defwinproc|optional },
|
{ WM_GETTEXT, sent|defwinproc|optional },
|
||||||
{ WM_ACTIVATE, sent|wparam, 0 },
|
{ WM_ACTIVATE, sent|wparam, 0 },
|
||||||
|
{ EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||||
{ WM_ACTIVATEAPP, sent|wparam|optional, 0 },
|
{ WM_ACTIVATEAPP, sent|wparam|optional, 0 },
|
||||||
{ WM_ACTIVATEAPP, sent|wparam|optional, 0 },
|
{ WM_ACTIVATEAPP, sent|wparam|optional, 0 },
|
||||||
{ WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 },
|
{ WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 },
|
||||||
|
@ -14582,6 +14583,7 @@ static const struct message SetActiveWindowSeq0[] =
|
||||||
{ WM_IME_SETCONTEXT, sent|optional },
|
{ WM_IME_SETCONTEXT, sent|optional },
|
||||||
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 },
|
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 },
|
||||||
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
|
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
|
||||||
|
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||||
{ WM_SETFOCUS, sent|defwinproc|optional },
|
{ WM_SETFOCUS, sent|defwinproc|optional },
|
||||||
{ WM_GETTEXT, sent|optional },
|
{ WM_GETTEXT, sent|optional },
|
||||||
{ 0 }
|
{ 0 }
|
||||||
|
@ -14599,6 +14601,7 @@ static const struct message SetActiveWindowSeq2[] =
|
||||||
{ WM_NCACTIVATE, sent|wparam, 0 },
|
{ WM_NCACTIVATE, sent|wparam, 0 },
|
||||||
{ WM_GETTEXT, sent|defwinproc|optional },
|
{ WM_GETTEXT, sent|defwinproc|optional },
|
||||||
{ WM_ACTIVATE, sent|wparam, 0 },
|
{ WM_ACTIVATE, sent|wparam, 0 },
|
||||||
|
{ EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||||
{ WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 },
|
{ WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 },
|
||||||
{ WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE },
|
{ WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE },
|
||||||
{ WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE },
|
{ WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE },
|
||||||
|
@ -14615,6 +14618,7 @@ static const struct message SetActiveWindowSeq2[] =
|
||||||
{ WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 },
|
{ WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 },
|
||||||
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 },
|
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 },
|
||||||
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
|
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
|
||||||
|
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||||
{ WM_SETFOCUS, sent|defwinproc },
|
{ WM_SETFOCUS, sent|defwinproc },
|
||||||
{ WM_GETTEXT, sent|optional },
|
{ WM_GETTEXT, sent|optional },
|
||||||
{ 0 }
|
{ 0 }
|
||||||
|
@ -14624,6 +14628,7 @@ static const struct message SetActiveWindowSeq2[] =
|
||||||
static const struct message SetActiveWindowSeq3[] =
|
static const struct message SetActiveWindowSeq3[] =
|
||||||
{
|
{
|
||||||
{ HCBT_ACTIVATE, hook },
|
{ HCBT_ACTIVATE, hook },
|
||||||
|
{ EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||||
{ WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 },
|
{ WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 },
|
||||||
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE },
|
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE },
|
||||||
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE },
|
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE },
|
||||||
|
@ -14636,6 +14641,7 @@ static const struct message SetActiveWindowSeq3[] =
|
||||||
{ HCBT_SETFOCUS, hook },
|
{ HCBT_SETFOCUS, hook },
|
||||||
{ WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 },
|
{ WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 },
|
||||||
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
|
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
|
||||||
|
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||||
{ WM_SETFOCUS, sent|defwinproc },
|
{ WM_SETFOCUS, sent|defwinproc },
|
||||||
{ 0 }
|
{ 0 }
|
||||||
};
|
};
|
||||||
|
@ -14646,6 +14652,7 @@ static const struct message SetActiveWindowSeq4[] =
|
||||||
{ WM_NCACTIVATE, sent|wparam, 0 },
|
{ WM_NCACTIVATE, sent|wparam, 0 },
|
||||||
{ WM_GETTEXT, sent|defwinproc|optional },
|
{ WM_GETTEXT, sent|defwinproc|optional },
|
||||||
{ WM_ACTIVATE, sent|wparam, 0 },
|
{ WM_ACTIVATE, sent|wparam, 0 },
|
||||||
|
{ EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||||
{ WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 },
|
{ WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 },
|
||||||
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE },
|
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE },
|
||||||
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE },
|
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE },
|
||||||
|
@ -14660,6 +14667,7 @@ static const struct message SetActiveWindowSeq4[] =
|
||||||
{ WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 },
|
{ WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 },
|
||||||
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 },
|
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 },
|
||||||
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
|
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
|
||||||
|
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },
|
||||||
{ WM_SETFOCUS, sent|defwinproc },
|
{ WM_SETFOCUS, sent|defwinproc },
|
||||||
{ 0 }
|
{ 0 }
|
||||||
};
|
};
|
||||||
|
@ -18561,6 +18569,7 @@ START_TEST(msg)
|
||||||
test_edit_messages();
|
test_edit_messages();
|
||||||
test_quit_message();
|
test_quit_message();
|
||||||
test_notify_message();
|
test_notify_message();
|
||||||
|
test_SetActiveWindow();
|
||||||
|
|
||||||
/* Fix message sequences before removing 4 lines below */
|
/* Fix message sequences before removing 4 lines below */
|
||||||
if (pUnhookWinEvent && hEvent_hook)
|
if (pUnhookWinEvent && hEvent_hook)
|
||||||
|
@ -18571,7 +18580,6 @@ START_TEST(msg)
|
||||||
}
|
}
|
||||||
hEvent_hook = 0;
|
hEvent_hook = 0;
|
||||||
|
|
||||||
test_SetActiveWindow();
|
|
||||||
test_restore_messages();
|
test_restore_messages();
|
||||||
test_invalid_window();
|
test_invalid_window();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue