Markus Amsler : d3d8: Use correct COM macros.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Dec 1 06:29:18 CST 2006
Module: wine
Branch: master
Commit: 44e6c6b67aede6d5a52c7cc537e3afe426e32f09
URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e6c6b67aede6d5a52c7cc537e3afe426e32f09
Author: Markus Amsler <markus.amsler at oribi.org>
Date: Fri Dec 1 00:15:42 2006 +0100
d3d8: Use correct COM macros.
---
dlls/d3d8/device.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 68b0dff..51679cc 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -138,8 +138,8 @@ static HRESULT WINAPI IDirect3DDevice8Im
hr = IWineD3DDevice_GetDirect3D(This->WineD3DDevice, &pWineD3D);
if (hr == D3D_OK && pWineD3D != NULL)
{
- IWineD3DResource_GetParent((IWineD3DResource *)pWineD3D,(IUnknown **)ppD3D8);
- IWineD3DResource_Release((IWineD3DResource *)pWineD3D);
+ IWineD3D_GetParent(pWineD3D,(IUnknown **)ppD3D8);
+ IWineD3D_Release(pWineD3D);
} else {
FIXME("Call to IWineD3DDevice_GetDirect3D failed\n");
*ppD3D8 = NULL;
@@ -678,8 +678,8 @@ static HRESULT WINAPI IDirect3DDevice8
hr = IWineD3DDevice_GetRenderTarget(This->WineD3DDevice, 0, &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;
@@ -700,8 +700,8 @@ static HRESULT WINAPI IDirect3DDevice8
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_GetDepthStencilSurface failed\n");
*ppZStencilSurface = NULL;
@@ -1315,8 +1315,8 @@ static HRESULT WINAPI IDirect3DDevice8Im
rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp);
if (D3D_OK == rc && 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;
More information about the wine-cvs
mailing list