[ros-diffs] [reactos] 94/218: [WINESYNC] d3dx9: Avoid using 'This' in d3dx_effect_GetPool().

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=234a3a63899280d73d516…

commit 234a3a63899280d73d516d16ecbe994ecb473e52
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 22:50:18 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:03 2021 +0100

    [WINESYNC] d3dx9: Avoid using 'This' in d3dx_effect_GetPool().
    
    Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 3bd0fc3d6ad75ec723f2268e2d6de79be904de2c by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 14 +++++++-------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 6fdca701fca..393efae5c7b 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -3527,9 +3527,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)
     {
@@ -3537,14 +3537,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;
 }
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index d7675cd5cd2..4cfdb06fce5 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -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/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}
-tags: {wine: 9a121f511533abb801ce49011e2a089b15265a44}
+tags: {wine: 3bd0fc3d6ad75ec723f2268e2d6de79be904de2c}