d3dx9: Avoid double freeing samplers.

Signed-off-by: Paul Gofman <gofmanp@gmail.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Avoid double freeing samplers.
6aced396 · Paul Gofman · Alexandre Julliard · c799c1ea · 6aced396
Commit 6aced396 authored Nov 18, 2019 by Paul Gofman Committed by Alexandre Julliard Nov 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

effect.c dlls/d3dx9_36/effect.c +4 -5

No files found.
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -516,8 +516,7 @@ static void free_sampler(struct d3dx_sampler *sampler)
    {
        free_state(&sampler->states[i]);
    }
-    HeapFree(GetProcessHeap(), 0, sampler->states);
+    heap_free(sampler->states);
-    HeapFree(GetProcessHeap(), 0, sampler);
 }
 static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param);
@@ -531,7 +530,7 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child)
        switch (param->type)
        {
            case D3DXPT_STRING:
-                HeapFree(GetProcessHeap(), 0, *(char **)param->data);
+                heap_free(*(char **)param->data);
                break;
            case D3DXPT_TEXTURE:
@@ -557,8 +556,8 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child)
                break;
        }
    }
-    if (!child)
+    if (!child || is_param_type_sampler(param->type))
-        HeapFree(GetProcessHeap(), 0, param->data);
+        heap_free(param->data);
 }
 static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child)