d3dx9: Always free samplers (Valgrind).

Signed-off-by: Sven Baars <sven.wine@gmail.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Always free samplers (Valgrind).
7dc42119 · Sven Baars · Alexandre Julliard · 63443f24 · 7dc42119
Commit 7dc42119 authored May 25, 2019 by Sven Baars Committed by Alexandre Julliard May 27, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

effect.c dlls/d3dx9_36/effect.c +2 -1

No files found.
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -519,6 +519,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);
@@ -551,7 +552,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));