Module: wine Branch: master Commit: 3779ff07b048bfdaf67674db89aedaa1e4b1e810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3779ff07b048bfdaf67674db8...
Author: Michael Stefaniuc mstefani@winehq.org Date: Tue Mar 19 08:51:26 2019 +0100
d3dx9: Move full_name_tmp out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc mstefani@winehq.org Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx9_36/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c7b29ef..5912e63 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -162,7 +162,6 @@ struct d3dx9_base_effect
ULONG64 version_counter;
- char *full_name_tmp; unsigned int full_name_tmp_size; };
@@ -176,6 +175,7 @@ struct d3dx_effect unsigned int object_count; struct d3dx_object *objects; struct wine_rb_tree param_tree; + char *full_name_tmp;
struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -690,7 +690,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect)
TRACE("base %p.\n", base);
- heap_free(base->full_name_tmp); + heap_free(effect->full_name_tmp);
if (base->parameters) { @@ -930,17 +930,17 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, full_name_size = name_len + param_name_len + 2; if (base->full_name_tmp_size < full_name_size) { - if (!(full_name = heap_realloc(base->full_name_tmp, full_name_size))) + if (!(full_name = heap_realloc(effect->full_name_tmp, full_name_size))) { ERR("Out of memory.\n"); return NULL; } - base->full_name_tmp = full_name; + effect->full_name_tmp = full_name; base->full_name_tmp_size = full_name_size; } else { - full_name = base->full_name_tmp; + full_name = effect->full_name_tmp; } memcpy(full_name, parameter->full_name, param_name_len); full_name[param_name_len] = '.';