=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: ddraw/tests: Use correct ddraw COM macros.

Alexandre Julliard julliard at winehq.org
Thu Dec 12 12:48:08 CST 2013


Module: wine
Branch: master
Commit: cc978c90d425950efd2f7c6c948c490a5c0537f2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cc978c90d425950efd2f7c6c948c490a5c0537f2

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Wed Dec 11 22:30:46 2013 +0100

ddraw/tests: Use correct ddraw COM macros.

---

 dlls/ddraw/tests/ddraw2.c |    4 ++--
 dlls/ddraw/tests/ddraw4.c |    2 +-
 dlls/ddraw/tests/ddraw7.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 528bada..d6d38c8 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -4607,7 +4607,7 @@ static void test_set_surface_desc(void)
     U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff;
     ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY;
 
-    hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL);
+    hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL);
     ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
 
     hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **)&surface3);
@@ -4826,7 +4826,7 @@ static void test_set_surface_desc(void)
             U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff;
         }
 
-        hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL);
+        hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL);
         ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr);
         if (FAILED(hr))
         {
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index a4981c9..6f9160c 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -5197,7 +5197,7 @@ static void test_set_surface_desc(void)
     window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
             0, 0, 640, 480, 0, 0, 0, 0);
 
-    hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
+    hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
     ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
 
     reset_ddsd(&ddsd);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index d253ebf..819f4d0 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -5084,7 +5084,7 @@ static void test_set_surface_desc(void)
     window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
             0, 0, 640, 480, 0, 0, 0, 0);
 
-    hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
+    hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
     ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
 
     reset_ddsd(&ddsd);




More information about the wine-cvs mailing list