ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Pass a struct d3dx_effect to d3dx9_base_effect_cleanup(). 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2019-03-15 22:39:17 +01:00 committed by Alexandre Julliard
parent 7738fec56b
commit 2f16d2f4ca
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/d3dx9_36/effect.c
View File

@ -683,8 +683,9 @@ static void free_technique(struct d3dx_technique *technique)
technique->name = NULL; technique->name = NULL;
} }
static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect)
{ {
struct d3dx9_base_effect *base = &effect->base_effect;
unsigned int i; unsigned int i;
TRACE("base %p.\n", base); TRACE("base %p.\n", base);
@ -693,7 +694,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base)
if (base->parameters) if (base->parameters)
{ {
for (i = 0; i < base->effect->parameter_count; ++i) for (i = 0; i < effect->parameter_count; ++i)
free_top_level_parameter(&base->parameters[i]); free_top_level_parameter(&base->parameters[i]);
HeapFree(GetProcessHeap(), 0, base->parameters); HeapFree(GetProcessHeap(), 0, base->parameters);
base->parameters = NULL; base->parameters = NULL;
@ -707,14 +708,14 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base)
base->techniques = NULL; base->techniques = NULL;
} }
if (base->effect->objects) if (effect->objects)
{ {
for (i = 0; i < base->effect->object_count; ++i) for (i = 0; i < effect->object_count; ++i)
{ {
free_object(&base->effect->objects[i]); free_object(&effect->objects[i]);
} }
HeapFree(GetProcessHeap(), 0, base->effect->objects); heap_free(effect->objects);
base->effect->objects = NULL; effect->objects = NULL;
} }
} }
@ -722,7 +723,7 @@ static void free_effect(struct d3dx_effect *effect)
{ {
TRACE("Free effect %p\n", effect); TRACE("Free effect %p\n", effect);
d3dx9_base_effect_cleanup(&effect->base_effect); d3dx9_base_effect_cleanup(effect);
if (effect->pool) if (effect->pool)
{ {
@ -6302,7 +6303,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base,
debugstr_a(skip_constants[i]), j); debugstr_a(skip_constants[i]), j);
HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants_buffer);
HeapFree(GetProcessHeap(), 0, skip_constants); HeapFree(GetProcessHeap(), 0, skip_constants);
d3dx9_base_effect_cleanup(base); d3dx9_base_effect_cleanup(effect);
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }
} }