[PATCH 2/5] d3dx9: Return NULL for child parameter's annotation in get_parameter_by_name().

Paul Gofman gofmanp at gmail.com
Wed Jul 19 08:43:05 CDT 2017


Signed-off-by: Paul Gofman <gofmanp at gmail.com>
---
 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 937536ae84..48f5546077 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);
-- 
2.13.3




More information about the wine-patches mailing list