January 2022 - Wine-Devel - list.winehq.org

[PATCH 16/22] wbemprox/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wbemprox/tests/query.c | 2 +- dlls/wbemprox/tests/services.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 583ae578efa..a57a4398da3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,7 +1144,7 @@ static void test_query_semisync( IWbemServices *services ) count = 1; obj = (void *)0xdeadbeef; hr = IEnumWbemClassObject_Next( result, -1, 1, &obj, &count ); -todo_wine + todo_wine ok( hr == WBEM_E_INVALID_CLASS, "Unexpected hr %#x.\n", hr ); ok( count == 0, "Unexpected count %u.\n", count ); ok( obj == (void *)0xdeadbeef, "Got object %p\n", obj ); diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index f72d43c0b0b..651beaef6a2 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -214,11 +214,11 @@ static void test_IWbemContext(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IWbemContext_Next(context, 0, &str, &var); -todo_wine + todo_wine ok(hr == WBEM_E_UNEXPECTED, "Unexpected hr %#x.\n", hr); hr = IWbemContext_BeginEnumeration(context, 0); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); str = NULL; @@ -229,7 +229,7 @@ todo_wine { SysFreeString(str); } hr = IWbemContext_EndEnumeration(context); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Overwrite */ -- 2.35.0

Jan. 28, 2022

[PATCH 15/22] wbemdisp/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wbemdisp/tests/wbemdisp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index bf44f62329a..4ce847fac84 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -443,7 +443,7 @@ static void test_namedvalueset(void) V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value2, &var ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); V_I4(&var) = 0; @@ -474,7 +474,7 @@ todo_wine { ok( count == 1, "Unexpected count %d.\n", count ); } hr = ISWbemNamedValueSet_DeleteAll( set ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); count = 1; @@ -485,7 +485,7 @@ todo_wine { } V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value, &var ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); count = 0; -- 2.35.0

Jan. 28, 2022

[PATCH 14/22] uxtheme/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/uxtheme/tests/system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index afc05b8549f..980676f9e57 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -885,11 +885,11 @@ static void test_buffered_paint(void) /* clearing */ hr = pBufferedPaintClear(NULL, NULL); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); hr = pBufferedPaintClear(buffer, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected return code %#x\n", hr); /* access buffer attributes */ -- 2.35.0

Jan. 28, 2022

[PATCH 13/22] user32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)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

Jan. 28, 2022

