widl: Fix missing support for struct / union parameterized type replacement.

And we can just pass them through, as with other class types. This fixes widl not accepting EventRegistrationToken method argument type in a parameterized type. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>

widl: Fix missing support for struct / union parameterized type replacement.
25e1fb45 · Rémi Bernon · Alexandre Julliard · 82c30480 · 25e1fb45
Commit 25e1fb45 authored Feb 13, 2022 by Rémi Bernon Committed by Alexandre Julliard Jul 07, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

typetree.c tools/widl/typetree.c +3 -3

No files found.
--- a/tools/widl/typetree.c
+++ b/tools/widl/typetree.c
@@ -1157,6 +1157,9 @@ static type_t *replace_type_parameters_in_type(type_t *type, typeref_list_t *ori
    case TYPE_INTERFACE:
    case TYPE_RUNTIMECLASS:
    case TYPE_DELEGATE:
+    case TYPE_STRUCT:
+    case TYPE_ENCAPSULATED_UNION:
+    case TYPE_UNION:
        return type;
    case TYPE_PARAMETER:
        if (!orig || !repl) return NULL;
@@ -1194,9 +1197,6 @@ static type_t *replace_type_parameters_in_type(type_t *type, typeref_list_t *ori
        if (t->type_type != TYPE_PARAMETERIZED_TYPE) return find_parameterized_type(type, repl);
        repl = replace_type_parameters_in_type_list(type->details.parameterized.params, orig, repl);
        return replace_type_parameters_in_type(t, t->details.parameterized.params, repl);
-    case TYPE_STRUCT:
-    case TYPE_ENCAPSULATED_UNION:
-    case TYPE_UNION:
    case TYPE_MODULE:
    case TYPE_COCLASS:
    case TYPE_APICONTRACT: