[PATCH 2/2] widl: Avoid creating duplicate typelib type entries for enums and unions too.

[Zebediah Figura]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47035
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 tools/widl/typetree.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c
index 4a78350858..fc40fbaa7c 100644
--- a/tools/widl/typetree.c
+++ b/tools/widl/typetree.c
@@ -273,14 +273,17 @@ type_t *type_new_void(void)
 
 type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums)
 {
-    type_t *tag_type = name ? find_type(name, namespace, tsENUM) : NULL;
-    type_t *t = make_type(TYPE_ENUM);
+    type_t *t;
+
+    /* avoid creating duplicate typelib type entries */
+    if (name && (t = find_type(name, namespace, tsENUM)))
+        return t;
+
+    t = make_type(TYPE_ENUM);
     t->name = name;
     t->namespace = namespace;
 
-    if (tag_type && tag_type->details.enumeration)
-        t->details.enumeration = tag_type->details.enumeration;
-    else if (defined)
+    if (defined)
     {
         t->details.enumeration = xmalloc(sizeof(*t->details.enumeration));
         t->details.enumeration->enums = enums;
@@ -327,12 +330,16 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va
 
 type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields)
 {
-    type_t *tag_type = name ? find_type(name, NULL, tsUNION) : NULL;
-    type_t *t = make_type(TYPE_UNION);
+    type_t *t;
+
+    /* avoid creating duplicate typelib type entries */
+    if (name && (t = find_type(name, NULL, tsUNION)))
+        return t;
+
+    t = make_type(TYPE_UNION);
     t->name = name;
-    if (tag_type && tag_type->details.structure)
-        t->details.structure = tag_type->details.structure;
-    else if (defined)
+
+    if (defined)
     {
         t->details.structure = xmalloc(sizeof(*t->details.structure));
         t->details.structure->fields = fields;
-- 
2.21.0