Skip to content

W
wine-cw
Commit c0278744 authored by Fabian Maurer's avatar Fabian Maurer Committed by Alexandre Julliard
Browse files
Options

user32/tests: Avoid "misleading indentation" warnings.

Signed-off-by: 's avatarFabian Maurer <dark.shadow4@web.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 9c3d06e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
dlls/user32/tests/combo.c
View file @ c0278744
......@@ -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);
......
dlls/user32/tests/dde.c
View file @ c0278744
......@@ -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);
......
dlls/user32/tests/dialog.c
View file @ c0278744
......@@ -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));
......
dlls/user32/tests/listbox.c
View file @ c0278744
......@@ -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);
......
dlls/user32/tests/msg.c
View file @ c0278744
......@@ -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");
......
dlls/user32/tests/winstation.c
View file @ c0278744
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment