https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abc581711234f0e9801c47...
commit abc581711234f0e9801c47abc50b4111219741aa Author: winesync ros-dev@reactos.org AuthorDate: Mon Sep 21 23:01:49 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Thu Feb 4 16:37:04 2021 +0100
[WINESYNC] d3dx9: Remove redundant NULL check before heap_free().
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 a0a5c64bd5d4240d8a7a9913c77730458262d450 by Michael Stefaniuc mstefani@winehq.org --- dll/directx/wine/d3dx9_36/effect.c | 4 +--- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index 895cbdef5af..b4d367a50f0 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -584,9 +584,7 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil HeapFree(GetProcessHeap(), 0, param->members); }
- if (param->full_name) - heap_free(param->full_name); - + heap_free(param->full_name); free_parameter_data(param, child);
/* only the parent has to release name and semantic */ diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index b7a46b5de82..69ffe745351 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: aef11864a47a33830eca086de8bf337ee9b5114a} +tags: {wine: a0a5c64bd5d4240d8a7a9913c77730458262d450}
-
winesync