diff --git a/patches/wine-hotfixes/winevulkan-backport1.patch b/patches/wine-hotfixes/winevulkan-backport1.patch new file mode 100644 index 000000000..dc0889d22 --- /dev/null +++ b/patches/wine-hotfixes/winevulkan-backport1.patch @@ -0,0 +1,26 @@ +From ffd58f6275101bcf7bc5ef5bd433123460ad0f4f Mon Sep 17 00:00:00 2001 +From: Georg Lehmann +Date: Wed, 3 Feb 2021 21:13:34 +0100 +Subject: [PATCH] winevulkan: Fix vkDestroyDebugUtilsMessengerEXT with NULL + object. + +Signed-off-by: Georg Lehmann +Signed-off-by: Alexandre Julliard +--- + dlls/winevulkan/vulkan.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c +index 2a503a7430d..640b3ee7b67 100644 +--- a/dlls/winevulkan/vulkan.c ++++ b/dlls/winevulkan/vulkan.c +@@ -1940,6 +1940,9 @@ void WINAPI wine_vkDestroyDebugUtilsMessengerEXT( + + object = wine_debug_utils_messenger_from_handle(messenger); + ++ if (!object) ++ return; ++ + instance->funcs.p_vkDestroyDebugUtilsMessengerEXT(instance->instance, object->debug_messenger, NULL); + WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); + diff --git a/patches/wine-hotfixes/winevulkan-backport2.patch b/patches/wine-hotfixes/winevulkan-backport2.patch new file mode 100644 index 000000000..35b273b11 --- /dev/null +++ b/patches/wine-hotfixes/winevulkan-backport2.patch @@ -0,0 +1,1254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + winevulkan: Fix vkDestroyDebugReportCallbackEXT with NULL object. · wine-mirror/wine@4f1b297 · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Skip to content + + + + + + + + +
+ +
+ + + + + +
+ + + +
+ + + + + + + + + +
+
+
+ + + + + + + + + + + + + + +
+ +
+ +
+

+ + + / + + wine + + Mirror +

+ + + mirrored from git://source.winehq.org/git/wine.git + + +
+ + + +
+ + +
+ + +
+
+ + + + Permalink + + + + + + + +
+ Browse files + + +

+ winevulkan: Fix vkDestroyDebugReportCallbackEXT with NULL object. +

+ + 
Signed-off-by: Georg Lehmann <dadschoorse@gmail.com>
+Signed-off-by: Alexandre Julliard <julliard@winehq.org>
+ +
+ + +
    +
  • Loading branch information
    • +
+
+ + +
+ +
+
+ + @DadSchoorse + + @julliard +
+
+ +
+ + DadSchoorse + + + authored and julliard + + committed + Feb 5, 2021 + +
+ + +
+
+
+ + 1 parent + + ffd58f6 + + commit 4f1b297a14bbd304fb20da7c4b64266c14d110e5 +
+
+
+ + + + + +
+
+ + Unified + + + Split + +
+ + +
+ + Showing + + with + 3 additions + and 0 deletions. +
+ +
    +
  1. + + + +3 + + + −0 + + + + + + + dlls/winevulkan/vulkan.c +
    2. +
+
+ + +
+ +
+ +
+
+
+ + + + + 3 + + +dlls/winevulkan/vulkan.c + + + + + + + + +
+ +
+
+ + + + + + + + + + +
+ +
+ +
+ + + + +
+ + + View file + + + + + + + + + +
+ + + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + @@ -2045,6 +2045,9 @@ void WINAPI wine_vkDestroyDebugReportCallbackEXT(
+
+ object = wine_debug_report_callback_from_handle(callback);
+
+ if (!object)
+ return;
+
+ instance->funcs.p_vkDestroyDebugReportCallbackEXT(instance->instance, object->debug_callback, NULL);
+
+ WINE_VK_REMOVE_HANDLE_MAPPING(instance, object);
+ + + +
+
+ +
+
+ +
+ + +
+ + + + + + + +
+ +
+ +
+

+ 0 comments + on commit 4f1b297 +

+ +
+ +
+
+ +
+ +
+ + + + +
+ +
+ +
+ + + + Please + sign in to comment. + +
+ + + +
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + +