From 52ae9be12af9de7123d4ab6a76928343faf8a2c7 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 9 Nov 2022 12:36:34 +0100 Subject: [PATCH] winevulkan: Always fill output in fill_luid_property. --- dlls/winevulkan/loader.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 20bd9d38c27..cddcd0360ac 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -414,26 +414,26 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) { device_luid_valid = VK_TRUE; device_node_mask = 1; - - if (id) - { - memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); - id->deviceLUIDValid = device_luid_valid; - id->deviceNodeMask = device_node_mask; - } - - if (vk11) - { - memcpy(&vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID)); - vk11->deviceLUIDValid = device_luid_valid; - vk11->deviceNodeMask = device_node_mask; - } break; } } SetupDiDestroyDeviceInfoList(devinfo); release_display_device_init_mutex(mutex); + if (id) + { + if (device_luid_valid) memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); + id->deviceLUIDValid = device_luid_valid; + id->deviceNodeMask = device_node_mask; + } + + if (vk11) + { + if (device_luid_valid) memcpy(&vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID)); + vk11->deviceLUIDValid = device_luid_valid; + vk11->deviceNodeMask = device_node_mask; + } + TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08lx:%08lx deviceNodeMask:%#x.\n", properties2->properties.deviceName, device_luid_valid, luid.HighPart, luid.LowPart, device_node_mask);