From 4551135f7a42ac8de6d2e78011328b713fcc68ec Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 27 Aug 2012 12:27:48 +0200
Subject: [PATCH] ddraw: Use proper helpers for iface calls.

---
 dlls/ddraw/material.c     |  2 +-
 dlls/ddraw/surface.c      | 20 ++++++++++----------
 dlls/ddraw/vertexbuffer.c |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index 4b447265978..5317bf5ad05 100644
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -75,7 +75,7 @@ static HRESULT WINAPI d3d_material3_QueryInterface(IDirect3DMaterial3 *iface, RE
 
     if (IsEqualGUID(&IID_IUnknown, riid))
     {
-        IUnknown_AddRef(iface);
+        IDirect3DMaterial3_AddRef(iface);
         *obp = iface;
         TRACE("  Creating IUnknown interface at %p.\n", *obp);
         return S_OK;
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 23577907ca4..df85526f9cc 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -5440,13 +5440,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *
     if (!iface) return NULL;
     if (iface->lpVtbl != &ddraw_surface7_vtbl)
     {
-        HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface7, (void **)&iface);
+        HRESULT hr = IDirectDrawSurface7_QueryInterface(iface, &IID_IDirectDrawSurface7, (void **)&iface);
         if (FAILED(hr))
         {
             WARN("Object %p doesn't expose interface IDirectDrawSurface7.\n", iface);
             return NULL;
         }
-        IUnknown_Release(iface);
+        IDirectDrawSurface7_Release(iface);
     }
     return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface7_iface);
 }
@@ -5456,13 +5456,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *
     if (!iface) return NULL;
     if (iface->lpVtbl != &ddraw_surface4_vtbl)
     {
-        HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface4, (void **)&iface);
+        HRESULT hr = IDirectDrawSurface4_QueryInterface(iface, &IID_IDirectDrawSurface4, (void **)&iface);
         if (FAILED(hr))
         {
             WARN("Object %p doesn't expose interface IDirectDrawSurface4.\n", iface);
             return NULL;
         }
-        IUnknown_Release(iface);
+        IDirectDrawSurface4_Release(iface);
     }
     return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface4_iface);
 }
@@ -5472,13 +5472,13 @@ static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSur
     if (!iface) return NULL;
     if (iface->lpVtbl != &ddraw_surface3_vtbl)
     {
-        HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface3, (void **)&iface);
+        HRESULT hr = IDirectDrawSurface3_QueryInterface(iface, &IID_IDirectDrawSurface3, (void **)&iface);
         if (FAILED(hr))
         {
             WARN("Object %p doesn't expose interface IDirectDrawSurface3.\n", iface);
             return NULL;
         }
-        IUnknown_Release(iface);
+        IDirectDrawSurface3_Release(iface);
     }
     return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface3_iface);
 }
@@ -5488,13 +5488,13 @@ static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSur
     if (!iface) return NULL;
     if (iface->lpVtbl != &ddraw_surface2_vtbl)
     {
-        HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface2, (void **)&iface);
+        HRESULT hr = IDirectDrawSurface2_QueryInterface(iface, &IID_IDirectDrawSurface2, (void **)&iface);
         if (FAILED(hr))
         {
             WARN("Object %p doesn't expose interface IDirectDrawSurface2.\n", iface);
             return NULL;
         }
-        IUnknown_Release(iface);
+        IDirectDrawSurface2_Release(iface);
     }
     return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface2_iface);
 }
@@ -5504,13 +5504,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *if
     if (!iface) return NULL;
     if (iface->lpVtbl != &ddraw_surface1_vtbl)
     {
-        HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface, (void **)&iface);
+        HRESULT hr = IDirectDrawSurface_QueryInterface(iface, &IID_IDirectDrawSurface, (void **)&iface);
         if (FAILED(hr))
         {
             WARN("Object %p doesn't expose interface IDirectDrawSurface.\n", iface);
             return NULL;
         }
-        IUnknown_Release(iface);
+        IDirectDrawSurface_Release(iface);
     }
     return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface_iface);
 }
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index 1fd33e7e9ee..29feb8778a0 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -66,21 +66,21 @@ static HRESULT WINAPI d3d_vertex_buffer7_QueryInterface(IDirect3DVertexBuffer7 *
 
     if ( IsEqualGUID( &IID_IUnknown,  riid ) )
     {
-        IUnknown_AddRef(iface);
+        IDirect3DVertexBuffer7_AddRef(iface);
         *obj = iface;
         TRACE("  Creating IUnknown interface at %p.\n", *obj);
         return S_OK;
     }
     if ( IsEqualGUID( &IID_IDirect3DVertexBuffer, riid ) )
     {
-        IUnknown_AddRef(iface);
+        IDirect3DVertexBuffer7_AddRef(iface);
         *obj = &buffer->IDirect3DVertexBuffer_iface;
         TRACE("  Creating IDirect3DVertexBuffer interface %p\n", *obj);
         return S_OK;
     }
     if ( IsEqualGUID( &IID_IDirect3DVertexBuffer7, riid ) )
     {
-        IUnknown_AddRef(iface);
+        IDirect3DVertexBuffer7_AddRef(iface);
         *obj = iface;
         TRACE("  Creating IDirect3DVertexBuffer7 interface %p\n", *obj);
         return S_OK;