From: Hadrien Boizard Subject: Use todo_wine_if() in tests. Message-Id: <346fec9f-b6a7-dd98-ea18-ac3449ff1088@laposte.net> Date: Fri, 22 Apr 2016 01:11:54 +0200 --- dlls/gdiplus/tests/graphics.c | 5 ++--- dlls/mmdevapi/tests/capture.c | 7 +++---- dlls/mshtml/tests/htmldoc.c | 4 +--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 3ee3363..c7d2fa8 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3740,10 +3740,9 @@ todo_wine expected_width = base_cx * pt.Y; expected_height = base_cy * pt.Y; - if (td[i].unit == UnitDisplay || td[i].unit == UnitPixel) + todo_wine_if (!(td[i].unit == UnitDisplay || td[i].unit == UnitPixel)) ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); - else - todo_wine ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); + ok(fabs(expected_height - bounds.Height) <= 0.001, "%u: expected %f, got %f\n", i, expected_height, bounds.Height); GdipDeleteGraphics(graphics); diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 865859b..7160450 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -244,10 +244,9 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - if(qpc2 != qpc) - /* FIXME: Some drivers fail */ - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); - else + + /* FIXME: Some drivers fail */ + todo_wine_if(qpc2 != qpc) ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 904322e..5079dc9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5830,9 +5830,7 @@ static void test_download(DWORD flags) if(!(flags & DWL_FROM_HISTORY)) todo_wine CHECK_CALLED(OnChanged_1012); todo_wine CHECK_CALLED(Exec_HTTPEQUIV); - if(!(flags & DWL_REFRESH)) - todo_wine CHECK_CALLED(Exec_SETTITLE); - else + todo_wine_if(!(flags & DWL_REFRESH)) CHECK_CALLED(Exec_SETTITLE); } if(!is_js) {