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

Signed-off-by: Paul Gofman <gofmanp@gmail.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Return NULL for child parameter's annotation in get_parameter_by_name().
f09bf52d · Paul Gofman · Alexandre Julliard · ec199c9e · f09bf52d
Commit f09bf52d authored Jul 19, 2017 by Paul Gofman Committed by Alexandre Julliard Aug 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

effect.c dlls/d3dx9_36/effect.c +3 -1

No files found.
--- 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);