[PATCH 4/6] winevulkan: Fix minor coding style issues in autogenerated code.

[Józef Kucia]

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 dlls/winevulkan/make_vulkan     |  8 ++++----
 dlls/winevulkan/vulkan_thunks.c |  6 +++---
 dlls/winevulkan/vulkan_thunks.h | 34 +++++++++++++++++-----------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 35524f2d9ea6..5303fec7cf84 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -1787,7 +1787,7 @@ class VkGenerator(object):
         f.write("    {\n")
         f.write("        if (strcmp(vk_device_dispatch_table[i].name, name) == 0)\n")
         f.write("        {\n")
-        f.write("            TRACE(\"Found name=%s in device table\\n\", name);\n")
+        f.write("            TRACE(\"Found name=%s in device table\\n\", debugstr_a(name));\n")
         f.write("            return vk_device_dispatch_table[i].func;\n")
         f.write("        }\n")
         f.write("    }\n")
@@ -1801,7 +1801,7 @@ class VkGenerator(object):
         f.write("    {\n")
         f.write("        if (strcmp(vk_instance_dispatch_table[i].name, name) == 0)\n")
         f.write("        {\n")
-        f.write("            TRACE(\"Found name=%s in instance table\\n\", name);\n")
+        f.write("            TRACE(\"Found name=%s in instance table\\n\", debugstr_a(name));\n")
         f.write("            return vk_instance_dispatch_table[i].func;\n")
         f.write("        }\n")
         f.write("    }\n")
@@ -1818,7 +1818,7 @@ class VkGenerator(object):
         f.write("};\n\n")
 
         # Create array of instance extensions.
-        f.write("static const char *vk_instance_extensions[] =\n{\n")
+        f.write("static const char * const vk_instance_extensions[] =\n{\n")
         for ext in self.registry.extensions:
             if ext["type"] != "instance":
                 continue
@@ -1950,7 +1950,7 @@ class VkGenerator(object):
                 f.write("    USE_VK_FUNC({0})".format(vk_func.name))
                 first = False
             else:
-                f.write("\\\n    USE_VK_FUNC({0})".format(vk_func.name))
+                f.write(" \\\n    USE_VK_FUNC({0})".format(vk_func.name))
         f.write("\n\n")
 
         f.write("#endif /* __WINE_VULKAN_THUNKS_H */\n")
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index f7aa09bd49ae..bf8e78c5fb03 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -2315,7 +2315,7 @@ void *wine_vk_get_device_proc_addr(const char *name)
     {
         if (strcmp(vk_device_dispatch_table[i].name, name) == 0)
         {
-            TRACE("Found name=%s in device table\n", name);
+            TRACE("Found name=%s in device table\n", debugstr_a(name));
             return vk_device_dispatch_table[i].func;
         }
     }
@@ -2329,7 +2329,7 @@ void *wine_vk_get_instance_proc_addr(const char *name)
     {
         if (strcmp(vk_instance_dispatch_table[i].name, name) == 0)
         {
-            TRACE("Found name=%s in instance table\n", name);
+            TRACE("Found name=%s in instance table\n", debugstr_a(name));
             return vk_instance_dispatch_table[i].func;
         }
     }
@@ -2369,7 +2369,7 @@ static const char * const vk_device_extensions[] =
     "VK_NV_viewport_swizzle",
 };
 
-static const char *vk_instance_extensions[] =
+static const char * const vk_instance_extensions[] =
 {
     "VK_KHR_get_physical_device_properties2",
     "VK_KHR_surface",
diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h
index 803d6210196d..cca1026037b2 100644
--- a/dlls/winevulkan/vulkan_thunks.h
+++ b/dlls/winevulkan/vulkan_thunks.h
@@ -975,23 +975,23 @@ struct vulkan_instance_funcs
     USE_VK_FUNC(vkWaitForFences)
 
 #define ALL_VK_INSTANCE_FUNCS() \
-    USE_VK_FUNC(vkCreateDevice)\
-    USE_VK_FUNC(vkEnumerateDeviceExtensionProperties)\
-    USE_VK_FUNC(vkEnumerateDeviceLayerProperties)\
-    USE_VK_FUNC(vkEnumeratePhysicalDevices)\
-    USE_VK_FUNC(vkGetPhysicalDeviceFeatures)\
-    USE_VK_FUNC(vkGetPhysicalDeviceFeatures2KHR)\
-    USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties)\
-    USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties2KHR)\
-    USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties)\
-    USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties2KHR)\
-    USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties)\
-    USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR)\
-    USE_VK_FUNC(vkGetPhysicalDeviceProperties)\
-    USE_VK_FUNC(vkGetPhysicalDeviceProperties2KHR)\
-    USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties)\
-    USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties2KHR)\
-    USE_VK_FUNC(vkGetPhysicalDeviceSparseImageFormatProperties)\
+    USE_VK_FUNC(vkCreateDevice) \
+    USE_VK_FUNC(vkEnumerateDeviceExtensionProperties) \
+    USE_VK_FUNC(vkEnumerateDeviceLayerProperties) \
+    USE_VK_FUNC(vkEnumeratePhysicalDevices) \
+    USE_VK_FUNC(vkGetPhysicalDeviceFeatures) \
+    USE_VK_FUNC(vkGetPhysicalDeviceFeatures2KHR) \
+    USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties) \
+    USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties2KHR) \
+    USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties) \
+    USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties2KHR) \
+    USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) \
+    USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR) \
+    USE_VK_FUNC(vkGetPhysicalDeviceProperties) \
+    USE_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) \
+    USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties) \
+    USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties2KHR) \
+    USE_VK_FUNC(vkGetPhysicalDeviceSparseImageFormatProperties) \
     USE_VK_FUNC(vkGetPhysicalDeviceSparseImageFormatProperties2KHR)
 
 #endif /* __WINE_VULKAN_THUNKS_H */
-- 
2.16.1