Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-25 12:14:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Avoid using 'This' in d3dx_effect_GetPool().

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 3bd0fc3d6ad75ec723f2268e2d6de79be904de2c by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:50:18 +02:00 committed by Jérôme Gardou
parent eb06082f45
commit 234a3a6389
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dll/directx/wine/d3dx9_36/effect.c
View file

@ -3527,9 +3527,9 @@ static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE p
/*** ID3DXEffect methods ***/ /*** ID3DXEffect methods ***/
static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool)
{ {
struct d3dx_effect *This = impl_from_ID3DXEffect(iface); struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
TRACE("iface %p, pool %p\n", This, pool); TRACE("iface %p, pool %p.\n", effect, pool);
if (!pool) if (!pool)
{ {
@ -3537,14 +3537,14 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }
if (This->pool) *pool = NULL;
if (effect->pool)
{ {
This->pool->lpVtbl->AddRef(This->pool); *pool = effect->pool;
(*pool)->lpVtbl->AddRef(*pool);
} }
*pool = This->pool; TRACE("Returning pool %p.\n", *pool);
TRACE("Returning pool %p\n", *pool);
return S_OK; return S_OK;
} }

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h, include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h, include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: 9a121f511533abb801ce49011e2a089b15265a44} tags: {wine: 3bd0fc3d6ad75ec723f2268e2d6de79be904de2c}