widl: Avoid generating duplicate typelib entries for structure tag names.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Avoid generating duplicate typelib entries for structure tag names.
ded915aa · Dmitry Timoshkov · Alexandre Julliard · 3cd67463 · ded915aa
Commit ded915aa authored Nov 03, 2015 by Dmitry Timoshkov Committed by Alexandre Julliard Nov 05, 2015
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

typetree.c tools/widl/typetree.c +6 -1

No files found.
--- a/tools/widl/typetree.c
+++ b/tools/widl/typetree.c
@@ -300,7 +300,12 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined
 type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields)
 {
    type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL;
-    type_t *t = make_type(TYPE_STRUCT);
+    type_t *t;
+
+    /* avoid creating duplicate typelib type entries */
+    if (tag_type && do_typelib) return tag_type;
+
+    t = make_type(TYPE_STRUCT);
    t->name = name;
    t->namespace = namespace;