system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 08:49:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

ddraw/tests: Fix a typo.

Browse source
This commit is contained in:
Stefan Dösinger 2013-06-05 10:55:43 +02:00 committed by Alexandre Julliard
parent 410151ca6a
commit 831424ef83
4 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dlls/ddraw/tests/ddraw1.c
View file

@ -1939,7 +1939,7 @@ static void test_redundant_mode_set(void)
hr = IDirectDraw_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
U1(surface_desc.ddpfPixelFormat).dwRGBBitCount);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
GetWindowRect(window, &r);
r.right /= 2;
@ -1952,7 +1952,7 @@ static void test_redundant_mode_set(void)
hr = IDirectDraw_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
U1(surface_desc.ddpfPixelFormat).dwRGBBitCount);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
GetWindowRect(window, &s);
ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
@ -2052,7 +2052,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2178,7 +2178,7 @@ static void test_coop_level_mode_set(void)
hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 32);
ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */,
"SetDipslayMode failed, hr %#x.\n", hr);
"SetDisplayMode failed, hr %#x.\n", hr);
if (hr == DDERR_NOEXCLUSIVEMODE)
{
win_skip("Broken SetDisplayMode(), skipping remaining tests.\n");
@ -2309,7 +2309,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2455,7 +2455,7 @@ static void test_coop_level_mode_set_multi(void)
* release. */
hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32);
ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */,
"SetDipslayMode failed, hr %#x.\n", hr);
"SetDisplayMode failed, hr %#x.\n", hr);
if (hr == DDERR_NOEXCLUSIVEMODE)
{
win_skip("Broken SetDisplayMode(), skipping test.\n");
@ -2479,7 +2479,7 @@ static void test_coop_level_mode_set_multi(void)
* the initial mode, before the first SetDisplayMode() call. */
ddraw1 = create_ddraw();
hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2487,7 +2487,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw_SetDisplayMode(ddraw2, 640, 480, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2510,7 +2510,7 @@ static void test_coop_level_mode_set_multi(void)
/* Regardless of release ordering. */
ddraw1 = create_ddraw();
hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2518,7 +2518,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw_SetDisplayMode(ddraw2, 640, 480, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2542,7 +2542,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw1 = create_ddraw();
ddraw2 = create_ddraw();
hr = IDirectDraw_SetDisplayMode(ddraw2, 640, 480, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2566,7 +2566,7 @@ static void test_coop_level_mode_set_multi(void)
* restoring the display mode. */
ddraw1 = create_ddraw();
hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2574,7 +2574,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw_SetDisplayMode(ddraw2, 640, 480, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2600,7 +2600,7 @@ static void test_coop_level_mode_set_multi(void)
/* Exclusive mode blocks mode setting on other ddraw objects in general. */
ddraw1 = create_ddraw();
hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);

28
dlls/ddraw/tests/ddraw2.c
View file

@ -2146,7 +2146,7 @@ static void test_redundant_mode_set(void)
hr = IDirectDraw2_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
GetWindowRect(window, &r);
r.right /= 2;
@ -2159,7 +2159,7 @@ static void test_redundant_mode_set(void)
hr = IDirectDraw2_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
GetWindowRect(window, &s);
ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
@ -2274,7 +2274,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2400,7 +2400,7 @@ static void test_coop_level_mode_set(void)
hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */,
"SetDipslayMode failed, hr %#x.\n", hr);
"SetDisplayMode failed, hr %#x.\n", hr);
if (hr == DDERR_NOEXCLUSIVEMODE)
{
win_skip("Broken SetDisplayMode(), skipping remaining tests.\n");
@ -2531,7 +2531,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2766,7 +2766,7 @@ static void test_coop_level_mode_set_multi(void)
* release. */
hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */,
"SetDipslayMode failed, hr %#x.\n", hr);
"SetDisplayMode failed, hr %#x.\n", hr);
if (hr == DDERR_NOEXCLUSIVEMODE)
{
win_skip("Broken SetDisplayMode(), skipping test.\n");
@ -2790,7 +2790,7 @@ static void test_coop_level_mode_set_multi(void)
* the initial mode, before the first SetDisplayMode() call. */
ddraw1 = create_ddraw();
hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2798,7 +2798,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw2_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2821,7 +2821,7 @@ static void test_coop_level_mode_set_multi(void)
/* Regardless of release ordering. */
ddraw1 = create_ddraw();
hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2829,7 +2829,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw2_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2853,7 +2853,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw1 = create_ddraw();
ddraw2 = create_ddraw();
hr = IDirectDraw2_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2877,7 +2877,7 @@ static void test_coop_level_mode_set_multi(void)
* restoring the display mode. */
ddraw1 = create_ddraw();
hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2885,7 +2885,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw2_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2911,7 +2911,7 @@ static void test_coop_level_mode_set_multi(void)
/* Exclusive mode blocks mode setting on other ddraw objects in general. */
ddraw1 = create_ddraw();
hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);

28
dlls/ddraw/tests/ddraw4.c
View file

@ -2261,7 +2261,7 @@ static void test_redundant_mode_set(void)
hr = IDirectDraw4_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
GetWindowRect(window, &r);
r.right /= 2;
@ -2274,7 +2274,7 @@ static void test_redundant_mode_set(void)
hr = IDirectDraw4_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
GetWindowRect(window, &s);
ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
@ -2390,7 +2390,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw4_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2515,7 +2515,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw4_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2639,7 +2639,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw4_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2872,7 +2872,7 @@ static void test_coop_level_mode_set_multi(void)
/* With just a single ddraw object, the display mode is restored on
* release. */
hr = IDirectDraw4_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2889,7 +2889,7 @@ static void test_coop_level_mode_set_multi(void)
* the initial mode, before the first SetDisplayMode() call. */
ddraw1 = create_ddraw();
hr = IDirectDraw4_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2897,7 +2897,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw4_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2920,7 +2920,7 @@ static void test_coop_level_mode_set_multi(void)
/* Regardless of release ordering. */
ddraw1 = create_ddraw();
hr = IDirectDraw4_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2928,7 +2928,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw4_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2952,7 +2952,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw1 = create_ddraw();
ddraw2 = create_ddraw();
hr = IDirectDraw4_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2976,7 +2976,7 @@ static void test_coop_level_mode_set_multi(void)
* restoring the display mode. */
ddraw1 = create_ddraw();
hr = IDirectDraw4_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2984,7 +2984,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw4_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -3010,7 +3010,7 @@ static void test_coop_level_mode_set_multi(void)
/* Exclusive mode blocks mode setting on other ddraw objects in general. */
ddraw1 = create_ddraw();
hr = IDirectDraw4_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);

