https://git.reactos.org/?p=reactos.git;a=commitdiff;h=393ec322efa348945982cbd3d30e5e734397bf13
commit 393ec322efa348945982cbd3d30e5e734397bf13 Author: winesync <[email protected]> AuthorDate: Mon Sep 21 22:40:24 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Thu Feb 4 16:37:01 2021 +0100 [WINESYNC] d3dx9: Remove redundant "not NULL" checks (coccinellery). Signed-off-by: Michael Stefaniuc <[email protected]> Signed-off-by: Matteo Bruni <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id be30aab1e21e5b6811470a351ec0d6100e6e7687 by Michael Stefaniuc <[email protected]> --- dll/directx/wine/d3dx9_36/effect.c | 12 +++------ sdk/tools/winesync/d3dx9.cfg | 55 +++++++++++++------------------------- 2 files changed, 21 insertions(+), 46 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index 9a2e41ae90d..0f228b9c39e 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -952,15 +952,14 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } - count = parameter ? parameter->member_count : base->parameter_count; + count = parameter->member_count; length = strcspn( name, "[.@" ); part = name + length; for (i = 0; i < count; i++) { - temp_parameter = !parameter ? &base->parameters[i].param - : ¶meter->members[i]; + temp_parameter = ¶meter->members[i]; if (!strcmp(temp_parameter->name, name)) { @@ -975,13 +974,8 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(base, temp_parameter, part); case '@': - { - struct d3dx_top_level_parameter *top_param - = top_level_parameter_from_parameter(temp_parameter); + return NULL; - return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count, - top_param->annotations, part); - } case '[': return get_parameter_element_by_name(base, temp_parameter, part); diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index cefdb2502a3..55560f4c4e3 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -1,37 +1,18 @@ -directories: - dlls/d3dx9_24: dll/directx/wine/d3dx9_24 - dlls/d3dx9_25: dll/directx/wine/d3dx9_25 - dlls/d3dx9_26: dll/directx/wine/d3dx9_26 - dlls/d3dx9_27: dll/directx/wine/d3dx9_27 - dlls/d3dx9_28: dll/directx/wine/d3dx9_28 - dlls/d3dx9_29: dll/directx/wine/d3dx9_29 - dlls/d3dx9_30: dll/directx/wine/d3dx9_30 - dlls/d3dx9_31: dll/directx/wine/d3dx9_31 - dlls/d3dx9_32: dll/directx/wine/d3dx9_32 - dlls/d3dx9_33: dll/directx/wine/d3dx9_33 - dlls/d3dx9_34: dll/directx/wine/d3dx9_34 - dlls/d3dx9_35: dll/directx/wine/d3dx9_35 - dlls/d3dx9_36: dll/directx/wine/d3dx9_36 - dlls/d3dx9_36/tests: modules/rostests/winetests/d3dx9_36 - dlls/d3dx9_37: dll/directx/wine/d3dx9_37 - dlls/d3dx9_38: dll/directx/wine/d3dx9_38 - dlls/d3dx9_39: dll/directx/wine/d3dx9_39 - dlls/d3dx9_40: dll/directx/wine/d3dx9_40 - dlls/d3dx9_41: dll/directx/wine/d3dx9_41 - dlls/d3dx9_42: dll/directx/wine/d3dx9_42 - dlls/d3dx9_43: dll/directx/wine/d3dx9_43 -files: - include/d3dx9.h: sdk/include/dxsdk/d3dx9.h - include/d3dx9anim.h: sdk/include/dxsdk/d3dx9anim.h - include/d3dx9core.h: sdk/include/dxsdk/d3dx9core.h - include/d3dx9effect.h: sdk/include/dxsdk/d3dx9effect.h - include/d3dx9math.h: sdk/include/dxsdk/d3dx9math.h - include/d3dx9math.inl: sdk/include/dxsdk/d3dx9math.inl - 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: wine-4.2 +directories: {dlls/d3dx9_24: dll/directx/wine/d3dx9_24, dlls/d3dx9_25: dll/directx/wine/d3dx9_25, + dlls/d3dx9_26: dll/directx/wine/d3dx9_26, dlls/d3dx9_27: dll/directx/wine/d3dx9_27, + dlls/d3dx9_28: dll/directx/wine/d3dx9_28, dlls/d3dx9_29: dll/directx/wine/d3dx9_29, + dlls/d3dx9_30: dll/directx/wine/d3dx9_30, dlls/d3dx9_31: dll/directx/wine/d3dx9_31, + dlls/d3dx9_32: dll/directx/wine/d3dx9_32, dlls/d3dx9_33: dll/directx/wine/d3dx9_33, + dlls/d3dx9_34: dll/directx/wine/d3dx9_34, dlls/d3dx9_35: dll/directx/wine/d3dx9_35, + dlls/d3dx9_36: dll/directx/wine/d3dx9_36, dlls/d3dx9_36/tests: modules/rostests/winetests/d3dx9_36, + dlls/d3dx9_37: dll/directx/wine/d3dx9_37, dlls/d3dx9_38: dll/directx/wine/d3dx9_38, + dlls/d3dx9_39: dll/directx/wine/d3dx9_39, dlls/d3dx9_40: dll/directx/wine/d3dx9_40, + dlls/d3dx9_41: dll/directx/wine/d3dx9_41, dlls/d3dx9_42: dll/directx/wine/d3dx9_42, + dlls/d3dx9_43: dll/directx/wine/d3dx9_43} +files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/include/dxsdk/d3dx9anim.h, + include/d3dx9core.h: sdk/include/dxsdk/d3dx9core.h, include/d3dx9effect.h: sdk/include/dxsdk/d3dx9effect.h, + include/d3dx9math.h: sdk/include/dxsdk/d3dx9math.h, include/d3dx9math.inl: sdk/include/dxsdk/d3dx9math.inl, + 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: be30aab1e21e5b6811470a351ec0d6100e6e7687}
