marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32/tests: Fix some msg test failures. 

These test failures sometimes happen on some TestBots.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Zhiyi Zhang 2019-09-11 20:54:36 +08:00 committed by Alexandre Julliard
parent 439b80e4c4
commit a3948047dd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/user32/tests/msg.c
View File

@ -567,6 +567,7 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = {
{ WM_GETTITLEBARINFOEX, sent|optional },
{ WM_NCPAINT, sent|beginpaint|optional },
{ WM_ERASEBKGND, sent|beginpaint|optional },
{ WM_SYNCPAINT, sent|optional },
{ 0 }
};
/* ShowWindow(SW_RESTORE) for a not visible minimized overlapped window */
@ -837,6 +838,7 @@ static const struct message WmShowMaxPopupSeq[] = {
{ WM_ERASEBKGND, sent|defwinproc|optional },
{ WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE },
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 },
{ WM_SIZE, sent|defwinproc|optional },
{ 0 }
};
/* CreateWindow(WS_VISIBLE) for popup window */
@ -3477,6 +3479,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq2[] = {
{ WM_MDIACTIVATE, sent|defwinproc|optional },
{ WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
{ EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */
{ WM_SIZE, sent|defwinproc|optional },
{ 0 }
};
/* WM_MDIMAXIMIZE for an MDI child window with invisible parent */
@ -13613,6 +13616,8 @@ static const struct message WmCreateDialogParamSeq_3[] = {
{ WM_QUERYNEWPALETTE, sent|parent|optional }, /* TODO: this message should not be sent */
{ WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE },
{ WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE },
{ WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
{ WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
{ WM_ACTIVATEAPP, sent|parent|wparam, 1 },
{ WM_NCACTIVATE, sent|parent },
{ WM_ACTIVATE, sent|parent|wparam, 1 },
@ -16541,16 +16546,16 @@ static void test_hotkey(void)
SetLastError(0xdeadbeef);
ret = UnregisterHotKey(NULL, 0);
ok(ret == FALSE, "expected FALSE, got %i\n", ret);
ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef),
"unexpected error %d\n", GetLastError());
if (ret == TRUE)
{
skip("hotkeys not supported\n");
return;
}
ok(ret == FALSE, "expected FALSE, got %i\n", ret);
ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef),
"unexpected error %d\n", GetLastError());
test_window = CreateWindowExA(0, "HotkeyWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE,
100, 100, 200, 200, 0, 0, 0, NULL);