ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32/tests: Use todo_wine_if() in tests. 

Signed-off-by: Frédéric Delanoy <frederic.delanoy@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Frédéric Delanoy 2016-02-20 16:20:58 +01:00 committed by Alexandre Julliard
parent 9f23eae55f
commit fa56de2cd6
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/user32/tests/listbox.c
View File

@ -125,8 +125,7 @@ keypress (HWND handle, WPARAM keycode, BYTE scancode, BOOL extended)
t.s.f, got.f) t.s.f, got.f)
#define listbox_todo_field_ok(t, s, f, got) \ #define listbox_todo_field_ok(t, s, f, got) \
if (t.s##_todo.f) todo_wine { listbox_field_ok(t, s, f, got); } \ todo_wine_if (t.s##_todo.f) { listbox_field_ok(t, s, f, got); }
else listbox_field_ok(t, s, f, got)
#define listbox_ok(t, s, got) \ #define listbox_ok(t, s, got) \
listbox_todo_field_ok(t, s, selected, got); \ listbox_todo_field_ok(t, s, selected, got); \

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

@ -13985,12 +13985,7 @@ static void test_WaitForInputIdle( char *argv0 )
broken(ret == wait_idle_expect[i].broken), broken(ret == wait_idle_expect[i].broken),
"%u: WaitForInputIdle error %08x expected %08x\n", "%u: WaitForInputIdle error %08x expected %08x\n",
i, ret, wait_idle_expect[i].exp ); i, ret, wait_idle_expect[i].exp );
else if (wait_idle_expect[i].todo) else todo_wine_if (wait_idle_expect[i].todo)
todo_wine
ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken),
"%u: WaitForInputIdle error %08x expected %08x\n",
i, ret, wait_idle_expect[i].exp );
else
ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken),
"%u: WaitForInputIdle error %08x expected %08x\n", "%u: WaitForInputIdle error %08x expected %08x\n",
i, ret, wait_idle_expect[i].exp ); i, ret, wait_idle_expect[i].exp );

16
dlls/user32/tests/win.c
View File

@ -4179,9 +4179,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle
dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE;
ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle);
/* FIXME: Remove the condition below once Wine is fixed */ /* FIXME: Remove the condition below once Wine is fixed */
if (dwActualExStyle != dwExStyleOut) todo_wine_if (dwActualExStyle != dwExStyleOut)
todo_wine ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle);
else
ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle);
DestroyWindow(hwnd); DestroyWindow(hwnd);
@ -4309,9 +4307,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
else else
ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE;
/* FIXME: Remove the condition below once Wine is fixed */ /* FIXME: Remove the condition below once Wine is fixed */
if (ex_style != ex_style_out) todo_wine_if (ex_style != ex_style_out)
todo_wine ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style);
else
ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style);
DestroyWindow(hwnd); DestroyWindow(hwnd);
@ -5001,8 +4997,8 @@ static void zero_parentdc_test(struct parentdc_test *t)
t.w.r.f, got.w.r.f) t.w.r.f, got.w.r.f)
#define parentdc_todo_field_ok(t, w, r, f, got) \ #define parentdc_todo_field_ok(t, w, r, f, got) \
if (t.w##_todo.r.f) todo_wine { parentdc_field_ok(t, w, r, f, got); } \ todo_wine_if (t.w##_todo.r.f) \
else parentdc_field_ok(t, w, r, f, got) parentdc_field_ok(t, w, r, f, got);
#define parentdc_rect_ok(t, w, r, got) \ #define parentdc_rect_ok(t, w, r, got) \
parentdc_todo_field_ok(t, w, r, left, got); \ parentdc_todo_field_ok(t, w, r, left, got); \
@ -6423,9 +6419,7 @@ static void run_NCRedrawLoop(UINT flags)
DispatchMessageA(&msg); DispatchMessageA(&msg);
MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT); MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT);
} }
if (flags == (RDW_INVALIDATE | RDW_FRAME)) todo_wine_if (flags == (RDW_INVALIDATE | RDW_FRAME))
todo_wine ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags);
else
ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags);
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }