Paul Gofman : d3dx9: Return NULL for child parameter' s annotation in get_parameter_by_name().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f09bf52d5d2fec66b968bffbdd9a5b3a9027604c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f09bf52d5d2fec66b968bffbdd...

Author: Paul Gofman 
Date:   Wed Jul 19 16:43:05 2017 +0300

d3dx9: Return NULL for child parameter's annotation in get_parameter_by_name().

Signed-off-by: Paul Gofman 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx9_36/effect.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 937536a..48f5546 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -931,7 +931,9 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
                     return get_parameter_by_name(NULL, temp_parameter, part);

case '@':
-                    return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotations, part);
+                    return parameter ? NULL
+                            : get_annotation_by_name(temp_parameter->annotation_count,
+                            temp_parameter->annotations, part);

case '[':
                     return get_parameter_element_by_name(temp_parameter, part);