[PATCH 0/1] MR1208: winevulkan: Do not pass win32 allocation callbacks directly to the Unix side.

[Zebediah Figura (＠zfigura)]

Fixes: 000a7bbb5a10ca9144b7ab7a23c4716edf1a83b0
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53859

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1208

[PATCH 1/1] winevulkan: Do not pass win32 allocation callbacks directly to the Unix side.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

Fixes: 000a7bbb5a10ca9144b7ab7a23c4716edf1a83b0
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53859
---
 dlls/winevulkan/vulkan.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 0edc1ae492d..aaebd9c26b8 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -1662,8 +1662,11 @@ VkResult wine_vkCreateComputePipelines(VkDevice handle, VkPipelineCache pipeline
     VkResult res;
     uint32_t i;
 
+    if (allocator)
+        FIXME("Support for allocation callbacks not implemented yet\n");
+
     res = device->funcs.p_vkCreateComputePipelines(device->device, pipeline_cache, count, create_infos,
-                                                   allocator, pipelines);
+                                                   NULL /* allocator */, pipelines);
 
     for (i = 0; i < count; i++)
         fixup_pipeline_feedback_info(&create_infos[i]);
@@ -1679,8 +1682,11 @@ VkResult wine_vkCreateGraphicsPipelines(VkDevice handle, VkPipelineCache pipelin
     VkResult res;
     uint32_t i;
 
+    if (allocator)
+        FIXME("Support for allocation callbacks not implemented yet\n");
+
     res = device->funcs.p_vkCreateGraphicsPipelines(device->device, pipeline_cache, count, create_infos,
-                                                    allocator, pipelines);
+                                                    NULL /* allocator */, pipelines);
 
     for (i = 0; i < count; i++)
         fixup_pipeline_feedback_info(&create_infos[i]);
@@ -1697,8 +1703,11 @@ VkResult wine_vkCreateRayTracingPipelinesKHR(VkDevice handle, VkDeferredOperatio
     VkResult res;
     uint32_t i;
 
+    if (allocator)
+        FIXME("Support for allocation callbacks not implemented yet\n");
+
     res = device->funcs.p_vkCreateRayTracingPipelinesKHR(device->device, deferred_operation, pipeline_cache,
-                                                         count, create_infos, allocator, pipelines);
+                                                         count, create_infos, NULL /* allocator */, pipelines);
 
     for (i = 0; i < count; i++)
         fixup_pipeline_feedback_info(&create_infos[i]);
@@ -1714,8 +1723,11 @@ VkResult wine_vkCreateRayTracingPipelinesNV(VkDevice handle, VkPipelineCache pip
     VkResult res;
     uint32_t i;
 
+    if (allocator)
+        FIXME("Support for allocation callbacks not implemented yet\n");
+
     res = device->funcs.p_vkCreateRayTracingPipelinesNV(device->device, pipeline_cache, count, create_infos,
-                                                        allocator, pipelines);
+                                                        NULL /* allocator */, pipelines);
 
     for (i = 0; i < count; i++)
         fixup_pipeline_feedback_info(&create_infos[i]);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1208

[Jacek Caban (＠jacek)]

FWIW, I have it fixed in my branch as a side effect of using generated thunks for affected functions, but the patch seems fine to have meantime.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1208#note_12766

[PATCH 0/1] MR1208: winevulkan: Do not pass win32 allocation callbacks directly to the Unix side. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1208