Module: wine Branch: master Commit: f85f733c7924503f5880e525d4a2698e81726da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85f733c7924503f5880e525d4...
Author: Stefan Dösinger stefan@codeweavers.com Date: Wed Jan 15 22:02:18 2014 +0100
d3dx9_36/tests: Use a window with a non-zero size.
---
dlls/d3dx9_36/tests/core.c | 3 ++- dlls/d3dx9_36/tests/effect.c | 3 ++- dlls/d3dx9_36/tests/line.c | 3 ++- dlls/d3dx9_36/tests/mesh.c | 20 +++++++++++++------- dlls/d3dx9_36/tests/shader.c | 12 ++++++------ dlls/d3dx9_36/tests/surface.c | 3 ++- dlls/d3dx9_36/tests/texture.c | 3 ++- dlls/d3dx9_36/tests/volume.c | 3 ++- 8 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index d2e2d5e..2990893 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1225,7 +1225,8 @@ START_TEST(core) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr;
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 2306f1e..bc1ddbe 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2691,7 +2691,8 @@ START_TEST(effect) HRESULT hr; ULONG count;
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 25d1f32..ae8d07e 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -123,7 +123,8 @@ START_TEST(line) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr;
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 47a1b1f..2eb2146 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -121,7 +121,8 @@ static struct test_context *new_test_context(void) D3DPRESENT_PARAMETERS d3dpp = {0}; struct test_context *test_context;
- if (!(hwnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); goto error; @@ -1175,7 +1176,8 @@ static void D3DXCreateMeshTest(void) hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl1, NULL, &d3dxmesh); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -1381,7 +1383,8 @@ static void D3DXCreateMeshFVFTest(void) hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, NULL, &d3dxmesh); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -2449,7 +2452,7 @@ static void D3DXCreateBoxTest(void) return; }
- wnd = CreateWindowA("d3dx9_test_wc", "d3dx9_test", WS_SYSMENU | WS_POPUP, + wnd = CreateWindowA("d3dx9_test_wc", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); ok(wnd != NULL, "Expected to have a window, received NULL\n"); if (!wnd) @@ -2750,7 +2753,8 @@ static void D3DXCreateSphereTest(void) hr = D3DXCreateSphere(NULL, 0.0f, 0, 1, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL);
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -2992,7 +2996,8 @@ static void D3DXCreateCylinderTest(void) hr = D3DXCreateCylinder(NULL, 1.0f, 1.0f, 1.0f, 2, 1, &cylinder, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL);
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -4282,7 +4287,8 @@ static void D3DXGenerateAdjacencyTest(void) }, };
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 4fcf3d3..c0d5f00 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1423,8 +1423,8 @@ static void test_setting_constants(void) HRESULT hr; ULONG refcnt;
- /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -6067,8 +6067,8 @@ static void test_registerset(void) ULONG count; D3DCAPS9 caps;
- /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -6371,8 +6371,8 @@ static void test_registerset_defaults(void) ULONG count; D3DCAPS9 caps;
- /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 3af34d4..283fc96 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1281,7 +1281,8 @@ START_TEST(surface) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr;
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 18ac720..afc7144 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1786,7 +1786,8 @@ START_TEST(texture) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr;
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 8f1dc29..ee83bca 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -267,7 +267,8 @@ START_TEST(volume) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr;
- if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return;
-
Alexandre Julliard