[PATCH 12/22] taskschd/tests: Avoid "misleading indentation" warnings.
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
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
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106401 Your paranoid android. === w10pro64 (32 bit report) === user32: win.c:2392: Test failed: style 0x200000: expected !100 win.c:2392: Test failed: style 0x300000: expected !100 === w10pro64 (64 bit report) === user32: win.c:2392: Test failed: style 0x200000: expected !100 win.c:2392: Test failed: style 0x300000: expected !100 === w10pro64_zh_CN (64 bit report) === user32: win.c:10385: Test failed: pos = 00fa00fa win.c:10389: Test failed: pos = 00fa00fa win.c:10393: Test failed: pos = 00fa00fa
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
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
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
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
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wiaservc/tests/wia.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index 6183cefc61d..48050f4ecc9 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -49,7 +49,7 @@ static void test_EnumDeviceInfo(void) count = 1000; hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count != 1000, "got %u\n", count); @@ -61,11 +61,11 @@ static void test_SelectDeviceDlg(void) HRESULT hr; IWiaItem *root; hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, NULL); -todo_wine + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, &root); -todo_wine + todo_wine ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08x\n", hr); } -- 2.35.0
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/windowscodecs/tests/bitmap.c | 4 ++-- dlls/windowscodecs/tests/converter.c | 2 +- dlls/windowscodecs/tests/icoformat.c | 2 +- dlls/windowscodecs/tests/info.c | 22 +++++++++++----------- dlls/windowscodecs/tests/pngformat.c | 4 ++-- dlls/windowscodecs/tests/stream.c | 2 +- dlls/windowscodecs/tests/tiffformat.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index dd31bf88f3f..2dfe3f93f6b 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -867,7 +867,7 @@ static void test_CreateBitmapFromHBITMAP(void) ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); IWICBitmap_GetPixelFormat(bitmap, &format); -todo_wine + todo_wine ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed), "unexpected pixel format %s\n", wine_dbgstr_guid(&format)); @@ -887,7 +887,7 @@ todo_wine hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); -todo_wine + todo_wine ok(count == 16, "expected 16, got %u\n", count); IWICPalette_Release(palette); diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 0429b7a3af6..f0672fceaf8 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1223,7 +1223,7 @@ static void test_set_frame_palette(IWICBitmapFrameEncode *frameencode) ok(hr == S_OK, "CreatePalette failed, hr=%x\n", hr); hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); -todo_wine + todo_wine ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedHalftone256, FALSE); diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index 38db51c3764..36cc970bf3c 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -164,7 +164,7 @@ static void test_ico_data_(void *data, DWORD data_size, HRESULT init_hr, int tod { hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, WICDecodeMetadataCacheOnDemand); - todo_wine_if(todo) + todo_wine_if(todo) ok_(__FILE__, line)(hr == init_hr, "Initialize failed, hr=%x\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index bb8d3310bc9..339555f23fe 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -177,7 +177,7 @@ static void test_decoder_info(void) len = 0; hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len); ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL); @@ -186,7 +186,7 @@ static void test_decoder_info(void) len = 0; hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); value[0] = 0; @@ -198,7 +198,7 @@ static void test_decoder_info(void) } hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len); ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); @@ -250,7 +250,7 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, NULL, &len); ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "%u: GetFileExtensions returned wrong len %i\n", i, len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, NULL); @@ -258,27 +258,27 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); value[0] = 0; hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, value, &len); ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 256, value, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); IWICBitmapDecoderInfo_Release(decoder_info); @@ -559,7 +559,7 @@ static void test_reader_info(void) IWICComponentInfo_Release(info); hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICXMPStructMetadataReader, &info); -todo_wine + todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); if (FAILED(hr)) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 32afc989c2b..50cb7a68a87 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -824,7 +824,7 @@ todo_wine_if(td[i].todo_load) hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); -todo_wine_if(td[i].todo) + todo_wine_if(td[i].todo) ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS), "PLTE+tRNS: expected %s, got %s (type %d, bpp %d)\n", wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth); @@ -907,7 +907,7 @@ todo_wine_if(td[i].todo_load) hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); -todo_wine_if(td[i].todo) + todo_wine_if(td[i].todo) ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS), "tRNS: expected %s, got %s (type %d, bpp %d)\n", wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth); diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index d3f712c38b0..247606ebf58 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -32,7 +32,7 @@ static void _check_cur_pos(IStream *stream, ULONGLONG expected_pos, BOOL todo, u offset.QuadPart = 0; hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, &pos); ok_(__FILE__, line)(hr == S_OK, "Failed to get current position, hr %#x.\n", hr); -todo_wine_if(todo) + todo_wine_if(todo) ok_(__FILE__, line)(pos.QuadPart == expected_pos, "Unexpected stream position %s.\n", wine_dbgstr_longlong(pos.QuadPart)); } diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index e0d70929585..4c3dea2288f 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -551,7 +551,7 @@ static void test_QueryCapability(void) /* CreateDecoderFromStream fails if seeked past the start */ hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine + todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); if (SUCCEEDED(hr)) -- 2.35.0
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/winhttp/tests/winhttp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 7e46a43aa05..053f8315fec 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4816,7 +4816,7 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&arg[2]); params.cArgs = 3; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, &err); -todo_wine + todo_wine ok(hr == S_OK, "error %#x\n", hr); VariantInit(&arg[0]); @@ -4861,7 +4861,7 @@ todo_wine params.cArgs = 2; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, ¶ms, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "error %#x\n", hr); params.cArgs = 0; -- 2.35.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106407 Your paranoid android. === w8adm (32 bit report) === winhttp: winhttp.c:301: Test failed: WinHttpSendRequest failed: 12007 winhttp.c:302: Test failed: got 12007
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wininet/tests/internet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 4c2facb635a..8fc72be8431 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1632,7 +1632,7 @@ static void test_InternetGetConnectedStateExA(void) buffer[0] = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); -todo_wine + todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExA tests require a valid connection\n"); @@ -1734,7 +1734,7 @@ static void test_InternetGetConnectedStateExW(void) buffer[0] = 0; res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); -todo_wine + todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExW tests require a valid connection\n"); -- 2.35.0
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ws2_32/tests/protocol.c | 48 ++++++++++++++++++------------------ dlls/ws2_32/tests/sock.c | 26 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 881e3a388fd..5597e3df854 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -393,13 +393,13 @@ static void test_WSALookupService(void) ret = WSALookupServiceBeginW(NULL, 0, &handle); error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine + todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, NULL); error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine + todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, &handle); @@ -410,9 +410,9 @@ todo_wine ret = WSALookupServiceEnd(NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "WSALookupServiceEnd should have failed\n"); -todo_wine + todo_wine ok(error == ERROR_INVALID_HANDLE, "expected 6, got %d\n", error); /* standard network list query */ @@ -426,9 +426,9 @@ todo_wine return; } -todo_wine + todo_wine ok(!ret, "WSALookupServiceBeginW failed unexpectedly with error %d\n", error); -todo_wine + todo_wine ok(handle != (HANDLE)0xdeadbeef, "Handle was not filled\n"); offset = 0; @@ -2610,40 +2610,40 @@ static void test_WSAEnumNameSpaceProvidersA(void) SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(&len, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); /* Invalid parameter tests */ SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(NULL, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(NULL, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(&len, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, len); ret = WSAEnumNameSpaceProvidersA(&len, name); -todo_wine + todo_wine ok(ret > 0, "Expected more than zero name space providers\n"); HeapFree(GetProcessHeap(), 0, name); @@ -2657,40 +2657,40 @@ static void test_WSAEnumNameSpaceProvidersW(void) SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(&len, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); /* Invalid parameter tests */ SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(NULL, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(NULL, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(&len, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, len); ret = WSAEnumNameSpaceProvidersW(&len, name); -todo_wine + todo_wine ok(ret > 0, "Expected more than zero name space providers\n"); if (winetest_debug > 1) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 054e597b719..b38357954b7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1289,7 +1289,7 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); i = 1234; err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); -todo_wine + todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1300,7 +1300,7 @@ todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); -todo_wine + todo_wine ok (i == 1234, "got %d (expected 1234)\n", i); /* Test invalid optlen */ @@ -6054,7 +6054,7 @@ todo_wine { ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); err = WSAGetLastError(); -todo_wine + todo_wine ok(err == WSAEINVAL, "expected 10014, got %d instead\n", err); closesocket(sock); } @@ -7184,7 +7184,7 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); -todo_wine + todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); @@ -8768,7 +8768,7 @@ static void test_sioAddressListChange(void) ok(ret == WAIT_OBJECT_0, "failed to get overlapped event %u\n", ret); ret = WaitForSingleObject(event2, 500); -todo_wine + todo_wine ok(ret == WAIT_OBJECT_0, "failed to get change event %u\n", ret); ret = WaitForSingleObject(event3, 500); @@ -10329,7 +10329,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetQueuedCompletionStatus(port, &bytes, &key, &ovl_iocp, 100); ok(!ret, "got %d\n", ret); -todo_wine + todo_wine ok(GetLastError() == ERROR_CONNECTION_ABORTED || GetLastError() == ERROR_NETNAME_DELETED /* XP */, "got %u\n", GetLastError()); ok(!bytes, "got bytes %u\n", bytes); ok(key == 0x12345678, "got key %#lx\n", key); @@ -10337,7 +10337,7 @@ todo_wine if (ovl_iocp) { ok(!ovl_iocp->InternalHigh, "got %#lx\n", ovl_iocp->InternalHigh); -todo_wine + todo_wine ok(ovl_iocp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || ovl_iocp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); } @@ -10568,7 +10568,7 @@ static void iocp_async_read_thread_closesocket(SOCKET src) SetLastError(0xdeadbeef); ret = GetQueuedCompletionStatus(port, &bytes, &key, &ovl_iocp, 100); ok(!ret, "got %d\n", ret); -todo_wine + todo_wine ok(GetLastError() == ERROR_CONNECTION_ABORTED || GetLastError() == ERROR_NETNAME_DELETED /* XP */, "got %u\n", GetLastError()); ok(!bytes, "got bytes %u\n", bytes); ok(key == 0x12345678, "got key %#lx\n", key); @@ -10576,7 +10576,7 @@ todo_wine if (ovl_iocp) { ok(!ovl_iocp->InternalHigh, "got %#lx\n", ovl_iocp->InternalHigh); -todo_wine + todo_wine ok(ovl_iocp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || ovl_iocp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); } @@ -11724,10 +11724,10 @@ static void do_sockopt_validity_tests(const char *type, SOCKET sock, int level, WSASetLastError(0); rc = getsockopt(sock, level, tests[i].opt, value, &count); expected_rc = tests[i].get_error ? SOCKET_ERROR : 0; -todo_wine_if(!tests[i].get_error && tests[i].todo) + todo_wine_if(!tests[i].get_error && tests[i].todo) ok(rc == expected_rc || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected getsockopt to return %i, got %i\n", expected_rc, rc); -todo_wine_if(tests[i].todo) + todo_wine_if(tests[i].todo) ok(WSAGetLastError() == tests[i].get_error || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected getsockopt to set error %i, got %i\n", tests[i].get_error, WSAGetLastError()); @@ -11740,10 +11740,10 @@ todo_wine_if(tests[i].todo) WSASetLastError(0); rc = setsockopt(sock, level, tests[i].opt, value, count); expected_rc = tests[i].set_error ? SOCKET_ERROR : 0; -todo_wine_if(!tests[i].set_error && tests[i].todo) + todo_wine_if(!tests[i].set_error && tests[i].todo) ok(rc == expected_rc || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected setsockopt to return %i, got %i\n", expected_rc, rc); -todo_wine_if(tests[i].todo) + todo_wine_if(tests[i].todo) ok(WSAGetLastError() == tests[i].set_error || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected setsockopt to set error %i, got %i\n", tests[i].set_error, WSAGetLastError()); -- 2.35.0
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/xmllite/tests/reader.c | 12 ++++++------ dlls/xmllite/tests/writer.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index cb3a3f4e571..c4e53a5c40c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -797,16 +797,16 @@ if (0) nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); -todo_wine + todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); -todo_wine + todo_wine TEST_READER_STATE(reader, XmlReadState_Error); nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); -todo_wine + todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); @@ -1006,11 +1006,11 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine + todo_wine ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); TEST_READER_POSITION(reader, 1, 41); -todo_wine + todo_wine TEST_READER_STATE(reader, XmlReadState_Error); IStream_Release(stream); @@ -1556,7 +1556,7 @@ static void test_read_pending(void) ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ -todo_wine + todo_wine ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type); diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 13d67becbe4..c69aa42598d 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -434,7 +434,7 @@ static void test_writeroutput(void) unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); ok(hr == S_OK, "got %08x\n", hr); -todo_wine + todo_wine ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output); EXPECT_REF(output, 2); /* releasing 'unk' crashes on native */ @@ -1694,7 +1694,7 @@ static void test_WriteAttributeString(void) hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, attribute_tests[i].uri, attribute_tests[i].value); - todo_wine_if(attribute_tests[i].todo_hr) + todo_wine_if(attribute_tests[i].todo_hr) ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, attribute_tests[i].hr); hr = IXmlWriter_Flush(writer); @@ -1734,7 +1734,7 @@ static void test_WriteAttributeString(void) ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); -todo_wine + todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); hr = write_start_element(writer, NULL, "b", NULL); -- 2.35.0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106400 Your paranoid android. === w7u_adm (32 bit report) === taskschd: scheduler.c:790: Test failed: DeleteTask error 0x80070005 scheduler.c:786: Test failed: 1: expected 0, got 0x800700b7 scheduler.c:786: Test failed: 2: expected 0x80070002, got 0 scheduler.c:790: Test failed: DeleteTask error 0x80070005 scheduler.c:790: Test failed: DeleteTask error 0x80070005 scheduler.c:806: Test failed: RegisterTask error 0x800700b7 scheduler.c:941: Test failed: DeleteTask error 0x80070005 scheduler.c:943: Test failed: DeleteTask error 0x80070005 scheduler.c:946: Test failed: expected ERROR_FILE_NOT_FOUND, got 0x80070005
participants (5)
-
Esme Povirk (she/they) -
Fabian Maurer -
Hans Leidekker -
Marvin -
Nikolay Sivov