From 98bd3ef8038611f886e9dbf08ae4622ce88d19cb Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Thu, 2 Feb 2012 19:26:37 +0100 Subject: [PATCH] ddraw/tests: Use correct COM macros in a couple of places. --- 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 3bdce433961..c4820b11826 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 3bd6e9592e9..73ae501d972 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 d727bee4249..07509b90f8e 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); -- 2.11.4.GIT