[PATCH 1/2] ddraw/tests: Use correct COM macros in a couple of places.
Henri Verbeet
hverbeet at codeweavers.com
Thu Feb 2 12:26:37 CST 2012
---
dlls/ddraw/tests/ddraw1.c | 14 +++++++-------
dlls/ddraw/tests/ddraw2.c | 6 +++---
dlls/ddraw/tests/ddraw4.c | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 3bdce43..c4820b1 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -784,15 +784,15 @@ static void test_surface_interface_mismatch(void)
cleanup:
if (viewport)
{
- IDirect3DDevice2_DeleteViewport(device, viewport);
- IDirect3DViewport2_Release(viewport);
+ IDirect3DDevice_DeleteViewport(device, viewport);
+ IDirect3DViewport_Release(viewport);
}
- if (background) IDirect3DMaterial2_Release(background);
+ if (background) IDirect3DMaterial_Release(background);
if (surface3) IDirectDrawSurface3_Release(surface3);
- if (surface) IDirectDrawSurface7_Release(surface);
- if (device) IDirect3DDevice2_Release(device);
- if (d3d) IDirect3D7_Release(d3d);
- if (ddraw) IDirectDraw7_Release(ddraw);
+ if (surface) IDirectDrawSurface_Release(surface);
+ if (device) IDirect3DDevice_Release(device);
+ if (d3d) IDirect3D_Release(d3d);
+ if (ddraw) IDirectDraw_Release(ddraw);
DestroyWindow(window);
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 3bd6e95..73ae501 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -814,10 +814,10 @@ cleanup:
}
if (background) IDirect3DMaterial2_Release(background);
if (surface3) IDirectDrawSurface3_Release(surface3);
- if (surface) IDirectDrawSurface7_Release(surface);
+ if (surface) IDirectDrawSurface_Release(surface);
if (device) IDirect3DDevice2_Release(device);
- if (d3d) IDirect3D7_Release(d3d);
- if (ddraw) IDirectDraw7_Release(ddraw);
+ if (d3d) IDirect3D2_Release(d3d);
+ if (ddraw) IDirectDraw2_Release(ddraw);
DestroyWindow(window);
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index d727bee..07509b9 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -976,8 +976,8 @@ static void test_surface_interface_mismatch(void)
cleanup:
if (viewport)
{
- IDirect3DDevice2_DeleteViewport(device, viewport);
- IDirect3DViewport2_Release(viewport);
+ IDirect3DDevice3_DeleteViewport(device, viewport);
+ IDirect3DViewport3_Release(viewport);
}
if (surface3) IDirectDrawSurface3_Release(surface3);
if (surface) IDirectDrawSurface4_Release(surface);
--
1.7.3.4
More information about the wine-patches
mailing list