[PATCH v2 1/6] d3dx9: Avoid using 'This' in d3dx_effect_GetPool().
Matteo Bruni
mbruni at codeweavers.com
Fri Mar 22 13:09:52 CDT 2019
From: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
dlls/d3dx9_36/effect.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 7635caa8786..874b81b8a3d 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3523,9 +3523,9 @@ static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE p
/*** ID3DXEffect methods ***/
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)
{
@@ -3533,14 +3533,14 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **
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;
}
--
2.19.2
More information about the wine-devel
mailing list