Krzysztof Bogacki : win32u: Prefer Vulkan UUIDs over empty ones.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ef36081fe7b0b449c990db80f97cfd5d23e852f6
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ef36081fe7b0b449c990db80f97cfd5...

Author: Krzysztof Bogacki 
Date:   Tue May 28 01:13:21 2024 +0200

win32u: Prefer Vulkan UUIDs over empty ones.

Signed-off-by: Krzysztof Bogacki

---

dlls/win32u/sysparams.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 890ca8129de..49bf26214e7 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -1218,6 +1218,8 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID *
     HKEY hkey, subkey;
     DWORD len;

+    static const GUID empty_uuid;
+
     TRACE( "%s %04X %04X %08X %02X %s\n", debugstr_a( name ), pci_id->vendor, pci_id->device,
            pci_id->subsystem, pci_id->revision, debugstr_guid( vulkan_uuid ) );

@@ -1249,7 +1251,7 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID *
                debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name));
     }

-    if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid;
+    if (vulkan_uuid && !IsEqualGUID( vulkan_uuid, &empty_uuid )) ctx->gpu.vulkan_uuid = *vulkan_uuid;
     else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid;

if (!pci_id->vendor && !pci_id->device && vulkan_gpu) pci_id = &vulkan_gpu->pci_id;