[PATCH 13/22] user32/tests: Avoid "misleading indentation" warnings.
Fabian Maurer
dark.shadow4 at web.de
Fri Jan 28 17:36:57 CST 2022
Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
---
dlls/user32/tests/combo.c | 2 +-
dlls/user32/tests/dde.c | 4 +-
dlls/user32/tests/dialog.c | 16 +--
dlls/user32/tests/listbox.c | 2 +-
dlls/user32/tests/msg.c | 20 +--
dlls/user32/tests/win.c | 232 ++++++++++++++++-----------------
dlls/user32/tests/winstation.c | 12 +-
7 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c
index d203f37c2b9..82401f75a01 100644
--- a/dlls/user32/tests/combo.c
+++ b/dlls/user32/tests/combo.c
@@ -101,7 +101,7 @@ static void test_setitemheight(DWORD style)
font_height = get_font_height(hFont);
SendMessageA(hCombo, CB_SETITEMHEIGHT, -1, font_height / 2);
height = SendMessageA(hCombo, CB_GETITEMHEIGHT, -1, 0);
-todo_wine
+ todo_wine
ok(height == font_height / 2, "Unexpected item height %d, expected %d.\n", height, font_height / 2);
SetWindowPos(hCombo, NULL, 10, 10, 150, 5 * font_height, SWP_SHOWWINDOW);
diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index dc0bb85d736..c7d3a99b228 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -352,7 +352,7 @@ static void test_ddeml_client(void)
hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
ret = DdeGetLastError(client_pid);
ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %x\n", res);
-todo_wine
+ todo_wine
ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret);
ok( hdata != NULL, "hdata is NULL\n" );
if (hdata)
@@ -1746,7 +1746,7 @@ static void test_initialisation(void)
hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
ok(hdata == NULL, "Expected NULL, got %p\n", hdata);
ret = DdeGetLastError(client_pid);
-todo_wine
+ todo_wine
ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret);
ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %08x\n", res);
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index 4b1336b62c5..24aced8e192 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -1555,12 +1555,12 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w
SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_SETTEXTA));
ret = SetWindowTextA(hdlg, testtext);
- todo_wine
+ todo_wine
ok(ret, "Failed to set window text.\n");
SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_SETTEXTW));
ret = SetWindowTextW(hdlg, testtextW);
- todo_wine
+ todo_wine
ok(ret, "Failed to set window text.\n");
memset(buff, 'A', sizeof(buff));
@@ -1591,12 +1591,12 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w
SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_SETTEXTA));
ret = SetWindowTextA(hdlg, testtext);
- todo_wine
+ todo_wine
ok(ret, "Failed to set window text.\n");
SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_SETTEXTW));
ret = SetWindowTextW(hdlg, testtextW);
- todo_wine
+ todo_wine
ok(ret, "Failed to set window text.\n");
memset(buff, 'A', sizeof(buff));
@@ -1662,12 +1662,12 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM
SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_SETTEXTA));
ret = SetWindowTextA(hdlg, testtext);
- todo_wine
+ todo_wine
ok(ret, "Failed to set window text.\n");
SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_SETTEXTW));
ret = SetWindowTextW(hdlg, testtextW);
- todo_wine
+ todo_wine
ok(ret, "Failed to set window text.\n");
memset(buff, 'A', sizeof(buff));
@@ -1698,12 +1698,12 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM
SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_SETTEXTA));
ret = SetWindowTextA(hdlg, testtext);
- todo_wine
+ todo_wine
ok(ret, "Failed to set window text.\n");
SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_SETTEXTW));
ret = SetWindowTextW(hdlg, testtextW);
- todo_wine
+ todo_wine
ok(ret, "Failed to set window text.\n");
memset(buff, 'A', sizeof(buff));
diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c
index 7817d623134..cb2551002d6 100644
--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -2015,7 +2015,7 @@ static void test_GetListBoxInfo(void)
lb_getlistboxinfo = 0;
ret = pGetListBoxInfo(listbox);
ok(ret > 0, "got %d\n", ret);
-todo_wine
+ todo_wine
ok(lb_getlistboxinfo == 0, "got %d\n", lb_getlistboxinfo);
DestroyWindow(listbox);
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 90816a9df52..f0e0d0fba76 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -7515,8 +7515,8 @@ static void test_autoradio_kbd_move(void)
ret = IsDialogMessageA(parent, &msg);
ok(ret, "IsDialogMessage should return TRUE\n");
while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
-if (0) /* actual message sequence is different on every run in some Windows setups */
- ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #1", FALSE);
+ if (0) /* actual message sequence is different on every run in some Windows setups */
+ ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #1", FALSE);
/* what really matters is that nothing has changed */
test_radio(radio1, 1, radio2, 1, radio3, 1);
@@ -7529,8 +7529,8 @@ if (0) /* actual message sequence is different on every run in some Windows setu
ret = IsDialogMessageA(parent, &msg);
ok(ret, "IsDialogMessage should return TRUE\n");
while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
-if (0) /* actual message sequence is different on every run in some Windows setups */
- ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #2", FALSE);
+ if (0) /* actual message sequence is different on every run in some Windows setups */
+ ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #2", FALSE);
/* what really matters is that nothing has changed */
test_radio(radio1, 0, radio2, 1, radio3, 1);
@@ -7605,8 +7605,8 @@ if (0) /* actual message sequence is different on every run in some Windows setu
ret = IsDialogMessageA(parent, &msg);
ok(ret, "IsDialogMessage should return TRUE\n");
while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
-if (0) /* actual message sequence is different on every run in some Windows setups */
- ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #3", FALSE);
+ if (0) /* actual message sequence is different on every run in some Windows setups */
+ ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #3", FALSE);
/* what really matters is that nothing has changed */
test_radio(radio1, 1, radio2, 0, radio3, 0);
@@ -17875,7 +17875,7 @@ static void test_SetFocus(void)
SetLastError(0xdeadbeef);
old_active = SetActiveWindow(GetDesktopWindow());
-todo_wine
+ todo_wine
ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
ok_sequence(WmEmptySeq, "SetActiveWindow on a desktop window", TRUE);
@@ -17885,7 +17885,7 @@ todo_wine
SetLastError(0xdeadbeef);
old_active = SetActiveWindow(wnd_event.hwnd);
-todo_wine
+ todo_wine
ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
ok_sequence(WmEmptySeq, "SetActiveWindow on another thread window", TRUE);
@@ -17948,7 +17948,7 @@ todo_wine
SetLastError(0xdeadbeef);
old_focus = SetFocus(child);
-todo_wine
+ todo_wine
ok(GetLastError() == ERROR_INVALID_PARAMETER /* Vista+ */ ||
broken(GetLastError() == 0) /* XP */ ||
broken(GetLastError() == 0xdeadbeef), "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
@@ -18447,7 +18447,7 @@ static void test_SendMessage_other_thread(int thread_n)
ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE);
/* FIXME: remove once Wine is fixed */
-todo_wine_if (thread_n == 2)
+ todo_wine_if (thread_n == 2)
ok(ret == 0, "wrong status %08x\n", ret);
trace("main: call PeekMessage\n");
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index cb6b61e59c0..273dc8bd8ed 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -2384,7 +2384,7 @@ static void test_mdi(void)
if (style[i] & (WS_HSCROLL | WS_VSCROLL))
{
ok(ret, "GetScrollInfo(SB_HORZ) failed\n");
-todo_wine
+ todo_wine
ok(si.nPage != 0, "expected !0\n");
ok(si.nPos == 0, "expected 0\n");
ok(si.nTrackPos == 0, "expected 0\n");
@@ -2398,7 +2398,7 @@ todo_wine
if (style[i] & (WS_HSCROLL | WS_VSCROLL))
{
ok(ret, "GetScrollInfo(SB_VERT) failed\n");
-todo_wine
+ todo_wine
ok(si.nPage != 0, "expected !0\n");
ok(si.nPos == 0, "expected 0\n");
ok(si.nTrackPos == 0, "expected 0\n");
@@ -3388,7 +3388,7 @@ static void test_SetFocus(HWND hwnd)
ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd);
ShowWindow(hwnd, SW_SHOWMINIMIZED);
ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd);
-todo_wine
+ todo_wine
ok( GetFocus() != child, "Focus should not be on child %p\n", child );
ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd );
ShowWindow(hwnd, SW_RESTORE);
@@ -4259,7 +4259,7 @@ static void test_mouse_input(HWND hwnd)
ret = wait_for_message( &msg );
ok(ret, "no message available\n");
-todo_wine
+ todo_wine
ok(msg.hwnd == child && (msg.message == WM_NCMOUSELEAVE || broken(msg.message == WM_LBUTTONUP)),
"hwnd %p/%p message %04x\n", msg.hwnd, child, msg.message);
@@ -6700,33 +6700,33 @@ static void test_set_window_long_size(void)
retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA);
ok(retval > 123, "Unexpected user data.\n");
ret = GetWindowWord(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(ret == 123, "Unexpected user data %#x.\n", ret);
ret = SetWindowWord(hwnd, GWLP_USERDATA, 124);
-todo_wine
+ todo_wine
ok(ret == 123, "Unexpected user data %#x.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(ret == 124, "Unexpected user data %#x.\n", ret);
retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(retval == 124, "Unexpected user data.\n");
SetWindowLongA(hwnd, GWLP_USERDATA, (1 << 16) | 123);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
ok(ret == ((1 << 16) | 123), "Unexpected user data %#x.\n", ret);
ret = GetWindowWord(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(ret == 123, "Unexpected user data %#x.\n", ret);
ret = SetWindowWord(hwnd, GWLP_USERDATA, 124);
-todo_wine
+ todo_wine
ok(ret == 123, "Unexpected user data %#x.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(ret == ((1 << 16) | 124), "Unexpected user data %#x.\n", ret);
ret = GetWindowWord(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(ret == 124, "Unexpected user data %#x.\n", ret);
/* GWLP_ID */
@@ -6748,7 +6748,7 @@ todo_wine
ok(retval > 123, "Unexpected id.\n");
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_ID);
-todo_wine
+ todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret);
/* GWLP_HINSTANCE */
@@ -6765,7 +6765,7 @@ todo_wine
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_HINSTANCE);
-todo_wine
+ todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
SetLastError(0xdeadbeef);
@@ -6791,7 +6791,7 @@ todo_wine
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_HWNDPARENT);
-todo_wine
+ todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret);
DestroyWindow(hwnd);
@@ -6831,16 +6831,16 @@ static void test_set_window_word_size(void)
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
ok(ret > 123, "Unexpected user data %#x.\n", ret);
ret = GetWindowWord(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(ret == 123, "Unexpected user data %#x.\n", ret);
ret = SetWindowWord(hwnd, GWLP_USERDATA, 124);
-todo_wine
+ todo_wine
ok(ret == 123, "Unexpected user data %#x.\n", ret);
ret = GetWindowWord(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(ret == 124, "Unexpected user data %#x.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
-todo_wine
+ todo_wine
ok(ret == ((1 << 16) | 124), "Unexpected user data %#x.\n", ret);
/* GWLP_ID */
@@ -6851,11 +6851,11 @@ todo_wine
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_ID);
-todo_wine
+ todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret);
SetLastError(0xdeadbeef);
ret = SetWindowWord(hwnd, GWLP_ID, 2);
-todo_wine
+ todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret);
/* GWLP_HINSTANCE */
@@ -6864,12 +6864,12 @@ todo_wine
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_HINSTANCE);
-todo_wine
+ todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
SetLastError(0xdeadbeef);
ret = SetWindowWord(hwnd, GWLP_HINSTANCE, 0xdead);
-todo_wine
+ todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
/* GWLP_HWNDPARENT */
@@ -6878,7 +6878,7 @@ todo_wine
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_HWNDPARENT);
-todo_wine
+ todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret);
DestroyWindow(hwnd);
@@ -9720,10 +9720,10 @@ static void test_child_window_from_point(void)
ok(!found_invisible, "found %d invisible windows\n", found_invisible);
ok(found_disabled, "found %d disabled windows\n", found_disabled);
-todo_wine
+ todo_wine
ok(found_groupbox == 4, "found %d groupbox windows\n", found_groupbox);
ok(found_httransparent, "found %d httransparent windows\n", found_httransparent);
-todo_wine
+ todo_wine
ok(found_extransparent, "found %d extransparent windows\n", found_extransparent);
ret = UnregisterClassA("my_button", cls.hInstance);
@@ -10164,7 +10164,7 @@ static void test_update_region(void)
rc.right + wnd_orig.x, rc.bottom + wnd_orig.y);
CombineRgn(rgn1, rgn1, rgn2, RGN_OR);
GetUpdateRgn(parent, rgn2, FALSE);
-todo_wine
+ todo_wine
ok(EqualRgn(rgn1, rgn2), "wrong update region\n");
/* hwnd has the same invalid region as before moving */
@@ -10176,7 +10176,7 @@ todo_wine
SetRectRgn(rgn1, rc.left - child_orig.x , rc.top - child_orig.y,
rc.right - child_orig.x, rc.bottom - child_orig.y);
GetUpdateRgn(child, rgn2, FALSE);
-todo_wine
+ todo_wine
ok(EqualRgn(rgn1, rgn2), "wrong update region\n");
DeleteObject(rgn1);
@@ -10812,12 +10812,12 @@ static void test_deferwindowpos(void)
ok(!ret, "got %d\n", ret);
hdwp2 = DeferWindowPos(NULL, NULL, NULL, 0, 0, 10, 10, 0);
-todo_wine
+ todo_wine
ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) ||
broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError());
hdwp2 = DeferWindowPos((HDWP)0xdead, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0);
-todo_wine
+ todo_wine
ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) ||
broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError());
@@ -11261,10 +11261,10 @@ static void test_topmost(void)
ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
check_z_order(hwnd, hwnd2, 0, owner, TRUE);
swp_after(owner, HWND_TOPMOST);
-todo_wine
+ todo_wine
ok(is_topmost(owner), "owner should be topmost\n");
ok(is_topmost(hwnd), "hwnd should be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd2), "hwnd2 should be topmost\n");
swp_after(hwnd, HWND_NOTOPMOST);
ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n");
@@ -11276,8 +11276,8 @@ todo_wine
ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, 0, hwnd2, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, 0, hwnd2, owner, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
swp_after(hwnd, HWND_TOPMOST);
@@ -11287,11 +11287,11 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
check_z_order(hwnd, hwnd2, 0, owner, TRUE);
swp_after(hwnd, HWND_BOTTOM);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, 0, hwnd2, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, 0, hwnd2, owner, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
swp_after(hwnd, HWND_TOPMOST);
@@ -11301,18 +11301,18 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
check_z_order(hwnd, hwnd2, 0, owner, TRUE);
swp_after(hwnd, hwnd2);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
-todo_wine
- ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+ todo_wine
+ ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, 0, hwnd2, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, 0, hwnd2, owner, FALSE);
/* FIXME: compensate todo_wine above */
swp_after(hwnd, HWND_NOTOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, 0, hwnd2, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, 0, hwnd2, owner, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
hwnd_child2 = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd);
@@ -11336,54 +11336,54 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
swp_after(hwnd, HWND_TOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd), "hwnd should be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child), "child should be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child2), "child2 should be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, TRUE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
swp_after(hwnd, HWND_NOTOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
check_z_order(hwnd, hwnd2, 0, owner, FALSE);
check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
swp_after(hwnd, HWND_TOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd), "hwnd should be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child), "child should be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child2), "child2 should be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, TRUE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
swp_after(hwnd_child, HWND_NOTOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
check_z_order(hwnd, hwnd2, 0, owner, FALSE);
check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
@@ -11391,23 +11391,23 @@ todo_wine
swp_after(hwnd, HWND_TOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd), "hwnd should be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child), "child should be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child2), "child2 should be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, TRUE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
swp_after(hwnd_grandchild, HWND_NOTOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
check_z_order(hwnd, hwnd2, 0, owner, FALSE);
check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
@@ -11416,57 +11416,57 @@ todo_wine
swp_after(hwnd_child, HWND_TOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child), "child should be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
swp_after(hwnd_child, HWND_TOP);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child), "child should be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
swp_after(hwnd, HWND_NOTOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "grandchild should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
swp_after(hwnd_child, HWND_TOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child), "child should be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
swp_after(hwnd, HWND_NOTOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
@@ -11476,8 +11476,8 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
swp_after(hwnd_child2, HWND_NOTOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
@@ -11485,58 +11485,58 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
swp_after(hwnd_child, HWND_TOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child), "child should be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
swp_after(hwnd_child, HWND_BOTTOM);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, 0, hwnd2, owner, FALSE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, 0, hwnd2, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
swp_after(hwnd_child, HWND_TOPMOST);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(is_topmost(hwnd_child), "child should be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
swp_after(hwnd_child, hwnd_child2);
ok(!is_topmost(owner), "owner should NOT be topmost\n");
ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
-todo_wine
+ todo_wine
ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd, hwnd2, 0, owner, FALSE);
-if (!is_wine) /* FIXME: remove once Wine is fixed */
- check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd, hwnd2, 0, owner, FALSE);
+ if (!is_wine) /* FIXME: remove once Wine is fixed */
+ check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE);
reset_window_state(state, ARRAY_SIZE(state));
DestroyWindow(hwnd_grandchild);
diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
index 76aa8a533b9..9899b6c7f7b 100644
--- a/dlls/user32/tests/winstation.c
+++ b/dlls/user32/tests/winstation.c
@@ -640,7 +640,7 @@ static void test_inputdesktop(void)
win_skip("Skip tests on NT4\n");
return;
}
-todo_wine
+ todo_wine
ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError());
ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret);
@@ -681,14 +681,14 @@ todo_wine
memset(name, 0, sizeof(name));
ret = GetUserObjectInformationA(input_desk, UOI_NAME, name, 1024, NULL);
ok(ret, "GetUserObjectInformation failed!\n");
-todo_wine
+ todo_wine
ok(!strcmp(name, "new_desk"), "unexpected desktop %s\n", name);
ret = CloseDesktop(input_desk);
ok(ret, "CloseDesktop failed!\n");
SetLastError(0xdeadbeef);
ret = SendInput(1, inputs, sizeof(INPUT));
-todo_wine
+ todo_wine
ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError());
ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret);
@@ -786,16 +786,16 @@ static void test_inputdesktop2(void)
ok(hdesk != NULL, "OpenDesktop failed!\n");
SetLastError(0xdeadbeef);
ret = SwitchDesktop(hdesk);
-todo_wine
+ todo_wine
ok(!ret, "Switch to desktop belong to non default winstation should fail!\n");
-todo_wine
+ todo_wine
ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError());
ret = SetThreadDesktop(hdesk);
ok(ret, "SetThreadDesktop failed!\n");
/* clean side effect */
ret = SetThreadDesktop(thread_desk);
-todo_wine
+ todo_wine
ok(ret, "SetThreadDesktop should success even desktop is not belong to process winstation!\n");
ret = SetProcessWindowStation(w1);
ok(ret, "SetProcessWindowStation failed!\n");
--
2.35.0
More information about the wine-devel
mailing list