Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Remove redundant "not NULL" checks (coccinellery).

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 be30aab1e21e5b6811470a351ec0d6100e6e7687 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:24 +02:00 committed by Jérôme Gardou
parent 6760065ef2
commit 393ec322ef
2 changed files with 21 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -952,15 +952,14 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
return NULL; return NULL;
} }
count = parameter ? parameter->member_count : base->parameter_count; count = parameter->member_count;
length = strcspn( name, "[.@" ); length = strcspn( name, "[.@" );
part = name + length; part = name + length;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
temp_parameter = !parameter ? &base->parameters[i].param temp_parameter = &parameter->members[i];
: &parameter->members[i];
if (!strcmp(temp_parameter->name, name)) 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); return get_parameter_by_name(base, temp_parameter, part);
case '@': case '@':
{ return NULL;
struct d3dx_top_level_parameter *top_param
= top_level_parameter_from_parameter(temp_parameter);
return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count,
top_param->annotations, part);
}
case '[': case '[':
return get_parameter_element_by_name(base, temp_parameter, part); return get_parameter_element_by_name(base, temp_parameter, part);

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

@ -1,37 +1,18 @@
directories: directories: {dlls/d3dx9_24: dll/directx/wine/d3dx9_24, dlls/d3dx9_25: dll/directx/wine/d3dx9_25,
dlls/d3dx9_24: dll/directx/wine/d3dx9_24 dlls/d3dx9_26: dll/directx/wine/d3dx9_26, dlls/d3dx9_27: dll/directx/wine/d3dx9_27,
dlls/d3dx9_25: dll/directx/wine/d3dx9_25 dlls/d3dx9_28: dll/directx/wine/d3dx9_28, dlls/d3dx9_29: dll/directx/wine/d3dx9_29,
dlls/d3dx9_26: dll/directx/wine/d3dx9_26 dlls/d3dx9_30: dll/directx/wine/d3dx9_30, dlls/d3dx9_31: dll/directx/wine/d3dx9_31,
dlls/d3dx9_27: dll/directx/wine/d3dx9_27 dlls/d3dx9_32: dll/directx/wine/d3dx9_32, dlls/d3dx9_33: dll/directx/wine/d3dx9_33,
dlls/d3dx9_28: dll/directx/wine/d3dx9_28 dlls/d3dx9_34: dll/directx/wine/d3dx9_34, dlls/d3dx9_35: dll/directx/wine/d3dx9_35,
dlls/d3dx9_29: dll/directx/wine/d3dx9_29 dlls/d3dx9_36: dll/directx/wine/d3dx9_36, dlls/d3dx9_36/tests: modules/rostests/winetests/d3dx9_36,
dlls/d3dx9_30: dll/directx/wine/d3dx9_30 dlls/d3dx9_37: dll/directx/wine/d3dx9_37, dlls/d3dx9_38: dll/directx/wine/d3dx9_38,
dlls/d3dx9_31: dll/directx/wine/d3dx9_31 dlls/d3dx9_39: dll/directx/wine/d3dx9_39, dlls/d3dx9_40: dll/directx/wine/d3dx9_40,
dlls/d3dx9_32: dll/directx/wine/d3dx9_32 dlls/d3dx9_41: dll/directx/wine/d3dx9_41, dlls/d3dx9_42: dll/directx/wine/d3dx9_42,
dlls/d3dx9_33: dll/directx/wine/d3dx9_33 dlls/d3dx9_43: dll/directx/wine/d3dx9_43}
dlls/d3dx9_34: dll/directx/wine/d3dx9_34 files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/include/dxsdk/d3dx9anim.h,
dlls/d3dx9_35: dll/directx/wine/d3dx9_35 include/d3dx9core.h: sdk/include/dxsdk/d3dx9core.h, include/d3dx9effect.h: sdk/include/dxsdk/d3dx9effect.h,
dlls/d3dx9_36: dll/directx/wine/d3dx9_36 include/d3dx9math.h: sdk/include/dxsdk/d3dx9math.h, include/d3dx9math.inl: sdk/include/dxsdk/d3dx9math.inl,
dlls/d3dx9_36/tests: modules/rostests/winetests/d3dx9_36 include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
dlls/d3dx9_37: dll/directx/wine/d3dx9_37 include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
dlls/d3dx9_38: dll/directx/wine/d3dx9_38 include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
dlls/d3dx9_39: dll/directx/wine/d3dx9_39 tags: {wine: be30aab1e21e5b6811470a351ec0d6100e6e7687}
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