[ros-diffs] [reactos] 80/218: [WINESYNC] d3dx9: Avoid double free on effect initialization failure.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d0bce396f0515f86767b…

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

    [WINESYNC] d3dx9: Avoid double free on effect initialization failure.
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id cffe35488dc16414c6938e0f1a0169fb59730c97 by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/effect.c | 1 -
 sdk/tools/winesync/d3dx9.cfg       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 3dacdebd23a..317425415ac 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -6307,7 +6307,6 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect
*base,
                             debugstr_a(skip_constants[i]), j);
                     HeapFree(GetProcessHeap(), 0, skip_constants_buffer);
                     HeapFree(GetProcessHeap(), 0, skip_constants);
-                    d3dx9_base_effect_cleanup(effect);
                     return D3DERR_INVALIDCALL;
                 }
             }
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 61529b927f5..21d0e2cbc75 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: 2f16d2f4ca86263571797d9544a9534e8aa29c16}
+tags: {wine: cffe35488dc16414c6938e0f1a0169fb59730c97}