[reactos] 109/218: [WINESYNC] d3dx9: Always free samplers (Valgrind).

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7240c0d945a4f411932a32...

commit 7240c0d945a4f411932a325029c9225da235638e
Author:     winesync [e-mail]
AuthorDate: Mon Sep 21 22:51:59 2020 +0200
Commit:     Jérôme Gardou [e-mail]
CommitDate: Thu Feb 4 16:37:03 2021 +0100

[WINESYNC] d3dx9: Always free samplers (Valgrind).

Signed-off-by: Sven Baars [e-mail]
    Signed-off-by: Matteo Bruni [e-mail]
    Signed-off-by: Alexandre Julliard [e-mail]

wine commit id 7dc42119b40ad39165d881dd8d0e410d3e84fe5a by Sven Baars [e-mail]
---
 dll/directx/wine/d3dx9_36/effect.c | 3 ++-
 sdk/tools/winesync/d3dx9.cfg       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index d1f3bcfdb5a..5f35b8299f1 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -523,6 +523,7 @@ static void free_sampler(struct d3dx_sampler *sampler)
         free_state(&sampler->states[i]);
     }
     HeapFree(GetProcessHeap(), 0, sampler->states);
+    HeapFree(GetProcessHeap(), 0, sampler);
 }

static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param);
@@ -555,7 +556,7 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child)
             case D3DXPT_SAMPLER3D:
             case D3DXPT_SAMPLERCUBE:
                 free_sampler((struct d3dx_sampler *)param->data);
-                break;
+                return;

default:
                 FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type));
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index d0a006e01fa..daefa022c1d 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: 63443f249f4dfe748ce3872e74ecf5c1d8aa55d9}
+tags: {wine: 7dc42119b40ad39165d881dd8d0e410d3e84fe5a}