Steve Lhomme : widl: Use C name when writing UUID declarations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 49a1cc10d2db6ed7257b2e3a70d41d09dbff5ad9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=49a1cc10d2db6ed7257b2e3a7...

Author: Steve Lhomme 
Date:   Fri Feb 19 12:04:00 2021 +0100

widl: Use C name when writing UUID declarations.

Signed-off-by: Rémi Bernon 
Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

tools/widl/header.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/widl/header.c b/tools/widl/header.c
index e1dcab9b75b..82aad0f11ca 100644
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -135,15 +135,13 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const

static void write_uuid_decl(FILE *f, type_t *type, const UUID *uuid)
 {
-  char *name = format_namespace(type->namespace, "", "::", type->name, use_abi_namespace ? "ABI" : NULL);
   fprintf(f, "#ifdef __CRT_UUID_DECL\n");
   fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x,"
         "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n",
-        name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1],
+        type->c_name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1],
         uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6],
         uuid->Data4[7]);
   fprintf(f, "#endif\n");
-  free(name);
 }

static const char *uuid_string(const UUID *uuid)