[PATCH 12/22] taskschd/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/taskschd/tests/scheduler.c | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c03ecd35b97..e7b39e5fdaf 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -151,11 +151,11 @@ static void test_GetFolder(void) ok(hr == S_OK, "Connect error %#x\n", hr); hr = ITaskService_GetFolder(service, slash, &folder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, dot, &folder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_INVALID_NAME, got %#x\n", hr); @@ -198,7 +198,7 @@ todo_wine ITaskFolder_DeleteFolder(folder, Wine, 0); hr = ITaskFolder_CreateFolder(folder, slash, v_null, &subfolder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); @@ -206,7 +206,7 @@ todo_wine "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); @@ -360,7 +360,7 @@ todo_wine ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, slash, 0); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); ITaskFolder_Release(folder); @@ -799,7 +799,7 @@ static void test_GetTask(void) ok(hr == S_OK, "RegisterTask error %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || broken(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) /* Vista */, "expected ERROR_ACCESS_DENIED, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); @@ -860,11 +860,11 @@ todo_wine SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task2); @@ -897,11 +897,11 @@ todo_wine ok(hr == S_OK, "put_Enabled error %#x\n", hr); hr = IRegisteredTask_get_State(task1, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task1); @@ -919,11 +919,11 @@ todo_wine SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); hr = IRegisteredTask_get_State(task2, NULL); @@ -934,7 +934,7 @@ todo_wine IRegisteredTask_Release(task2); hr = ITaskFolder_DeleteTask(folder, NULL, 0); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); @@ -1592,7 +1592,7 @@ static void test_TaskDefinition(void) MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine + todo_wine ok(hr == SCHED_E_UNEXPECTEDNODE, "expected SCHED_E_UNEXPECTEDNODE, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); @@ -1601,7 +1601,7 @@ todo_wine MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine + todo_wine ok(hr == SCHED_E_MISSINGNODE, "expected SCHED_E_MISSINGNODE, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, ARRAY_SIZE(xmlW)); @@ -1703,10 +1703,10 @@ todo_wine V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; hr = IRegistrationInfo_get_SecurityDescriptor(reginfo, &var); -todo_wine + todo_wine ok(hr == S_OK, "get_SecurityDescriptor error %#x\n", hr); -if (hr == S_OK) - ok(V_VT(&var) == VT_EMPTY, "expected VT_EMPTY, got %u\n", V_VT(&var)); + if (hr == S_OK) + ok(V_VT(&var) == VT_EMPTY, "expected VT_EMPTY, got %u\n", V_VT(&var)); IRegistrationInfo_Release(reginfo); -- 2.35.0

Jan. 28, 2022

[PATCH 11/22] shlwapi/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shlwapi/tests/istream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 84957ac8cd1..4894eabdf50 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -810,7 +810,7 @@ static void test_SHCreateMemStream(void) ok(num == 0, "expected 0, got 0x%08x\n", num); hr = IStream_Clone(stream, &stream2); -todo_wine + todo_wine ok(hr == S_OK || broken(hr == E_NOTIMPL) /* < Win8 */, "Failed to clone a stream, hr %#x.\n", hr); if (hr == S_OK) IStream_Release(stream2); -- 2.35.0

Jan. 28, 2022

[PATCH 10/22] shell32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/tests/appbar.c | 2 +- dlls/shell32/tests/shelldispatch.c | 12 ++++++------ dlls/shell32/tests/shelllink.c | 10 +++++----- dlls/shell32/tests/shlfolder.c | 22 +++++++++++----------- dlls/shell32/tests/shlview.c | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 229d616c6f0..e1c050bbc16 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -431,7 +431,7 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void) appid = (void*)0xdeadbeef; hr = pGetCurrentProcessExplicitAppUserModelID(&appid); -todo_wine + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(appid == NULL, "got %p\n", appid); } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 8e69a0bfa4e..f243ba053d0 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -781,16 +781,16 @@ static void test_items(void) } r = FolderItems__NewEnum(items, &unk); -todo_wine + todo_wine ok(r == S_OK, "FolderItems::_NewEnum failed: %08x\n", r); -todo_wine + todo_wine ok(!!unk, "unk is null\n"); if (unk) IUnknown_Release(unk); if (items3) { r = FolderItems3_Filter(items3, 0, NULL); -todo_wine + todo_wine ok(r == S_OK, "expected S_OK, got %08x\n", r); if (0) /* crashes on xp */ @@ -800,7 +800,7 @@ todo_wine } r = FolderItems3_get_Verbs(items3, &verbs); -todo_wine + todo_wine ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(!verbs, "verbs is not null\n"); } @@ -1137,7 +1137,7 @@ static void test_ShellWindows(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IWebBrowser2_Refresh(wb); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IWebBrowser2_get_Application(wb, &app); @@ -1219,7 +1219,7 @@ if (hr == S_OK) { V_I4(&v) = cookie; VariantInit(&v2); hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_BROWSER, &ret, SWFO_COOKIEPASSED, &disp); -todo_wine + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(disp == NULL, "got %p\n", disp); ok(ret == 0, "got %d\n", ret); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index edd536c3a01..5caebcd776c 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1181,7 +1181,7 @@ static void test_ExtractIcon(void) /* specified instance handle */ hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1); ok(hicon2 != NULL, "Got icon %p\n", hicon2); @@ -1207,14 +1207,14 @@ todo_wine CloseHandle(file); hicon = ExtractIconA(NULL, path, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, path, -1); ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, path, 1); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); r = DeleteFileA(path); @@ -1255,14 +1255,14 @@ if (0) CloseHandle(file); hicon = ExtractIconW(NULL, pathW, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, pathW, -1); ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, pathW, 1); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); r = DeleteFileW(pathW); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 29fcd0b7754..f593f8b821d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -208,7 +208,7 @@ static void test_ParseDisplayName(void) for (i = 0; i < ARRAY_SIZE(parse_tests); i++) { hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, parse_tests[i].path, NULL, &pidl, NULL); -todo_wine_if(parse_tests[i].todo) + todo_wine_if(parse_tests[i].todo) ok(hr == parse_tests[i].hr, "%s: expected %#x, got %#x\n", wine_dbgstr_w(parse_tests[i].path), parse_tests[i].hr, hr); if (SUCCEEDED(hr)) @@ -4334,16 +4334,16 @@ static void test_contextmenu_qi(IContextMenu *menu, BOOL todo) HRESULT hr; hr = IContextMenu_QueryInterface(menu, &IID_IShellExtInit, (void **)&unk); -todo_wine_if(todo) + todo_wine_if(todo) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); -if (hr == S_OK) - IUnknown_Release(unk); + if (hr == S_OK) + IUnknown_Release(unk); hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&unk); -todo_wine_if(todo) + todo_wine_if(todo) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); -if (hr == S_OK) - IUnknown_Release(unk); + if (hr == S_OK) + IUnknown_Release(unk); } static void test_contextmenu(IContextMenu *menu, BOOL background) @@ -4418,7 +4418,7 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) /* Attempt to execute a nonexistent command */ cmi.lpVerb = MAKEINTRESOURCEA(9999); hr = IContextMenu_InvokeCommand(menu, &cmi); - todo_wine_if(background) + todo_wine_if(background) ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); cmi.lpVerb = "foobar_wine_test"; @@ -5290,18 +5290,18 @@ static void test_SHLimitInputEdit(void) ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr); hr = SHLimitInputEdit(NULL, desktop); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "Failed to create Edit control.\n"); hr = SHLimitInputEdit(hwnd, desktop); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); hr = SHLimitInputEdit(hwnd, desktop); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); DestroyWindow(hwnd); diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5d96c8d441..48ba72a4c0e 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1479,7 +1479,7 @@ static void test_newmenu(void) HRESULT hr; hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr); if (hr != S_OK) { -- 2.35.0

Jan. 28, 2022

[PATCH 09/22] setupapi/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/setupapi/tests/devinst.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 35823788605..91eaba84a3c 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -121,7 +121,7 @@ static void test_open_class_key(void) SetLastError(0xdeadbeef); class_key = SetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, DIOCR_INSTALLER, NULL, NULL); ok(class_key == INVALID_HANDLE_VALUE, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_CLASS, "Got unexpected error %#x.\n", GetLastError()); root_key = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS); @@ -1567,7 +1567,7 @@ static void test_registry_property_a(void) SetLastError(0xdeadbeef); ret = SetupDiSetDeviceRegistryPropertyA(set, &device, -1, NULL, 0); ok(!ret, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError()); ret = SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, 0); @@ -1592,7 +1592,7 @@ todo_wine SetLastError(0xdeadbeef); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, -1, NULL, NULL, 0, NULL); ok(!ret, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError()); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, NULL, sizeof("Bogus"), NULL); @@ -1727,7 +1727,7 @@ static void test_registry_property_w(void) SetLastError(0xdeadbeef); ret = SetupDiSetDeviceRegistryPropertyW(set, &device, -1, NULL, 0); ok(!ret, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError()); ret = SetupDiSetDeviceRegistryPropertyW(set, &device, SPDRP_FRIENDLYNAME, NULL, 0); @@ -1752,7 +1752,7 @@ todo_wine SetLastError(0xdeadbeef); ret = SetupDiGetDeviceRegistryPropertyW(set, &device, -1, NULL, NULL, 0, NULL); ok(!ret, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError()); ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_FRIENDLYNAME, NULL, NULL, sizeof(buf), NULL); -- 2.35.0

Jan. 28, 2022

[PATCH 08/22] secur32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/secur32/tests/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index abddfa138ab..028e1e933dc 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1074,9 +1074,9 @@ static void test_communication(void) status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); -todo_wine + todo_wine ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); -todo_wine + todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); buffers[1].cBuffers = 1; -- 2.35.0

Jan. 28, 2022

[PATCH 07/22] scrrun/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/scrrun/tests/dictionary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 4259bc71c8e..d20456a5096 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -769,8 +769,8 @@ static void test_Exists(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ - hr = IDictionary_Exists(dict, NULL, NULL); + if (0) /* crashes on native */ + hr = IDictionary_Exists(dict, NULL, NULL); V_VT(&key) = VT_I2; V_I2(&key) = 0; @@ -875,8 +875,8 @@ static void test_Remove(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) - hr = IDictionary_Remove(dict, NULL); + if (0) + hr = IDictionary_Remove(dict, NULL); /* nothing added yet */ V_VT(&key) = VT_R4; -- 2.35.0

Jan. 28, 2022