[PATCH 5/5] ddraw/tests: Introduce a helper function to create windows.
Henri Verbeet
hverbeet at codeweavers.com
Sun Apr 23 10:57:29 CDT 2017
Mostly for consistency with other D3D tests.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/ddraw/tests/ddraw1.c | 151 ++++++++++++------------------
dlls/ddraw/tests/ddraw2.c | 173 +++++++++++++---------------------
dlls/ddraw/tests/ddraw4.c | 216 +++++++++++++++---------------------------
dlls/ddraw/tests/ddraw7.c | 232 ++++++++++++++++------------------------------
4 files changed, 273 insertions(+), 499 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 4f53ee1..4b7e13d 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -157,14 +157,23 @@ static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw,
return surface;
}
+static HWND create_window(void)
+{
+ RECT r = {0, 0, 640, 480};
+
+ AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE);
+
+ return CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+ CW_USEDEFAULT, CW_USEDEFAULT, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL);
+}
+
static DWORD WINAPI create_window_thread_proc(void *param)
{
struct create_window_thread_param *p = param;
DWORD res;
BOOL ret;
- p->window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ p->window = create_window();
ret = SetEvent(p->window_created);
ok(ret, "SetEvent failed, last error %#x.\n", GetLastError());
@@ -663,8 +672,7 @@ static void test_coop_level_create_device_window(void)
IDirectDraw *ddraw;
HRESULT hr;
- focus_window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ focus_window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -967,8 +975,7 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1040,8 +1047,7 @@ static void test_surface_interface_mismatch(void)
HWND window;
D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1157,8 +1163,7 @@ static void test_viewport(void)
IDirect3DDevice *device;
HWND window;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1284,8 +1289,7 @@ static void test_zenable(void)
UINT i, j;
void *ptr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1422,8 +1426,7 @@ static void test_ck_rgba(void)
HRESULT hr;
UINT i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1581,8 +1584,7 @@ static void test_ck_default(void)
HRESULT hr;
void *ptr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1738,8 +1740,7 @@ static void test_ck_complex(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN)))
@@ -1963,8 +1964,7 @@ static void test_surface_qi(void)
return;
}
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
/* Try to create a D3D device to see if the ddraw implementation supports
@@ -2050,8 +2050,7 @@ static void test_device_qi(void)
return;
}
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -3311,10 +3310,8 @@ static void test_coop_level_multi_window(void)
IDirectDraw *ddraw;
HRESULT hr;
- window1 = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
- window2 = CreateWindowA("static", "ddraw_test2", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window1 = create_window();
+ window2 = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -3342,8 +3339,7 @@ static void test_clear_rect_count(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -3575,8 +3571,7 @@ static void test_unsupported_formats(void)
};
static const DWORD caps[] = {0, DDSCAPS_SYSTEMMEMORY, DDSCAPS_VIDEOMEMORY};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -3812,8 +3807,7 @@ static void test_rt_caps(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -4011,8 +4005,7 @@ static void test_primary_caps(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -4097,8 +4090,7 @@ static void test_surface_lock(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -4178,8 +4170,7 @@ static void test_surface_discard(void)
};
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -4278,8 +4269,7 @@ static void test_flip(void)
{"TEXTURE", DDSCAPS_TEXTURE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -4513,8 +4503,7 @@ static void test_sysmem_overlay(void)
IDirectDrawSurface *surface;
ULONG ref;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -4554,8 +4543,7 @@ static void test_primary_palette(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (FAILED(IDirectDraw_SetDisplayMode(ddraw, 640, 480, 8)))
@@ -4719,8 +4707,7 @@ static void test_surface_attachment(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5172,8 +5159,7 @@ static void test_create_surface_pitch(void)
};
DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5271,8 +5257,7 @@ static void test_mipmap(void)
{0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5358,8 +5343,7 @@ static void test_palette_complex(void)
RGBQUAD rgbquad;
UINT count;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5483,8 +5467,7 @@ static void test_p8_blit(void)
};
D3DCOLOR color;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5642,8 +5625,7 @@ static void test_material(void)
};
static D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -5877,8 +5859,7 @@ static void test_lighting(void)
ULONG refcount;
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -6129,8 +6110,7 @@ static void test_palette_gdi(void)
RGBQUAD rgbquad[255];
static const RGBQUAD rgb_zero = {0, 0, 0, 0};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6433,8 +6413,7 @@ static void test_palette_alpha(void)
{DDSCAPS_PRIMARYSURFACE, 0, FALSE, "primary"}
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (FAILED(IDirectDraw_SetDisplayMode(ddraw, 640, 480, 8)))
@@ -6725,8 +6704,7 @@ static void test_surface_desc_lock(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6818,8 +6796,7 @@ static void test_texturemapblend(void)
{{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0x008000ff}, {0}, {1.0f}, {1.0f}},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -7209,8 +7186,7 @@ static void test_viewport_clear_rect(void)
ULONG ref;
D3DCOLOR color;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -7425,8 +7401,7 @@ static void test_color_fill(void)
{0xaa0029, "0xaa0029", DDERR_NORASTEROPHW} /* noop */
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
is_warp = ddraw_is_warp(ddraw);
@@ -7849,8 +7824,7 @@ static void test_colorkey_precision(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -8121,8 +8095,7 @@ static void test_range_colorkey(void)
ULONG refcount;
DDCOLORKEY ckey;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8274,8 +8247,7 @@ static void test_shademode(void)
{D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -8410,8 +8382,7 @@ static void test_lockrect_invalid(void)
{DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, "vidmem texture", DDERR_INVALIDPARAMS},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8522,8 +8493,7 @@ static void test_yv12_overlay(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8645,8 +8615,7 @@ static void test_offscreen_overlay(void)
HRESULT hr;
HDC dc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8725,8 +8694,7 @@ static void test_overlay_rect(void)
HWND window;
HDC dc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8846,8 +8814,7 @@ static void test_blt(void)
{{640, 0, 0, 480}, { 0, 0, 640, 480}, DDERR_INVALIDRECT}, /* Full surface, mirrored source. */
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -8959,8 +8926,7 @@ static void test_getdc(void)
{0x00000000}, {0x00000000}, {0x00000000}, {0x00000000}}, FALSE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -9340,8 +9306,7 @@ static void test_transform_vertices(void)
out[i].unused4 = 0xcafecafe;
}
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -10081,8 +10046,7 @@ static void test_texture_load(void)
HRESULT hr;
void *ptr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -10216,8 +10180,7 @@ static void test_ck_operation(void)
DDCOLORKEY ckey;
DDBLTFX fx;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index be950d8..15acd1f 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -159,14 +159,23 @@ static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw,
return surface;
}
+static HWND create_window(void)
+{
+ RECT r = {0, 0, 640, 480};
+
+ AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE);
+
+ return CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+ CW_USEDEFAULT, CW_USEDEFAULT, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL);
+}
+
static DWORD WINAPI create_window_thread_proc(void *param)
{
struct create_window_thread_param *p = param;
DWORD res;
BOOL ret;
- p->window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ p->window = create_window();
ret = SetEvent(p->window_created);
ok(ret, "SetEvent failed, last error %#x.\n", GetLastError());
@@ -558,8 +567,7 @@ static void test_coop_level_create_device_window(void)
IDirectDraw2 *ddraw;
HRESULT hr;
- focus_window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ focus_window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -863,8 +871,7 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -951,8 +958,7 @@ static void test_surface_interface_mismatch(void)
HWND window;
D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1086,8 +1092,7 @@ static void test_depth_blit(void)
D3DRECT d3drect;
IDirect3DMaterial2 *background;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1345,8 +1350,7 @@ static void test_viewport(void)
IDirect3DDevice2 *device;
HWND window;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1533,8 +1537,7 @@ static void test_zenable(void)
UINT x, y;
UINT i, j;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1636,8 +1639,7 @@ static void test_ck_rgba(void)
HRESULT hr;
UINT i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1768,8 +1770,7 @@ static void test_ck_default(void)
DDBLTFX fx;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -1873,8 +1874,7 @@ static void test_ck_complex(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN)))
@@ -2098,8 +2098,7 @@ static void test_surface_qi(void)
return;
}
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
/* Try to create a D3D device to see if the ddraw implementation supports
@@ -2184,8 +2183,7 @@ static void test_device_qi(void)
IDirectDraw2 *ddraw;
HWND window;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -3532,10 +3530,8 @@ static void test_coop_level_multi_window(void)
IDirectDraw2 *ddraw;
HRESULT hr;
- window1 = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
- window2 = CreateWindowA("static", "ddraw_test2", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window1 = create_window();
+ window2 = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -3563,8 +3559,7 @@ static void test_clear_rect_count(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -3652,9 +3647,7 @@ static void test_coop_level_versions(void)
IDirectDraw2 *ddraw2;
DDSURFACEDESC ddsd;
- window = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
ddraw2 = create_ddraw();
ok(!!ddraw2, "Failed to create a ddraw object.\n");
/* Newly created ddraw objects restore the mode on ddraw2+::SetCooperativeLevel(NORMAL) */
@@ -3828,8 +3821,7 @@ static void test_lighting_interface_versions(void)
{ D3DVT_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -4080,8 +4072,7 @@ static void test_unsupported_formats(void)
};
static const DWORD caps[] = {0, DDSCAPS_SYSTEMMEMORY, DDSCAPS_VIDEOMEMORY};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -4360,8 +4351,7 @@ static void test_rt_caps(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -4624,8 +4614,7 @@ static void test_primary_caps(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -4710,8 +4699,7 @@ static void test_surface_lock(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -4791,8 +4779,7 @@ static void test_surface_discard(void)
};
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -4891,8 +4878,7 @@ static void test_flip(void)
{"TEXTURE", DDSCAPS_TEXTURE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -5147,8 +5133,7 @@ static void test_set_surface_desc(void)
{DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY, FALSE, "systemmemory primary"},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5444,8 +5429,7 @@ static void test_user_memory_getdc(void)
HDC dc;
unsigned int x, y;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -5544,8 +5528,7 @@ static void test_sysmem_overlay(void)
IDirectDrawSurface *surface;
ULONG ref;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -5584,8 +5567,7 @@ static void test_primary_palette(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (FAILED(IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 8, 0, 0)))
@@ -5749,8 +5731,7 @@ static void test_surface_attachment(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6202,8 +6183,7 @@ static void test_create_surface_pitch(void)
};
DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6303,8 +6283,7 @@ static void test_mipmap(void)
{0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6395,8 +6374,7 @@ static void test_palette_complex(void)
RGBQUAD rgbquad;
UINT count;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6523,8 +6501,7 @@ static void test_p8_blit(void)
};
D3DCOLOR color;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6678,8 +6655,7 @@ static void test_material(void)
};
static D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -6896,8 +6872,7 @@ static void test_lighting(void)
ULONG refcount;
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -7191,8 +7166,7 @@ static void test_specular_lighting(void)
D3DVERTEX *quad;
WORD *indices;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -7355,8 +7329,7 @@ static void test_palette_gdi(void)
RGBQUAD rgbquad[255];
static const RGBQUAD rgb_zero = {0, 0, 0, 0};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7660,8 +7633,7 @@ static void test_palette_alpha(void)
{DDSCAPS_PRIMARYSURFACE, 0, FALSE, "primary"}
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (FAILED(IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 8, 0, 0)))
@@ -7959,8 +7931,7 @@ static void test_surface_desc_lock(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8048,8 +8019,7 @@ static void test_texturemapblend(void)
{{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0x008000ff}, {0}, {1.0f}, {1.0f}},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -8351,8 +8321,7 @@ static void test_viewport_clear_rect(void)
ULONG ref;
D3DCOLOR color;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -8567,8 +8536,7 @@ static void test_color_fill(void)
{0xaa0029, "0xaa0029", DDERR_NORASTEROPHW} /* noop */
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
is_warp = ddraw_is_warp(ddraw);
@@ -8987,8 +8955,7 @@ static void test_colorkey_precision(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -9236,8 +9203,7 @@ static void test_range_colorkey(void)
ULONG refcount;
DDCOLORKEY ckey;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -9389,8 +9355,7 @@ static void test_shademode(void)
{D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -9502,8 +9467,7 @@ static void test_lockrect_invalid(void)
{DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, "vidmem texture", DDERR_INVALIDPARAMS},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -9617,8 +9581,7 @@ static void test_yv12_overlay(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -9740,8 +9703,7 @@ static void test_offscreen_overlay(void)
HRESULT hr;
HDC dc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -9820,8 +9782,7 @@ static void test_overlay_rect(void)
HWND window;
HDC dc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -9941,8 +9902,7 @@ static void test_blt(void)
{{640, 0, 0, 480}, { 0, 0, 640, 480}, DDERR_INVALIDRECT}, /* Full surface, mirrored source. */
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -10054,8 +10014,7 @@ static void test_getdc(void)
{0x00000000}, {0x00000000}, {0x00000000}, {0x00000000}}, FALSE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -10350,8 +10309,7 @@ static void test_draw_primitive(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -10431,8 +10389,7 @@ static void test_edge_antialiasing_blending(void)
{{ 1.0f}, { 1.0f}, {0.1f}, 0, {0xccff0000}},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -10716,8 +10673,7 @@ static void test_transform_vertices(void)
out[i].unused4 = 0xcafecafe;
}
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
@@ -11541,8 +11497,7 @@ static void test_ck_operation(void)
DDCOLORKEY ckey;
DDBLTFX fx;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 2f92a70..c6076f7 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -157,14 +157,23 @@ static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw,
return surface;
}
+static HWND create_window(void)
+{
+ RECT r = {0, 0, 640, 480};
+
+ AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE);
+
+ return CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+ CW_USEDEFAULT, CW_USEDEFAULT, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL);
+}
+
static DWORD WINAPI create_window_thread_proc(void *param)
{
struct create_window_thread_param *p = param;
DWORD res;
BOOL ret;
- p->window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ p->window = create_window();
ret = SetEvent(p->window_created);
ok(ret, "SetEvent failed, last error %#x.\n", GetLastError());
@@ -554,8 +563,7 @@ static void test_process_vertices(void)
6.0f, 7.0f, 8.0f, 1.0f,
};
- window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -737,8 +745,7 @@ static void test_coop_level_create_device_window(void)
IDirectDraw4 *ddraw;
HRESULT hr;
- focus_window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ focus_window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -1041,8 +1048,7 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1117,8 +1123,7 @@ static void test_surface_interface_mismatch(void)
HWND window;
D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -1248,8 +1253,7 @@ static void test_depth_blit(void)
HWND window;
D3DRECT d3drect;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1500,8 +1504,7 @@ static void test_viewport(void)
HWND window;
IDirect3DDevice3 *device;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1683,8 +1686,7 @@ static void test_zenable(void)
UINT x, y;
UINT i, j;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1783,8 +1785,7 @@ static void test_ck_rgba(void)
HRESULT hr;
UINT i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1916,9 +1917,7 @@ static void test_ck_default(void)
DDBLTFX fx;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -2019,8 +2018,7 @@ static void test_ck_complex(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -2246,8 +2244,7 @@ static void test_surface_qi(void)
return;
}
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
/* Try to create a D3D device to see if the ddraw implementation supports
* D3D. 64-bit ddraw in particular doesn't seem to support D3D, and
* doesn't support e.g. the IDirect3DTexture interfaces. */
@@ -2332,8 +2329,7 @@ static void test_device_qi(void)
IDirect3DDevice3 *device;
HWND window;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -3675,9 +3671,7 @@ static void test_vb_discard(void)
static const unsigned int vbsize = 16;
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -3740,10 +3734,8 @@ static void test_coop_level_multi_window(void)
IDirectDraw4 *ddraw;
HRESULT hr;
- window1 = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
- window2 = CreateWindowA("static", "ddraw_test2", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window1 = create_window();
+ window2 = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -3786,9 +3778,7 @@ static void test_draw_strided(void)
IDirect3DViewport3 *viewport;
static D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -3951,8 +3941,7 @@ static void test_lighting(void)
ULONG refcount;
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -4251,8 +4240,7 @@ static void test_specular_lighting(void)
} *quad;
WORD *indices;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -4380,8 +4368,7 @@ static void test_clear_rect_count(void)
IDirect3DViewport3 *viewport;
static D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -4451,9 +4438,7 @@ static void test_coop_level_versions(void)
IDirectDraw4 *ddraw4;
DDSURFACEDESC ddsd;
- window = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
ddraw4 = create_ddraw();
ok(!!ddraw4, "Failed to create a ddraw object.\n");
/* Newly created ddraw objects restore the mode on ddraw2+::SetCooperativeLevel(NORMAL) */
@@ -4689,9 +4674,7 @@ static void test_lighting_interface_versions(void)
{ D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -5125,9 +5108,7 @@ static void test_block_formats_creation(void)
{DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, SIZE_TYPE_SIZE, 0, DD_OK},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -5351,9 +5332,7 @@ static void test_unsupported_formats(void)
};
static const DWORD caps[] = {0, DDSCAPS_SYSTEMMEMORY, DDSCAPS_VIDEOMEMORY};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -5612,8 +5591,7 @@ static void test_rt_caps(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5856,8 +5834,7 @@ static void test_primary_caps(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -5975,8 +5952,7 @@ static void test_surface_lock(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6071,9 +6047,7 @@ static void test_surface_discard(void)
};
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -6170,8 +6144,7 @@ static void test_flip(void)
{"TEXTURE", DDSCAPS_TEXTURE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -6427,8 +6400,7 @@ static void test_set_surface_desc(void)
{DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY, 0, FALSE, "systemmemory primary"},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6720,8 +6692,7 @@ static void test_user_memory_getdc(void)
HDC dc;
unsigned int x, y;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -6816,8 +6787,7 @@ static void test_sysmem_overlay(void)
IDirectDrawSurface4 *surface;
ULONG ref;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -6856,8 +6826,7 @@ static void test_primary_palette(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (FAILED(IDirectDraw4_SetDisplayMode(ddraw, 640, 480, 8, 0, 0)))
@@ -7022,8 +6991,7 @@ static void test_surface_attachment(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7296,8 +7264,7 @@ static void test_private_data(void)
{0x9b,0x4b,0x89,0xd7,0xd1,0x12,0xe7,0x2b}
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7697,8 +7664,7 @@ static void test_create_surface_pitch(void)
};
DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7797,8 +7763,7 @@ static void test_mipmap(void)
{0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7884,8 +7849,7 @@ static void test_palette_complex(void)
RGBQUAD rgbquad;
UINT count;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8009,8 +7973,7 @@ static void test_p8_blit(void)
};
D3DCOLOR color;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8179,8 +8142,7 @@ static void test_material(void)
};
static D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -8319,8 +8281,7 @@ static void test_palette_gdi(void)
RGBQUAD rgbquad[255];
static const RGBQUAD rgb_zero = {0, 0, 0, 0};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8623,8 +8584,7 @@ static void test_palette_alpha(void)
{DDSCAPS_PRIMARYSURFACE, 0, FALSE, "primary"}
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (FAILED(IDirectDraw4_SetDisplayMode(ddraw, 640, 480, 8, 0, 0)))
@@ -8768,9 +8728,7 @@ static void test_vb_writeonly(void)
{640.0f, 0.0f, 0.0f, 1.0f},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -9012,8 +8970,7 @@ static void test_surface_desc_lock(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -9153,9 +9110,7 @@ static void test_signed_formats(void)
unsigned int i, width, x, y;
D3DDEVICEDESC device_desc, hel_desc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -9466,9 +9421,7 @@ static void test_color_fill(void)
{0xaa0029, "0xaa0029", DDERR_NORASTEROPHW} /* noop */
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -9857,8 +9810,7 @@ static void test_texcoordindex(void)
D3DCOLOR color;
DWORD *ptr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -10085,8 +10037,7 @@ static void test_colorkey_precision(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -10340,8 +10291,7 @@ static void test_range_colorkey(void)
ULONG refcount;
DDCOLORKEY ckey;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -10499,9 +10449,7 @@ static void test_shademode(void)
{D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -10633,8 +10581,7 @@ static void test_lockrect_invalid(void)
{DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, "managed texture", DDERR_INVALIDPARAMS},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -10747,8 +10694,7 @@ static void test_yv12_overlay(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -10870,8 +10816,7 @@ static void test_offscreen_overlay(void)
HRESULT hr;
HDC dc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -10950,8 +10895,7 @@ static void test_overlay_rect(void)
HWND window;
HDC dc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -11072,8 +11016,7 @@ static void test_blt(void)
{{640, 0, 0, 480}, { 0, 0, 640, 480}, DDERR_INVALIDRECT}, /* Full surface, mirrored source. */
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -11148,9 +11091,7 @@ static void test_color_clamping(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -11285,8 +11226,7 @@ static void test_getdc(void)
{0x00000000}, {0x00000000}, {0x00000000}, {0x00000000}}, FALSE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -11586,9 +11526,7 @@ static void test_draw_primitive(void)
HRESULT hr;
void *data;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -11719,8 +11657,7 @@ static void test_edge_antialiasing_blending(void)
{{ 1.0f, 1.0f, 0.1f}, 0xccff0000},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device.\n");
@@ -12012,8 +11949,7 @@ static void test_transform_vertices(void)
out[i].unused4 = 0xcafecafe;
}
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device.\n");
@@ -12820,8 +12756,7 @@ static void test_get_surface_from_dc(void)
HRESULT hr;
DWORD ret;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -12933,8 +12868,7 @@ static void test_ck_operation(void)
DDCOLORKEY ckey;
DDBLTFX fx;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -13400,8 +13334,7 @@ static void test_vb_refcount(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "d3d3_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -13515,8 +13448,7 @@ static void test_compute_sphere_visibility(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "d3d_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 6a35cb8..ac78193 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -167,14 +167,23 @@ static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw,
return surface;
}
+static HWND create_window(void)
+{
+ RECT r = {0, 0, 640, 480};
+
+ AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE);
+
+ return CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+ CW_USEDEFAULT, CW_USEDEFAULT, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL);
+}
+
static DWORD WINAPI create_window_thread_proc(void *param)
{
struct create_window_thread_param *p = param;
DWORD res;
BOOL ret;
- p->window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ p->window = create_window();
ret = SetEvent(p->window_created);
ok(ret, "SetEvent failed, last error %#x.\n", GetLastError());
@@ -473,8 +482,7 @@ static void test_process_vertices(void)
1.0f, 0.0f, 0.0f, 1.0f,
};
- window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -640,8 +648,7 @@ static void test_coop_level_create_device_window(void)
IDirectDraw7 *ddraw;
HRESULT hr;
- focus_window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ focus_window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -942,8 +949,7 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1013,8 +1019,7 @@ static void test_surface_interface_mismatch(void)
D3DCOLOR color;
HWND window;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -1138,8 +1143,7 @@ static void test_depth_blit(void)
DDBLTFX fx;
HWND window;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1285,8 +1289,7 @@ static void test_texture_load_ckey(void)
DDCOLORKEY ckey;
IDirect3D7 *d3d;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1383,8 +1386,7 @@ static void test_zenable(void)
UINT x, y;
UINT i, j;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1475,8 +1477,7 @@ static void test_ck_rgba(void)
HRESULT hr;
UINT i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1596,9 +1597,7 @@ static void test_ck_default(void)
DDBLTFX fx;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1692,8 +1691,7 @@ static void test_ck_complex(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -1973,8 +1971,7 @@ static void test_surface_qi(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
/* Try to create a D3D device to see if the ddraw implementation supports
* D3D. 64-bit ddraw in particular doesn't seem to support D3D, and
* doesn't support e.g. the IDirect3DTexture interfaces. */
@@ -2059,8 +2056,7 @@ static void test_device_qi(void)
IDirect3DDevice7 *device;
HWND window;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -3401,9 +3397,7 @@ static void test_vb_discard(void)
static const unsigned int vbsize = 16;
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -3466,10 +3460,8 @@ static void test_coop_level_multi_window(void)
IDirectDraw7 *ddraw;
HRESULT hr;
- window1 = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
- window2 = CreateWindowA("static", "ddraw_test2", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window1 = create_window();
+ window2 = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -3510,9 +3502,7 @@ static void test_draw_strided(void)
HRESULT hr;
D3DDRAWPRIMITIVESTRIDEDDATA strided;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -3666,8 +3656,7 @@ static void test_lighting(void)
ULONG refcount;
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -3958,8 +3947,7 @@ static void test_specular_lighting(void)
} *quad;
WORD *indices;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -4073,8 +4061,7 @@ static void test_clear_rect_count(void)
HRESULT hr;
D3DRECT rect = {{0}, {0}, {640}, {480}};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -4145,9 +4132,7 @@ static void test_coop_level_versions(void)
IDirectDraw7 *ddraw7;
DDSURFACEDESC ddsd;
- window = CreateWindowA("static", "ddraw_test1", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
ddraw7 = create_ddraw();
ok(!!ddraw7, "Failed to create a ddraw object.\n");
/* Newly created ddraw objects restore the mode on ddraw2+::SetCooperativeLevel(NORMAL) */
@@ -4280,9 +4265,7 @@ static void test_fog_special(void)
IDirect3DDevice7 *device;
IDirectDrawSurface7 *rt;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -4475,9 +4458,7 @@ static void test_lighting_interface_versions(void)
{ D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -4916,9 +4897,7 @@ static void test_block_formats_creation(void)
{DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, SIZE_TYPE_SIZE, 0, DDERR_INVALIDPARAMS},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -5142,9 +5121,7 @@ static void test_unsupported_formats(void)
};
static const DWORD caps[] = {0, DDSCAPS_SYSTEMMEMORY, DDSCAPS_VIDEOMEMORY};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -5405,8 +5382,7 @@ static void test_rt_caps(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5654,8 +5630,7 @@ static void test_primary_caps(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -5813,8 +5788,7 @@ static void test_surface_lock(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -5945,9 +5919,7 @@ static void test_surface_discard(void)
};
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -6046,8 +6018,7 @@ static void test_flip(void)
{"TEXTURE", DDSCAPS_TEXTURE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -6353,8 +6324,7 @@ static void test_set_surface_desc(void)
{DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY, 0, FALSE, "systemmemory primary"},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6645,8 +6615,7 @@ static void test_user_memory_getdc(void)
HDC dc;
unsigned int x, y;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6740,8 +6709,7 @@ static void test_sysmem_overlay(void)
IDirectDrawSurface7 *surface;
ULONG ref;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -6779,8 +6747,7 @@ static void test_primary_palette(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (FAILED(IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 8, 0, 0)))
@@ -6945,8 +6912,7 @@ static void test_surface_attachment(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7201,8 +7167,7 @@ static void test_private_data(void)
{0x9b,0x4b,0x89,0xd7,0xd1,0x12,0xe7,0x2b}
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7603,8 +7568,7 @@ static void test_create_surface_pitch(void)
};
DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7706,8 +7670,7 @@ static void test_mipmap(void)
{0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 7},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7791,8 +7754,7 @@ static void test_palette_complex(void)
PALETTEENTRY palette_entries[256];
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -7927,8 +7889,7 @@ static void test_p8_blit(void)
};
D3DCOLOR color;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8057,8 +8018,7 @@ static void test_material(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -8129,8 +8089,7 @@ static void test_palette_gdi(void)
RGBQUAD rgbquad[255];
static const RGBQUAD rgb_zero = {0, 0, 0, 0};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8433,8 +8392,7 @@ static void test_palette_alpha(void)
{DDSCAPS_PRIMARYSURFACE, 0, FALSE, "primary"}
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
if (FAILED(IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 8, 0, 0)))
@@ -8578,9 +8536,7 @@ static void test_vb_writeonly(void)
{640.0f, 0.0f, 0.0f, 1.0f},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -8847,8 +8803,7 @@ static void test_resource_priority(void)
{DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, 0, "sysmem offscreenplain", DDERR_INVALIDOBJECT, TRUE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -8971,8 +8926,7 @@ static void test_surface_desc_lock(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -9065,9 +9019,7 @@ static void test_fog_interpolation(void)
};
D3DDEVICEDESC7 caps;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -9224,9 +9176,7 @@ static void test_negative_fixedfunction_fog(void)
};
D3DDEVICEDESC7 caps;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -9338,9 +9288,7 @@ static void test_table_fog_zw(void)
};
unsigned int i;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -9499,9 +9447,7 @@ static void test_signed_formats(void)
unsigned int i, width, x, y;
D3DDEVICEDESC7 device_desc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -9791,9 +9737,7 @@ static void test_color_fill(void)
{0xaa0029, "0xaa0029", DDERR_NORASTEROPHW} /* noop */
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -10186,8 +10130,7 @@ static void test_texcoordindex(void)
D3DCOLOR color;
DWORD *ptr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -10423,8 +10366,7 @@ static void test_colorkey_precision(void)
},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -10669,8 +10611,7 @@ static void test_range_colorkey(void)
ULONG refcount;
DDCOLORKEY ckey;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -10826,9 +10767,7 @@ static void test_shademode(void)
{D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -10958,8 +10897,7 @@ static void test_lockrect_invalid(void)
{DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, "managed texture", DD_OK},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -11082,8 +11020,7 @@ static void test_yv12_overlay(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -11205,8 +11142,7 @@ static void test_offscreen_overlay(void)
HRESULT hr;
HDC dc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -11285,8 +11221,7 @@ static void test_overlay_rect(void)
HWND window;
HDC dc;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -11407,8 +11342,7 @@ static void test_blt(void)
{{640, 0, 0, 480}, { 0, 0, 640, 480}, DDERR_INVALIDRECT}, /* Full surface, mirrored source. */
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -11481,9 +11415,7 @@ static void test_color_clamping(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -11613,8 +11545,7 @@ static void test_getdc(void)
{0x00000000}, {0x00000000}, {0x00000000}, {0x00000000}}, FALSE},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -11915,9 +11846,7 @@ static void test_draw_primitive(void)
HRESULT hr;
void *data;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
-
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -12044,8 +11973,7 @@ static void test_edge_antialiasing_blending(void)
{{ 1.0f, 1.0f, 0.1f}, 0xccff0000},
};
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device.\n");
@@ -12493,8 +12421,7 @@ static void test_get_surface_from_dc(void)
HRESULT hr;
DWORD ret;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -12606,8 +12533,7 @@ static void test_ck_operation(void)
DDCOLORKEY ckey;
DDBLTFX fx;
- window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
@@ -13073,8 +12999,7 @@ static void test_vb_refcount(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
@@ -13196,8 +13121,7 @@ static void test_compute_sphere_visibility(void)
HWND window;
HRESULT hr;
- window = CreateWindowA("static", "d3d_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, 0, 0, 0, 0);
+ window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
--
2.1.4
More information about the wine-patches
mailing list