Elizabeth Figura : widl: Do not write type definitions for types defined in an imported header.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 93d50fd9de906b7acfa4b5b8c40bff394a2df4e2
URL:    https://gitlab.winehq.org/wine/wine/-/commit/93d50fd9de906b7acfa4b5b8c40bff3...

Author: Elizabeth Figura 
Date:   Mon Mar 25 18:37:42 2024 -0500

widl: Do not write type definitions for types defined in an imported header.

midl does not, and this would result in redefinition errors.

An equivalent (and arguably a bit more declarative) way to do this would be to
keep track in the parser whether a type or typedef statement is actually a
definition or not, and record that information in the statement_t. However, this
would require passing additional information alongside the type_t from each
relevant bison rule, which would thrash a lot of code.

---

tools/widl/parser.y    | 6 +++---
 tools/widl/typetree.c  | 2 ++
 tools/widl/widltypes.h | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/widl/parser.y b/tools/widl/parser.y
index d8363afa981..f5b82f29db3 100644
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -1359,7 +1359,7 @@ type:
 typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list
    					{ $1 = append_attribs($1, $3);
    					  reg_typedefs( @$, $4, $5, check_typedef_attrs( $1 ) );
-						  $$ = make_statement_typedef($5, $4->type->defined);
+						  $$ = make_statement_typedef($5, $4->type->defined && !$4->type->defined_in_import);
    					}
    ;

@@ -1719,7 +1719,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator
   v->declspec.type = decl->type;
   v->declspec.qualifier = decl->qualifier;
   v->attrs = attrs;
-  v->is_defined = type->defined;
+  v->is_defined = type->defined && !type->defined_in_import;

if (is_attr(type->attrs, ATTR_CALLCONV) && !is_func(type))
     error_loc("calling convention applied to non-function type\n");
@@ -2833,7 +2833,7 @@ static statement_t *make_statement_type_decl(type_t *type)
 {
     statement_t *stmt = make_statement(STMT_TYPE);
     stmt->u.type = type;
-    stmt->is_defined = type->defined;
+    stmt->is_defined = type->defined && !type->defined_in_import;
     return stmt;
 }

diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c
index ea17f16e0c8..af41906c42b 100644
--- a/tools/widl/typetree.c
+++ b/tools/widl/typetree.c
@@ -536,6 +536,7 @@ static void define_type(type_t *type, const struct location *where)
         error_loc("type %s already defined at %s:%d\n", type->name, type->where.input_name, type->where.first_line );

type->defined = TRUE;
+    type->defined_in_import = parse_only;
     type->where = *where;
 }

@@ -935,6 +936,7 @@ type_t *type_delegate_define(type_t *delegate, attr_list_t *attrs,
     iface->details.iface->disp_inherit = NULL;
     iface->details.iface->async_iface = NULL;
     iface->details.iface->requires = NULL;
+    define_type(iface, where);
     iface->defined = TRUE;
     compute_method_indexes(iface);

diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h
index 9d99c83a25e..7bc24fad0d3 100644
--- a/tools/widl/widltypes.h
+++ b/tools/widl/widltypes.h
@@ -523,6 +523,7 @@ struct _type_t {
   struct location where;
   unsigned int ignore : 1;
   unsigned int defined : 1;
+  unsigned int defined_in_import : 1;
   unsigned int written : 1;
   unsigned int user_types_registered : 1;
   unsigned int tfswrite : 1;   /* if the type needs to be written to the TFS */