winevulkan: Use UNIX_CALL macro for Unix calls.

dlls/winevulkan/loader.c

@@ -89,13 +89,13 @@ static void *wine_vk_get_global_proc_addr(const char *name)
 static BOOL is_available_instance_function(VkInstance instance, const char *name)
 {
     struct is_available_instance_function_params params = { .instance = instance, .name = name };
-    return vk_unix_call(unix_is_available_instance_function, &params);
+    return UNIX_CALL(is_available_instance_function, &params);
 }
 
 static BOOL is_available_device_function(VkDevice device, const char *name)
 {
     struct is_available_device_function_params params = { .device = device, .name = name };
-    return vk_unix_call(unix_is_available_device_function, &params);
+    return UNIX_CALL(is_available_device_function, &params);
 }
 
 static void *alloc_vk_object(size_t size)
@@ -232,10 +232,7 @@ VkResult WINAPI vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_ver
 
 static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
 {
-    NTSTATUS status = __wine_init_unix_call();
-
-    if (status) return FALSE;
-    return !vk_unix_call(unix_init, NULL);
+    return !__wine_init_unix_call() && !UNIX_CALL(init, NULL);
 }
 
 static BOOL  wine_vk_init_once(void)
@@ -270,7 +267,7 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info,
         params.pAllocator = allocator;
         params.pInstance = ret;
         params.client_ptr = instance;
-        status = vk_unix_call(unix_vkCreateInstance, &params);
+        status = UNIX_CALL(vkCreateInstance, &params);
         assert(!status);
         if (instance->phys_dev_count <= phys_dev_count)
             break;
@@ -290,7 +287,7 @@ void WINAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *
 
     params.instance = instance;
     params.pAllocator = pAllocator;
-    status = vk_unix_call(unix_vkDestroyInstance, &params);
+    status = UNIX_CALL(vkDestroyInstance, &params);
     assert(!status);
     free(instance);
 }
@@ -318,7 +315,7 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name,
     params.pLayerName = layer_name;
     params.pPropertyCount = count;
     params.pProperties = properties;
-    status = vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params);
+    status = UNIX_CALL(vkEnumerateInstanceExtensionProperties, &params);
     assert(!status);
     return params.result;
 }
@@ -337,7 +334,7 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version)
     }
 
     params.pApiVersion = version;
-    status = vk_unix_call(unix_vkEnumerateInstanceVersion, &params);
+    status = UNIX_CALL(vkEnumerateInstanceVersion, &params);
     assert(!status);
     return params.result;
 }
@@ -443,7 +440,7 @@ void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev,
 
     params.physicalDevice = phys_dev;
     params.pProperties = properties2;
-    status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2, &params);
+    status = UNIX_CALL(vkGetPhysicalDeviceProperties2, &params);
     assert(!status);
     fill_luid_property(properties2);
 }
@@ -458,7 +455,7 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev,
 
     params.physicalDevice = phys_dev;
     params.pProperties = properties2;
-    status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2KHR, &params);
+    status = UNIX_CALL(vkGetPhysicalDeviceProperties2KHR, &params);
     assert(!status);
     fill_luid_property(properties2);
 }
@@ -483,7 +480,7 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn
     params.pAllocator = allocator;
     params.pDevice = ret;
     params.client_ptr = device;
-    status = vk_unix_call(unix_vkCreateDevice, &params);
+    status = UNIX_CALL(vkCreateDevice, &params);
     assert(!status);
     if (!device->base.unix_handle)
         free(device);
@@ -497,7 +494,7 @@ void WINAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *alloca
 
     params.device = device;
     params.pAllocator = allocator;
-    status = vk_unix_call(unix_vkDestroyDevice, &params);
+    status = UNIX_CALL(vkDestroyDevice, &params);
     assert(!status);
     free(device);
 }
@@ -519,7 +516,7 @@ VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateIn
     params.pAllocator = allocator;
     params.pCommandPool = ret;
     params.client_ptr = cmd_pool;
-    status = vk_unix_call(unix_vkCreateCommandPool, &params);
+    status = UNIX_CALL(vkCreateCommandPool, &params);
     assert(!status);
     if (!cmd_pool->unix_handle)
         free(cmd_pool);
@@ -548,7 +545,7 @@ void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const Vk
     params.device = device;
     params.commandPool = handle;
     params.pAllocator = allocator;
-    status = vk_unix_call(unix_vkDestroyCommandPool, &params);
+    status = UNIX_CALL(vkDestroyCommandPool, &params);
     assert(!status);
     free(cmd_pool);
 }
@@ -567,7 +564,7 @@ VkResult WINAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferA
     params.device = device;
     params.pAllocateInfo = allocate_info;
     params.pCommandBuffers = buffers;
-    status = vk_unix_call(unix_vkAllocateCommandBuffers, &params);
+    status = UNIX_CALL(vkAllocateCommandBuffers, &params);
     assert(!status);
     if (params.result == VK_SUCCESS)
     {
@@ -596,7 +593,7 @@ void WINAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool cmd_pool, uint32
     params.commandPool = cmd_pool;
     params.commandBufferCount = count;
     params.pCommandBuffers = buffers;
-    status = vk_unix_call(unix_vkFreeCommandBuffers, &params);
+    status = UNIX_CALL(vkFreeCommandBuffers, &params);
     assert(!status);
     for (i = 0; i < count; i++)
     {

dlls/winevulkan/make_vulkan

@@ -737,7 +737,7 @@ class VkFunction(object):
             body += "    params.{0} = {0};\n".format(p.name)
 
         # Call the Unix function.
-        body += "    status = vk_unix_call(unix_{0}, &params);\n".format(self.name)
+        body += "    status = UNIX_CALL({0}, &params);\n".format(self.name)
         body += "    assert(!status);\n"
         if self.type != "void":
             body += "    return params.result;\n"

dlls/winevulkan/vulkan_loader.h

@@ -145,13 +145,6 @@ struct is_available_device_function_params
     const char *name;
 };
 
-#ifndef WINE_UNIX_LIB
-
-static inline NTSTATUS vk_unix_call(enum unix_call code, void *params)
-{
-    return WINE_UNIX_CALL(code, params);
-}
-
-#endif /* WINE_UNIX_LIB */
+#define UNIX_CALL(code, params) WINE_UNIX_CALL(unix_ ## code, params)
 
 #endif /* __WINE_VULKAN_LOADER_H */