WINED3D: Return the correct parent in
IWineD3DPixelShaderImpl_GetParent
H. Verbeet
hverbeet at gmail.com
Sat Dec 3 05:27:12 CST 2005
Keeps the Battlefield 2 Demo from crashing a little longer.
Changelog:
- Return the correct parent in IWineD3DPixelShaderImpl_GetParent
- Remove an unnecessary cast in IWineD3DVertexShaderImpl_GetParent.
-------------- next part --------------
199294148b8105f3c7e90a1551c2adf178ad11c3
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-patches
mailing list