Module: wine Branch: master Commit: 0c6345322983ed3df9100b801aaa56367b37a501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c6345322983ed3df9100b801...
Author: Michael Stefaniuc mstefani@winehq.org Date: Tue Mar 19 08:51:27 2019 +0100
d3dx9: Move full_name_tmp_size 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5912e63..9986c8e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -161,8 +161,6 @@ struct d3dx9_base_effect DWORD flags;
ULONG64 version_counter; - - unsigned int full_name_tmp_size; };
struct d3dx_effect @@ -176,6 +174,7 @@ struct d3dx_effect struct d3dx_object *objects; struct wine_rb_tree param_tree; char *full_name_tmp; + unsigned int full_name_tmp_size;
struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -928,7 +927,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, name_len = strlen(name); param_name_len = strlen(parameter->full_name); full_name_size = name_len + param_name_len + 2; - if (base->full_name_tmp_size < full_name_size) + if (effect->full_name_tmp_size < full_name_size) { if (!(full_name = heap_realloc(effect->full_name_tmp, full_name_size))) { @@ -936,7 +935,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } effect->full_name_tmp = full_name; - base->full_name_tmp_size = full_name_size; + effect->full_name_tmp_size = full_name_size; } else {