[PATCH] DDrawex: Modify the GetDC test a bit=0A=

[Stefan Doesinger]

=0A=
---=0A=
 dlls/ddrawex/tests/surface.c |   73 =
++++++++++++++++++++++--------------------=0A=
 1 files changed, 38 insertions(+), 35 deletions(-)=0A=
=0A=
diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c=0A=
index f0ac444..1c0acdd 100644=0A=
--- a/dlls/ddrawex/tests/surface.c=0A=
+++ b/dlls/ddrawex/tests/surface.c=0A=
@@ -68,10 +68,8 @@ static void dctest_surf(IDirectDrawSurface *surf, int =
ddsdver) {=0A=
     ok(hr =3D=3D DDERR_NODC, "IDirectDrawSurface_ReleaseDC returned =
0x%08x, expected DDERR_NODC\n", hr);=0A=
 }=0A=
 =0A=
-static void GetDCTest(void)=0A=
+static void GetDCTest_main(DDSURFACEDESC *ddsd, DDSURFACEDESC2 *ddsd2, =
void (*testfunc)(IDirectDrawSurface *surf, int ddsdver))=0A=
 {=0A=
-    DDSURFACEDESC ddsd;=0A=
-    DDSURFACEDESC2 ddsd2;=0A=
     IDirectDrawSurface *surf;=0A=
     IDirectDrawSurface2 *surf2;=0A=
     IDirectDrawSurface2 *surf3;=0A=
@@ -82,34 +80,21 @@ static void GetDCTest(void)=0A=
     IDirectDraw3 *dd3;=0A=
     IDirectDraw4 *dd4;=0A=
 =0A=
-    memset(&ddsd, 0, sizeof(ddsd));=0A=
-    ddsd.dwSize =3D sizeof(ddsd);=0A=
-    ddsd.dwFlags =3D DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;=0A=
-    ddsd.dwWidth =3D 64;=0A=
-    ddsd.dwHeight =3D 64;=0A=
-    ddsd.ddsCaps.dwCaps =3D DDSCAPS_OFFSCREENPLAIN;=0A=
-    memset(&ddsd2, 0, sizeof(ddsd2));=0A=
-    ddsd2.dwSize =3D sizeof(ddsd2);=0A=
-    ddsd2.dwFlags =3D DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;=0A=
-    ddsd2.dwWidth =3D 64;=0A=
-    ddsd2.dwHeight =3D 64;=0A=
-    ddsd2.ddsCaps.dwCaps =3D DDSCAPS_OFFSCREENPLAIN;=0A=
-=0A=
-    hr =3D IDirectDraw_CreateSurface(dd1, &ddsd, &surf, NULL);=0A=
+    hr =3D IDirectDraw_CreateSurface(dd1, ddsd, &surf, NULL);=0A=
     ok(hr =3D=3D DD_OK, "IDirectDraw_CreateSurface failed: 0x%08x\n", =
hr);=0A=
-    dctest_surf(surf, 1);=0A=
+    testfunc(surf, 1);=0A=
     IDirectDrawSurface_Release(surf);=0A=
 =0A=
     hr =3D IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw2, (void **) =
&dd2);=0A=
     ok(hr =3D=3D DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", =
hr);=0A=
 =0A=
-    hr =3D IDirectDraw2_CreateSurface(dd2, &ddsd, &surf, NULL);=0A=
+    hr =3D IDirectDraw2_CreateSurface(dd2, ddsd, &surf, NULL);=0A=
     ok(hr =3D=3D DD_OK, "IDirectDraw2_CreateSurface failed: 0x%08x\n", =
hr);=0A=
-    dctest_surf(surf, 1);=0A=
+    testfunc(surf, 1);=0A=
 =0A=
     hr =3D IDirectDrawSurface_QueryInterface(surf, =
&IID_IDirectDrawSurface2, (void **) &surf2);=0A=
     ok(hr =3D=3D DD_OK, "IDirectDrawSurface_QueryInterface failed: =
0x%08x\n", hr);=0A=
-    dctest_surf((IDirectDrawSurface *) surf2, 1);=0A=
+    testfunc((IDirectDrawSurface *) surf2, 1);=0A=
 =0A=
     IDirectDrawSurface2_Release(surf2);=0A=
     IDirectDrawSurface_Release(surf);=0A=
@@ -118,28 +103,25 @@ static void GetDCTest(void)=0A=
     hr =3D IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **) =
&dd3);=0A=
     ok(hr =3D=3D DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", =
hr);=0A=
 =0A=
