user32/tests: Fix test_paint_messages() message sequences to support WinEvents.
Signed-off-by: Connor McAdams <cmcadams@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
39af41a125
commit
e4bc8227ff
|
@ -414,7 +414,7 @@ static const struct message WmSWP_FrameChanged_clip[] = {
|
||||||
{ WM_NCPAINT, sent }, /* wparam != 1 */
|
{ WM_NCPAINT, sent }, /* wparam != 1 */
|
||||||
{ WM_ERASEBKGND, sent },
|
{ WM_ERASEBKGND, sent },
|
||||||
{ WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
|
{ WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
|
||||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 },
|
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||||
{ WM_PAINT, sent },
|
{ WM_PAINT, sent },
|
||||||
{ 0 }
|
{ 0 }
|
||||||
};
|
};
|
||||||
|
@ -426,7 +426,7 @@ static const struct message WmSWP_FrameChangedDeferErase[] = {
|
||||||
{ WM_WINDOWPOSCHANGING, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_DEFERERASE|SWP_NOACTIVATE|SWP_FRAMECHANGED },
|
{ WM_WINDOWPOSCHANGING, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_DEFERERASE|SWP_NOACTIVATE|SWP_FRAMECHANGED },
|
||||||
{ WM_NCCALCSIZE, sent|wparam|parent, 1 },
|
{ WM_NCCALCSIZE, sent|wparam|parent, 1 },
|
||||||
{ WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_DEFERERASE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
|
{ WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_DEFERERASE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
|
||||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 },
|
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||||
{ WM_PAINT, sent|parent|optional },
|
{ WM_PAINT, sent|parent|optional },
|
||||||
{ WM_NCPAINT, sent|beginpaint|parent|optional }, /* wparam != 1 */
|
{ WM_NCPAINT, sent|beginpaint|parent|optional }, /* wparam != 1 */
|
||||||
{ WM_GETTEXT, sent|beginpaint|parent|defwinproc|optional },
|
{ WM_GETTEXT, sent|beginpaint|parent|defwinproc|optional },
|
||||||
|
@ -447,7 +447,7 @@ static const struct message WmSWP_FrameChanged_noclip[] = {
|
||||||
{ WM_GETTEXT, sent|parent|defwinproc|optional },
|
{ WM_GETTEXT, sent|parent|defwinproc|optional },
|
||||||
{ WM_ERASEBKGND, sent|parent|optional },
|
{ WM_ERASEBKGND, sent|parent|optional },
|
||||||
{ WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
|
{ WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
|
||||||
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 },
|
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 },
|
||||||
{ WM_PAINT, sent },
|
{ WM_PAINT, sent },
|
||||||
{ WM_NCPAINT, sent|beginpaint }, /* wparam != 1 */
|
{ WM_NCPAINT, sent|beginpaint }, /* wparam != 1 */
|
||||||
{ WM_ERASEBKGND, sent|beginpaint|optional },
|
{ WM_ERASEBKGND, sent|beginpaint|optional },
|
||||||
|
@ -18530,6 +18530,9 @@ START_TEST(msg)
|
||||||
test_listbox_messages();
|
test_listbox_messages();
|
||||||
test_combobox_messages();
|
test_combobox_messages();
|
||||||
test_wmime_keydown_message();
|
test_wmime_keydown_message();
|
||||||
|
test_paint_messages();
|
||||||
|
test_interthread_messages();
|
||||||
|
test_message_conversion();
|
||||||
|
|
||||||
/* Fix message sequences before removing 4 lines below */
|
/* Fix message sequences before removing 4 lines below */
|
||||||
if (pUnhookWinEvent && hEvent_hook)
|
if (pUnhookWinEvent && hEvent_hook)
|
||||||
|
@ -18540,9 +18543,6 @@ START_TEST(msg)
|
||||||
}
|
}
|
||||||
hEvent_hook = 0;
|
hEvent_hook = 0;
|
||||||
|
|
||||||
test_paint_messages();
|
|
||||||
test_interthread_messages();
|
|
||||||
test_message_conversion();
|
|
||||||
test_accelerators();
|
test_accelerators();
|
||||||
test_timers();
|
test_timers();
|
||||||
test_timers_no_wnd();
|
test_timers_no_wnd();
|
||||||
|
|
Loading…
Reference in New Issue