H. Verbeet : wined3d: Return the correct parent in
IWineD3DPixelShaderImpl_GetParent.
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Dec 3 12:31:16 CST 2005
Module: wine
Branch: refs/heads/master
Commit: 246b07de7c6390f59b48f997c8e3038cc182e95d
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=246b07de7c6390f59b48f997c8e3038cc182e95d
Author: H. Verbeet <hverbeet at gmail.com>
Date: Sat Dec 3 18:10:56 2005 +0100
wined3d: Return the correct parent in IWineD3DPixelShaderImpl_GetParent.
Remove an unnecessary cast.
---
dlls/wined3d/pixelshader.c | 2 +-
dlls/wined3d/vertexshader.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index a22f39b..123b3a5 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -100,7 +100,7 @@ ULONG WINAPI IWineD3DPixelShaderImpl_Rel
HRESULT WINAPI IWineD3DPixelShaderImpl_GetParent(IWineD3DPixelShader *iface, IUnknown** parent){
IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface;
- *parent= (IUnknown*) parent;
+ *parent = This->parent;
IUnknown_AddRef(*parent);
TRACE("(%p) : returning %p\n", This, *parent);
return D3D_OK;
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index ce5258d..af7a566 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -2012,7 +2012,7 @@ ULONG WINAPI IWineD3DVertexShaderImpl_Re
HRESULT WINAPI IWineD3DVertexShaderImpl_GetParent(IWineD3DVertexShader *iface, IUnknown** parent){
IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface;
- *parent = (IUnknown*)This->parent;
+ *parent = This->parent;
IUnknown_AddRef(*parent);
TRACE("(%p) : returning %p\n", This, *parent);
return D3D_OK;
More information about the wine-cvs
mailing list