-    if(SUCCEEDED(hr))=0A=
-    {=0A=
-        hr =3D IDirectDraw3_CreateSurface(dd3, &ddsd, &surf, NULL);=0A=
-        ok(hr =3D=3D DD_OK, "IDirectDraw3_CreateSurface failed: =
0x%08x\n", hr);=0A=
-        dctest_surf(surf, 1);=0A=
+    hr =3D IDirectDraw3_CreateSurface(dd3, ddsd, &surf, NULL);=0A=
+    ok(hr =3D=3D DD_OK, "IDirectDraw3_CreateSurface failed: 0x%08x\n", =
hr);=0A=
+    testfunc(surf, 1);=0A=
 =0A=
-        hr =3D IDirectDrawSurface_QueryInterface(surf, =
&IID_IDirectDrawSurface3, (void **) &surf3);=0A=
-        ok(hr =3D=3D DD_OK, "IDirectDrawSurface_QueryInterface failed: =
0x%08x\n", hr);=0A=
-        dctest_surf((IDirectDrawSurface *) surf3, 1);=0A=
+    hr =3D IDirectDrawSurface_QueryInterface(surf, =
&IID_IDirectDrawSurface3, (void **) &surf3);=0A=
+    ok(hr =3D=3D DD_OK, "IDirectDrawSurface_QueryInterface failed: =
0x%08x\n", hr);=0A=
+    testfunc((IDirectDrawSurface *) surf3, 1);=0A=
 =0A=
-        IDirectDrawSurface3_Release(surf3);=0A=
-        IDirectDrawSurface_Release(surf);=0A=
-        IDirectDraw3_Release(dd3);=0A=
-    }=0A=
+    IDirectDrawSurface3_Release(surf3);=0A=
+    IDirectDrawSurface_Release(surf);=0A=
+    IDirectDraw3_Release(dd3);=0A=
 =0A=
     hr =3D IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) =
&dd4);=0A=
     ok(hr =3D=3D DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", =
hr);=0A=
 =0A=
     surf =3D NULL;=0A=
-    hr =3D IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL);=0A=
+    hr =3D IDirectDraw4_CreateSurface(dd4, ddsd2, &surf4, NULL);=0A=
     ok(hr =3D=3D DD_OK, "IDirectDraw4_CreateSurface failed: 0x%08x\n", =
hr);=0A=
-    dctest_surf((IDirectDrawSurface *) surf4, 2);=0A=
+    testfunc((IDirectDrawSurface *) surf4, 2);=0A=
 =0A=
     IDirectDrawSurface4_Release(surf4);=0A=
     IDirectDraw4_Release(dd4);=0A=
@@ -147,6 +129,27 @@ static void GetDCTest(void)=0A=
     IDirectDraw_Release(dd1);=0A=
 }=0A=
 =0A=
+static void GetDCTest(void)=0A=
+{=0A=
+    DDSURFACEDESC ddsd;=0A=
+    DDSURFACEDESC2 ddsd2;=0A=
+=0A=
+    memset(&ddsd, 0, sizeof(ddsd));=0A=
+    ddsd.dwSize =3D sizeof(ddsd);=0A=
+    ddsd.dwFlags =3D DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;=0A=
+    ddsd.dwWidth =3D 64;=0A=
+    ddsd.dwHeight =3D 64;=0A=
+    ddsd.ddsCaps.dwCaps =3D DDSCAPS_OFFSCREENPLAIN;=0A=
+    memset(&ddsd2, 0, sizeof(ddsd2));=0A=
+    ddsd2.dwSize =3D sizeof(ddsd2);=0A=
+    ddsd2.dwFlags =3D DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;=0A=
+    ddsd2.dwWidth =3D 64;=0A=
+    ddsd2.dwHeight =3D 64;=0A=
+    ddsd2.ddsCaps.dwCaps =3D DDSCAPS_OFFSCREENPLAIN;=0A=
+=0A=
+    GetDCTest_main(&ddsd, &ddsd2, dctest_surf);=0A=
+}=0A=
+=0A=
 static void CapsTest(void)=0A=
 {=0A=
     DDSURFACEDESC ddsd;=0A=
-- =0A=
1.6.0.6=0A=
=0A=

------=_NextPart_000_0034_01C970CF.B025FAB0--