[ros-diffs] [reactos] 96/218: [WINESYNC] d3dx9: Avoid using This in d3dx_effect_Clone().

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fd48117e669370b7fe15…

commit 9fd48117e669370b7fe15e53ca733684e2d548fd
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_Clone().
    
    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 c56906599cdad729834a6807747ce2c928fc511d by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 12 ++++++------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 0dc42b5931d..69c078d2dee 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -4091,17 +4091,17 @@ static HRESULT WINAPI d3dx_effect_DeleteParameterBlock(ID3DXEffect
*iface, D3DXH
 }
 #endif
 
-static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, struct IDirect3DDevice9
*device,
-        struct ID3DXEffect **effect)
+static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevice9
*device,
+        ID3DXEffect **new_effect)
 {
-    struct d3dx_effect *This = impl_from_ID3DXEffect(iface);
+    struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
 
-    FIXME("(%p)->(%p, %p): stub\n", This, device, effect);
+    FIXME("iface %p, device %p, new_effect %p stub.\n", effect, device,
new_effect);
 
-    if (!effect)
+    if (!new_effect)
         return D3DERR_INVALIDCALL;
 
-    if (This->base_effect.flags & D3DXFX_NOT_CLONEABLE)
+    if (effect->base_effect.flags & D3DXFX_NOT_CLONEABLE)
         return E_FAIL;
 
     if (!device)
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 09089bd67da..50683c00a48 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: ef974e59856d702523ef04b5e315d0c980097c8d}
+tags: {wine: c56906599cdad729834a6807747ce2c928fc511d}