28
dlls/ddraw/tests/ddraw7.c
View file

@ -1993,7 +1993,7 @@ static void test_redundant_mode_set(void)
hr = IDirectDraw7_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
GetWindowRect(window, &r);
r.right /= 2;
@ -2006,7 +2006,7 @@ static void test_redundant_mode_set(void)
hr = IDirectDraw7_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
GetWindowRect(window, &s);
ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
@ -2122,7 +2122,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2247,7 +2247,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2371,7 +2371,7 @@ static void test_coop_level_mode_set(void)
screen_size.cy = 0;
hr = IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL;
@ -2604,7 +2604,7 @@ static void test_coop_level_mode_set_multi(void)
/* With just a single ddraw object, the display mode is restored on
* release. */
hr = IDirectDraw7_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2621,7 +2621,7 @@ static void test_coop_level_mode_set_multi(void)
* the initial mode, before the first SetDisplayMode() call. */
ddraw1 = create_ddraw();
hr = IDirectDraw7_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2629,7 +2629,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw7_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2652,7 +2652,7 @@ static void test_coop_level_mode_set_multi(void)
/* Regardless of release ordering. */
ddraw1 = create_ddraw();
hr = IDirectDraw7_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2660,7 +2660,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw7_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2684,7 +2684,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw1 = create_ddraw();
ddraw2 = create_ddraw();
hr = IDirectDraw7_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2708,7 +2708,7 @@ static void test_coop_level_mode_set_multi(void)
* restoring the display mode. */
ddraw1 = create_ddraw();
hr = IDirectDraw7_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2716,7 +2716,7 @@ static void test_coop_level_mode_set_multi(void)
ddraw2 = create_ddraw();
hr = IDirectDraw7_SetDisplayMode(ddraw2, 640, 480, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 640, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);
@ -2742,7 +2742,7 @@ static void test_coop_level_mode_set_multi(void)
/* Exclusive mode blocks mode setting on other ddraw objects in general. */
ddraw1 = create_ddraw();
hr = IDirectDraw7_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0);
ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr);
w = GetSystemMetrics(SM_CXSCREEN);
ok(w == 800, "Got unexpected screen width %u.\n", w);
h = GetSystemMetrics(SM_CYSCREEN);