[PATCH 18/20] dlls/vulkan-1/tests: enable compilation with long types

Eric Pouech eric.pouech at gmail.com
Tue Mar 8 02:31:41 CST 2022


Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/vulkan-1/tests/Makefile.in |    1 -
 dlls/vulkan-1/tests/vulkan.c    |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/vulkan-1/tests/Makefile.in b/dlls/vulkan-1/tests/Makefile.in
index 6bff576d70f..c9f9f0727c8 100644
--- a/dlls/vulkan-1/tests/Makefile.in
+++ b/dlls/vulkan-1/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = vulkan-1.dll
 IMPORTS = vulkan-1
 
diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c
index 75e48bfc9d1..11d20120d1d 100644
--- a/dlls/vulkan-1/tests/vulkan.c
+++ b/dlls/vulkan-1/tests/vulkan.c
@@ -209,7 +209,7 @@ static void test_enumerate_physical_device2(void)
 
             pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[j], &properties2);
             luid = (const LUID *)id.deviceLUID;
-            trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n",
+            trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08lx:%08lx.\n",
                   properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID),
                   wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart);
             ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n");
@@ -584,7 +584,7 @@ static void test_cross_process_resource(VkPhysicalDeviceIDPropertiesKHR *device_
     sprintf(buf, "\"%s\" vulkan resource %s %s %s %p", argv[0], driver_uuid, device_uuid,
                                                         kmt ? "kmt" : "nt", handle);
     res = CreateProcessA(NULL, buf, NULL, NULL, TRUE, 0L, NULL, NULL, &si, &info);
-    ok(res, "CreateProcess failed: %u\n", GetLastError());
+    ok(res, "CreateProcess failed: %lu\n", GetLastError());
     CloseHandle(info.hThread);
 
     wait_child_process(info.hProcess);




More information about the wine-devel mailing list