widl: Ignore assignment of a duplicate uuid.

MSDN KB285146 article describes this behaviour, and the tests confirm that. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Ignore assignment of a duplicate uuid.
42c328dd · Dmitry Timoshkov · Alexandre Julliard · 58b0788a · 42c328dd
Commit 42c328dd authored Nov 03, 2015 by Dmitry Timoshkov Committed by Alexandre Julliard Nov 05, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

write_msft.c tools/widl/write_msft.c +13 -1

No files found.
--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -494,10 +494,22 @@ static int ctl2_alloc_guid(
    MSFT_GuidEntry *guid_space;
    int hash_key;

+    chat("adding uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
+         guid->guid.Data1, guid->guid.Data2, guid->guid.Data3,
+         guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3],
+         guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]);
+
    hash_key = ctl2_hash_guid(&guid->guid);

    offset = ctl2_find_guid(typelib, hash_key, &guid->guid);
-    if (offset != -1) return offset;
+    if (offset != -1)
+    {
+        warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
+                guid->guid.Data1, guid->guid.Data2, guid->guid.Data3,
+                guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3],
+                guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]);
+        return -1;
+    }

    offset = ctl2_alloc_segment(typelib, MSFT_SEG_GUID, sizeof(MSFT_GuidEntry), 0);