Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 00:50:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Move full_name_tmp out of struct d3dx9_base_effect.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 3779ff07b048bfdaf67674db89aedaa1e4b1e810 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:29 +02:00 committed by Jérôme Gardou
parent 826d5b5fcb
commit 2493cdf262
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dll/directx/wine/d3dx9_36/effect.c
View file

@ -166,7 +166,6 @@ struct d3dx9_base_effect
ULONG64 version_counter; ULONG64 version_counter;
char *full_name_tmp;
unsigned int full_name_tmp_size; unsigned int full_name_tmp_size;
}; };
@ -180,6 +179,7 @@ struct d3dx_effect
unsigned int object_count; unsigned int object_count;
struct d3dx_object *objects; struct d3dx_object *objects;
struct wine_rb_tree param_tree; struct wine_rb_tree param_tree;
char *full_name_tmp;
struct ID3DXEffectStateManager *manager; struct ID3DXEffectStateManager *manager;
struct IDirect3DDevice9 *device; struct IDirect3DDevice9 *device;
@ -694,7 +694,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect)
TRACE("base %p.\n", base); TRACE("base %p.\n", base);
heap_free(base->full_name_tmp); heap_free(effect->full_name_tmp);
if (base->parameters) 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; full_name_size = name_len + param_name_len + 2;
if (base->full_name_tmp_size < full_name_size) 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"); ERR("Out of memory.\n");
return NULL; return NULL;
} }
base->full_name_tmp = full_name; effect->full_name_tmp = full_name;
base->full_name_tmp_size = full_name_size; base->full_name_tmp_size = full_name_size;
} }
else else
{ {
full_name = base->full_name_tmp; full_name = effect->full_name_tmp;
} }
memcpy(full_name, parameter->full_name, param_name_len); memcpy(full_name, parameter->full_name, param_name_len);
full_name[param_name_len] = '.'; full_name[param_name_len] = '.';

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -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/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/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} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: adc1b5a8bc6bcce427e231485015da43d24ca5cb} tags: {wine: 3779ff07b048bfdaf67674db89aedaa1e4b1e810}