Module: wine Branch: master Commit: 07ae14ad4c2acf8fe2d1250dd0faa4cad464bc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ae14ad4c2acf8fe2d1250dd0...
Author: Rico Schüller kgbricola@web.de Date: Sat Aug 18 14:58:40 2012 +0200
d3dx9: Return NULL if name is not given.
---
dlls/d3dx9_36/effect.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 80f7549..2a0b01c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -970,7 +970,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete
TRACE("parameter %p, name %s\n", parameter, debugstr_a(name));
- if (!name || !*name) return parameter; + if (!name || !*name) return NULL;
element = atoi(name); part = strchr(name, ']') + 1; @@ -1009,7 +1009,7 @@ static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_param
TRACE("parameter %p, name %s\n", parameter, debugstr_a(name));
- if (!name || !*name) return parameter; + if (!name || !*name) return NULL;
length = strcspn( name, "[.@" ); part = name + length; @@ -1054,7 +1054,7 @@ static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl *
TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name));
- if (!name || !*name) return parameter; + if (!name || !*name) return NULL;
if (!parameter) {