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

ddraw/tests: Simplify the 'NT4 testbot' special case a bit.

This commit is contained in:
Francois Gouget 2014-02-27 02:13:01 +01:00 committed by Alexandre Julliard
parent 28d3d7a026
commit af0bf54bd0
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/ddraw/tests/ddraw1.c
View File

@ -2316,15 +2316,14 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0; screen_size.cy = 0;
hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 32); hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 32);
ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */)
"SetDisplayMode failed, hr %#x.\n", hr);
if (hr == DDERR_NOEXCLUSIVEMODE)
{ {
win_skip("Broken SetDisplayMode(), skipping remaining tests.\n"); win_skip("Broken SetDisplayMode(), skipping remaining tests.\n");
IDirectDrawSurface_Release(primary); IDirectDrawSurface_Release(primary);
IDirectDraw_Release(ddraw); IDirectDraw_Release(ddraw);
goto done; goto done;
} }
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; expect_messages = NULL;
@ -2593,15 +2592,14 @@ static void test_coop_level_mode_set_multi(void)
/* With just a single ddraw object, the display mode is restored on /* With just a single ddraw object, the display mode is restored on
* release. */ * release. */
hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32); hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32);
ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */)
"SetDisplayMode failed, hr %#x.\n", hr);
if (hr == DDERR_NOEXCLUSIVEMODE)
{ {
win_skip("Broken SetDisplayMode(), skipping test.\n"); win_skip("Broken SetDisplayMode(), skipping test.\n");
IDirectDraw_Release(ddraw1); IDirectDraw_Release(ddraw1);
DestroyWindow(window); DestroyWindow(window);
return; return;
} }
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN); w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w); ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN); h = GetSystemMetrics(SM_CYSCREEN);

10
dlls/ddraw/tests/ddraw2.c
View File

@ -2527,15 +2527,14 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0; screen_size.cy = 0;
hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 32, 0, 0); hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */)
"SetDisplayMode failed, hr %#x.\n", hr);
if (hr == DDERR_NOEXCLUSIVEMODE)
{ {
win_skip("Broken SetDisplayMode(), skipping remaining tests.\n"); win_skip("Broken SetDisplayMode(), skipping remaining tests.\n");
IDirectDrawSurface_Release(primary); IDirectDrawSurface_Release(primary);
IDirectDraw2_Release(ddraw); IDirectDraw2_Release(ddraw);
goto done; goto done;
} }
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; expect_messages = NULL;
@ -2893,15 +2892,14 @@ static void test_coop_level_mode_set_multi(void)
/* With just a single ddraw object, the display mode is restored on /* With just a single ddraw object, the display mode is restored on
* release. */ * release. */
hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0); hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */)
"SetDisplayMode failed, hr %#x.\n", hr);
if (hr == DDERR_NOEXCLUSIVEMODE)
{ {
win_skip("Broken SetDisplayMode(), skipping test.\n"); win_skip("Broken SetDisplayMode(), skipping test.\n");
IDirectDraw2_Release(ddraw1); IDirectDraw2_Release(ddraw1);
DestroyWindow(window); DestroyWindow(window);
return; return;
} }
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN); w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w); ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN); h = GetSystemMetrics(SM_CYSCREEN);