https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee5b715bdefc0415205ca0...
commit ee5b715bdefc0415205ca042234a3cdc48bfb304 Author: winesync ros-dev@reactos.org AuthorDate: Mon Sep 21 22:40:29 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Thu Feb 4 16:37:03 2021 +0100
[WINESYNC] 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
wine commit id 0c6345322983ed3df9100b801aaa56367b37a501 by Michael Stefaniuc mstefani@winehq.org --- dll/directx/wine/d3dx9_36/effect.c | 7 +++---- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index 8cea5cc9440..91a0a1b5721 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -165,8 +165,6 @@ struct d3dx9_base_effect DWORD flags;
ULONG64 version_counter; - - unsigned int full_name_tmp_size; };
struct d3dx_effect @@ -180,6 +178,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; @@ -932,7 +931,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))) { @@ -940,7 +939,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 { diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index b388313b72a..9b9ed9560eb 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: 3779ff07b048bfdaf67674db89aedaa1e4b1e810} +tags: {wine: 0c6345322983ed3df9100b801aaa56367b37a501}