Markus Amsler : d3d9: Use correct COM macros.

[Alexandre Julliard]

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

Author: Markus Amsler 
Date:   Fri Dec  1 00:16:10 2006 +0100

d3d9: Use correct COM macros.

---

dlls/d3d9/device.c            |   16 ++++++++--------
 dlls/d3d9/vertexdeclaration.c |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 349356b..094f79f 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -100,8 +100,8 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_Ge
     hr = IWineD3DDevice_GetDirect3D(This->WineD3DDevice, &pWineD3D);
     if (hr == D3D_OK && pWineD3D != NULL)
     {
-        IWineD3DResource_GetParent((IWineD3DResource *)pWineD3D,(IUnknown **)ppD3D9);
-        IWineD3DResource_Release((IWineD3DResource *)pWineD3D);
+        IWineD3D_GetParent(pWineD3D,(IUnknown **)ppD3D9);
+        IWineD3D_Release(pWineD3D);
     } else {
         FIXME("Call to IWineD3DDevice_GetDirect3D failed\n");
         *ppD3D9 = NULL;
@@ -404,8 +404,8 @@ static HRESULT  WINAPI  IDirect3DDevice9
     hr=IWineD3DDevice_GetRenderTarget(This->WineD3DDevice,RenderTargetIndex,&pRenderTarget);

if (hr == D3D_OK && pRenderTarget != NULL) {
-        IWineD3DResource_GetParent((IWineD3DResource *)pRenderTarget,(IUnknown**)ppRenderTarget);
-        IWineD3DResource_Release((IWineD3DResource *)pRenderTarget);
+        IWineD3DSurface_GetParent(pRenderTarget,(IUnknown**)ppRenderTarget);
+        IWineD3DSurface_Release(pRenderTarget);
     } else {
         FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n");
         *ppRenderTarget = NULL;
@@ -435,8 +435,8 @@ static HRESULT  WINAPI  IDirect3DDevice9

hr=IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface);
     if(hr == D3D_OK && pZStencilSurface != NULL){
-        IWineD3DResource_GetParent((IWineD3DResource *)pZStencilSurface,(IUnknown**)ppZStencilSurface);
-        IWineD3DResource_Release((IWineD3DResource *)pZStencilSurface);
+        IWineD3DSurface_GetParent(pZStencilSurface,(IUnknown**)ppZStencilSurface);
+        IWineD3DSurface_Release(pZStencilSurface);
     }else{
         FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n");
         *ppZStencilSurface = NULL;
@@ -838,8 +838,8 @@ static HRESULT  WINAPI  IDirect3DDevice9

rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp);
     if (rc == D3D_OK && NULL != retIndexData) {
-        IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData);
-        IWineD3DVertexBuffer_Release(retIndexData);
+        IWineD3DIndexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData);
+        IWineD3DIndexBuffer_Release(retIndexData);
     }else{
         if(rc != D3D_OK)  FIXME("Call to GetIndices failed\n");
         *ppIndexData = NULL;
diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c
index 5572552..e8dfe0c 100644
--- a/dlls/d3d9/vertexdeclaration.c
+++ b/dlls/d3d9/vertexdeclaration.c
@@ -321,8 +321,8 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_Ge
     *ppDecl = NULL;
     hr = IWineD3DDevice_GetVertexDeclaration(This->WineD3DDevice, &pTest);
     if (hr == D3D_OK && NULL != pTest) {
-        IWineD3DResource_GetParent(pTest, (IUnknown **)ppDecl);
-        IWineD3DResource_Release(pTest);
+        IWineD3DVertexDeclaration_GetParent(pTest, (IUnknown **)ppDecl);
+        IWineD3DVertexDeclaration_Release(pTest);
     } else {
         *ppDecl = NULL;
     }