[PATCH 3/5] ddraw/tests: Add test_redundant_mode_set() for older ddraw versions.
Henri Verbeet
hverbeet at codeweavers.com
Wed May 30 09:14:58 CDT 2012
---
dlls/ddraw/tests/ddraw1.c | 54 +++++++++++++++++++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw2.c | 54 +++++++++++++++++++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw4.c | 54 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 162 insertions(+), 0 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index e53a1cd..f27fb8a 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -1877,6 +1877,59 @@ static void test_window_style(void)
DestroyWindow(window);
}
+static void test_redundant_mode_set(void)
+{
+ DDSURFACEDESC surface_desc = {0};
+ IDirectDraw *ddraw;
+ HWND window;
+ HRESULT hr;
+ RECT r, s;
+ ULONG ref;
+
+ window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
+ 0, 0, 100, 100, 0, 0, 0, 0);
+ if (!(ddraw = create_ddraw()))
+ {
+ skip("Failed to create a ddraw object, skipping test.\n");
+ DestroyWindow(window);
+ return;
+ }
+
+ hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
+ ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr);
+
+ surface_desc.dwSize = sizeof(surface_desc);
+ hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc);
+ ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr);
+
+ hr = IDirectDraw_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
+ U1(surface_desc.ddpfPixelFormat).dwRGBBitCount);
+ ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
+
+ GetWindowRect(window, &r);
+ r.right /= 2;
+ r.bottom /= 2;
+ SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0);
+ GetWindowRect(window, &s);
+ ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
+ r.left, r.top, r.right, r.bottom,
+ s.left, s.top, s.right, s.bottom);
+
+ hr = IDirectDraw_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight,
+ U1(surface_desc.ddpfPixelFormat).dwRGBBitCount);
+ ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);
+
+ GetWindowRect(window, &s);
+ ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
+ r.left, r.top, r.right, r.bottom,
+ s.left, s.top, s.right, s.bottom);
+
+ ref = IDirectDraw_Release(ddraw);
+ ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref);
+
+ DestroyWindow(window);
+}
+
START_TEST(ddraw1)
{
test_coop_level_create_device_window();
@@ -1892,4 +1945,5 @@ START_TEST(ddraw1)
test_device_qi();
test_wndproc();
test_window_style();
+ test_redundant_mode_set();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 7f1ae88..1f690aa 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -2014,6 +2014,59 @@ static void test_window_style(void)
DestroyWindow(window);
}
+static void test_redundant_mode_set(void)
+{
+ DDSURFACEDESC surface_desc = {0};
+ IDirectDraw2 *ddraw;
+ HWND window;
+ HRESULT hr;
+ RECT r, s;
+ ULONG ref;
+
+ window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
+ 0, 0, 100, 100, 0, 0, 0, 0);
+ if (!(ddraw = create_ddraw()))
+ {
+ skip("Failed to create a ddraw object, skipping test.\n");
+ DestroyWindow(window);
+ return;
+ }
+
+ hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
+ ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr);
+
+ surface_desc.dwSize = sizeof(surface_desc);
+ hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc);
+ ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr);
+
+ 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);
+
+ GetWindowRect(window, &r);
+ r.right /= 2;
+ r.bottom /= 2;
+ SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0);
+ GetWindowRect(window, &s);
+ ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
+ r.left, r.top, r.right, r.bottom,
+ s.left, s.top, s.right, s.bottom);
+
+ 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);
+
+ GetWindowRect(window, &s);
+ ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
+ r.left, r.top, r.right, r.bottom,
+ s.left, s.top, s.right, s.bottom);
+
+ ref = IDirectDraw2_Release(ddraw);
+ ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref);
+
+ DestroyWindow(window);
+}
+
START_TEST(ddraw2)
{
test_coop_level_create_device_window();
@@ -2031,4 +2084,5 @@ START_TEST(ddraw2)
test_device_qi();
test_wndproc();
test_window_style();
+ test_redundant_mode_set();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 6f00b41..9d9a1bf 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -2138,6 +2138,59 @@ static void test_window_style(void)
DestroyWindow(window);
}
+static void test_redundant_mode_set(void)
+{
+ DDSURFACEDESC2 surface_desc = {0};
+ IDirectDraw4 *ddraw;
+ HWND window;
+ HRESULT hr;
+ RECT r, s;
+ ULONG ref;
+
+ window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
+ 0, 0, 100, 100, 0, 0, 0, 0);
+ if (!(ddraw = create_ddraw()))
+ {
+ skip("Failed to create a ddraw object, skipping test.\n");
+ DestroyWindow(window);
+ return;
+ }
+
+ hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
+ ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr);
+
+ surface_desc.dwSize = sizeof(surface_desc);
+ hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc);
+ ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr);
+
+ 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);
+
+ GetWindowRect(window, &r);
+ r.right /= 2;
+ r.bottom /= 2;
+ SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0);
+ GetWindowRect(window, &s);
+ ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
+ r.left, r.top, r.right, r.bottom,
+ s.left, s.top, s.right, s.bottom);
+
+ 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);
+
+ GetWindowRect(window, &s);
+ ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
+ r.left, r.top, r.right, r.bottom,
+ s.left, s.top, s.right, s.bottom);
+
+ ref = IDirectDraw4_Release(ddraw);
+ ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref);
+
+ DestroyWindow(window);
+}
+
START_TEST(ddraw4)
{
test_process_vertices();
@@ -2156,4 +2209,5 @@ START_TEST(ddraw4)
test_device_qi();
test_wndproc();
test_window_style();
+ test_redundant_mode_set();
}
--
1.7.3.4
More information about the wine-patches
mailing list