widl: Never use the namespace ABI prefix for global types.

Otherwise we end up with types like ABI::IInspectable. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Never use the namespace ABI prefix for global types.
a7805374 · Steve Lhomme · Alexandre Julliard · d89b304e · a7805374
Commit a7805374 authored Feb 19, 2021 by Steve Lhomme Committed by Alexandre Julliard Feb 19, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/tools/widl/typetree.c
+++ b/tools/widl/typetree.c
@@ -105,9 +105,10 @@ static size_t append_namespace(char **buf, size_t *len, size_t pos, struct names
 static size_t append_namespaces(char **buf, size_t *len, size_t pos, struct namespace *namespace, const char *prefix,
                                const char *separator, const char *suffix, const char *abi_prefix)
 {
+    int nested = namespace && !is_global_namespace(namespace);
    size_t n = 0;
    n += strappend(buf, len, pos + n, "%s", prefix);
-    n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix);
+    if (nested) n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix);
    n += strappend(buf, len, pos + n, "%s", suffix);
    return n;
 }