https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2493cdf2628cd472be383d0f371da6a34c38510a
commit 2493cdf2628cd472be383d0f371da6a34c38510a Author: winesync <[email protected]> AuthorDate: Mon Sep 21 22:40:29 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Thu Feb 4 16:37:03 2021 +0100 [WINESYNC] d3dx9: Move full_name_tmp out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <[email protected]> Signed-off-by: Matteo Bruni <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 3779ff07b048bfdaf67674db89aedaa1e4b1e810 by Michael Stefaniuc <[email protected]> --- dll/directx/wine/d3dx9_36/effect.c | 10 +++++----- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index f03e9c95377..8cea5cc9440 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -166,7 +166,6 @@ struct d3dx9_base_effect ULONG64 version_counter; - char *full_name_tmp; unsigned int full_name_tmp_size; }; @@ -180,6 +179,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; @@ -694,7 +694,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) { @@ -934,17 +934,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] = '.'; diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 5fef219d7b2..b388313b72a 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h, include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h, include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h} -tags: {wine: adc1b5a8bc6bcce427e231485015da43d24ca5cb} +tags: {wine: 3779ff07b048bfdaf67674db89aedaa1e4b1e810}
