user32: Flush painting events harder in some places in order to avoid races in the message tests.
This commit is contained in:
parent
bed6b6cd7f
commit
0e71d0e136
|
@ -3816,6 +3816,7 @@ static void test_messages(void)
|
||||||
ok (hchild != 0, "Failed to create child window\n");
|
ok (hchild != 0, "Failed to create child window\n");
|
||||||
|
|
||||||
SetFocus(hchild);
|
SetFocus(hchild);
|
||||||
|
flush_events();
|
||||||
flush_sequence();
|
flush_sequence();
|
||||||
|
|
||||||
EnableWindow(hparent, FALSE);
|
EnableWindow(hparent, FALSE);
|
||||||
|
@ -3830,8 +3831,6 @@ static void test_messages(void)
|
||||||
/* MsgWaitForMultipleObjects test */
|
/* MsgWaitForMultipleObjects test */
|
||||||
ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE);
|
ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE);
|
||||||
ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret);
|
ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret);
|
||||||
msg.message = 0xdeadbeef;
|
|
||||||
ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "got not expected %04x\n", msg.message);
|
|
||||||
|
|
||||||
PostMessageA(hparent, WM_USER, 0, 0);
|
PostMessageA(hparent, WM_USER, 0, 0);
|
||||||
|
|
||||||
|
@ -6712,6 +6711,8 @@ static void test_scrollwindowex(void)
|
||||||
flush_sequence();
|
flush_sequence();
|
||||||
while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg );
|
while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg );
|
||||||
ok_sequence(ScrollWindowPaint1, "ScrollWindowEx", 0);
|
ok_sequence(ScrollWindowPaint1, "ScrollWindowEx", 0);
|
||||||
|
flush_events();
|
||||||
|
flush_sequence();
|
||||||
|
|
||||||
/* Now without the SW_ERASE flag */
|
/* Now without the SW_ERASE flag */
|
||||||
trace("start scroll\n");
|
trace("start scroll\n");
|
||||||
|
@ -6721,6 +6722,8 @@ static void test_scrollwindowex(void)
|
||||||
flush_sequence();
|
flush_sequence();
|
||||||
while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg );
|
while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg );
|
||||||
ok_sequence(ScrollWindowPaint2, "ScrollWindowEx", 0);
|
ok_sequence(ScrollWindowPaint2, "ScrollWindowEx", 0);
|
||||||
|
flush_events();
|
||||||
|
flush_sequence();
|
||||||
|
|
||||||
/* now scroll the child window as well */
|
/* now scroll the child window as well */
|
||||||
trace("start scroll\n");
|
trace("start scroll\n");
|
||||||
|
@ -6734,6 +6737,8 @@ static void test_scrollwindowex(void)
|
||||||
flush_sequence();
|
flush_sequence();
|
||||||
while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg );
|
while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg );
|
||||||
ok_sequence(ScrollWindowPaint1, "ScrollWindowEx", 0);
|
ok_sequence(ScrollWindowPaint1, "ScrollWindowEx", 0);
|
||||||
|
flush_events();
|
||||||
|
flush_sequence();
|
||||||
|
|
||||||
/* now scroll with ScrollWindow() */
|
/* now scroll with ScrollWindow() */
|
||||||
trace("start scroll with ScrollWindow\n");
|
trace("start scroll with ScrollWindow\n");
|
||||||
|
|
Loading…
Reference in New Issue