March 2024 - Wine-commits - list.winehq.org

Rémi Bernon : winex11: Remove now unnecessary vulkan function name mapping.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 2b25f51e0d7d4187867e9011e9972848a5ba5a67 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b25f51e0d7d4187867e9011e99728… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 18:46:30 2024 +0100 winex11: Remove now unnecessary vulkan function name mapping. --- dlls/winex11.drv/vulkan.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index e8bcc09e3e2..c7da02ad681 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -433,24 +433,12 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } -static const char *wine_vk_host_fn_name( const char *name ) -{ - if (!strcmp(name, "vkCreateWin32SurfaceKHR")) - return "vkCreateXlibSurfaceKHR"; - if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) - return "vkGetPhysicalDeviceXlibPresentationSupportKHR"; - - return name; -} - static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); - if (!pvkGetDeviceProcAddr( device, wine_vk_host_fn_name( name ) )) return NULL; - if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -463,8 +451,6 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); - if (!pvkGetInstanceProcAddr( instance, wine_vk_host_fn_name( name ) )) return NULL; - if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr;

1 0

Rémi Bernon : winemac: Remove now unnecessary vulkan function name mapping.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 684d51cebb795355f3ae8d8035fab804d1e7a200 URL: https://gitlab.winehq.org/wine/wine/-/commit/684d51cebb795355f3ae8d8035fab8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 18:55:16 2024 +0100 winemac: Remove now unnecessary vulkan function name mapping. --- dlls/winemac.drv/vulkan.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 86792692d42..28f062d5def 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -408,32 +408,12 @@ static VkResult macdrv_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } -static const char *wine_vk_host_fn_name(const char *name) -{ - const char *create_surface_name = - pvkCreateMetalSurfaceEXT ? "vkCreateMetalSurfaceEXT" : "vkCreateMacOSSurfaceMVK"; - - if (!strcmp(name, "vkCreateWin32SurfaceKHR")) - return create_surface_name; - /* We just need something where non-NULL is returned if the correct extension is enabled. - * So since there is no host equivalent of this function check for the create - * surface function. - */ - if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) - return create_surface_name; - - return name; -} - static void *macdrv_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); - if (!pvkGetDeviceProcAddr(device, wine_vk_host_fn_name(name))) - return NULL; - if ((proc_addr = macdrv_get_vk_device_proc_addr(name))) return proc_addr; @@ -446,9 +426,6 @@ static void *macdrv_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); - if (!pvkGetInstanceProcAddr(instance, wine_vk_host_fn_name(name))) - return NULL; - if ((proc_addr = macdrv_get_vk_instance_proc_addr(instance, name))) return proc_addr;

1 0

Rémi Bernon : winewayland: Remove now unnecessary vulkan function name mapping.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 6f122f48d3484f558ce8f2a5e26c586745136399 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f122f48d3484f558ce8f2a5e26c58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 18:55:42 2024 +0100 winewayland: Remove now unnecessary vulkan function name mapping. --- dlls/winewayland.drv/vulkan.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 323563192ff..7a623c80713 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -189,16 +189,6 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo return VK_SUCCESS; } -static const char *wine_vk_host_fn_name(const char *name) -{ - if (!strcmp(name, "vkCreateWin32SurfaceKHR")) - return "vkCreateWaylandSurfaceKHR"; - if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) - return "vkGetPhysicalDeviceWaylandPresentationSupportKHR"; - - return name; -} - static void vk_result_update_out_of_date(VkResult *res) { /* If the current result is less severe than out_of_date, which for @@ -504,11 +494,6 @@ static void *wayland_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); - /* Do not return the driver function if the corresponding host function - * is not available. */ - if (!pvkGetDeviceProcAddr(device, wine_vk_host_fn_name(name))) - return NULL; - if ((proc_addr = get_vulkan_driver_device_proc_addr(&vulkan_funcs, name))) return proc_addr; @@ -521,11 +506,6 @@ static void *wayland_vkGetInstanceProcAddr(VkInstance instance, const char *name TRACE("%p, %s\n", instance, debugstr_a(name)); - /* Do not return the driver function if the corresponding host function - * is not available. */ - if (!pvkGetInstanceProcAddr(instance, wine_vk_host_fn_name(name))) - return NULL; - if ((proc_addr = get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name))) return proc_addr;

1 0

Rémi Bernon : winex11: Remove unnecessary X11DRV_get_vk_* helpers.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 77f4d2207a428aba0a12d10d64123cd87e852297 URL: https://gitlab.winehq.org/wine/wine/-/commit/77f4d2207a428aba0a12d10d64123c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 12 22:12:11 2024 +0100 winex11: Remove unnecessary X11DRV_get_vk_* helpers. --- dlls/winex11.drv/vulkan.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index c7da02ad681..c589f6923fe 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -87,8 +87,7 @@ static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevi static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); -static void *X11DRV_get_vk_device_proc_addr(const char *name); -static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name); +static const struct vulkan_funcs vulkan_funcs; static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { @@ -439,7 +438,7 @@ static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); - if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) + if ((proc_addr = get_vulkan_driver_device_proc_addr( &vulkan_funcs, name ))) return proc_addr; return pvkGetDeviceProcAddr(device, name); @@ -451,7 +450,7 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); - if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) + if ((proc_addr = get_vulkan_driver_instance_proc_addr( &vulkan_funcs, instance, name ))) return proc_addr; return pvkGetInstanceProcAddr(instance, name); @@ -532,16 +531,6 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_wine_get_host_surface, }; -static void *X11DRV_get_vk_device_proc_addr(const char *name) -{ - return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name); -} - -static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name) -{ - return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name); -} - const struct vulkan_funcs *get_vulkan_driver(UINT version) { static pthread_once_t init_once = PTHREAD_ONCE_INIT;

1 0

Rémi Bernon : winemac: Remove unnecessary macdrv_get_vk_* helper.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 0dd1502f573b709bde2575f86b6f757612ad4cff URL: https://gitlab.winehq.org/wine/wine/-/commit/0dd1502f573b709bde2575f86b6f75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 10:45:55 2024 +0100 winemac: Remove unnecessary macdrv_get_vk_* helper. --- dlls/winemac.drv/vulkan.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 28f062d5def..d0ebd668933 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -89,8 +89,7 @@ static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); -static void *macdrv_get_vk_device_proc_addr(const char *name); -static void *macdrv_get_vk_instance_proc_addr(VkInstance instance, const char *name); +static const struct vulkan_funcs vulkan_funcs; static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { @@ -414,7 +413,7 @@ static void *macdrv_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); - if ((proc_addr = macdrv_get_vk_device_proc_addr(name))) + if ((proc_addr = get_vulkan_driver_device_proc_addr(&vulkan_funcs, name))) return proc_addr; return pvkGetDeviceProcAddr(device, name); @@ -426,7 +425,7 @@ static void *macdrv_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); - if ((proc_addr = macdrv_get_vk_instance_proc_addr(instance, name))) + if ((proc_addr = get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name))) return proc_addr; return pvkGetInstanceProcAddr(instance, name); @@ -503,16 +502,6 @@ static const struct vulkan_funcs vulkan_funcs = macdrv_wine_get_host_surface, }; -static void *macdrv_get_vk_device_proc_addr(const char *name) -{ - return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name); -} - -static void *macdrv_get_vk_instance_proc_addr(VkInstance instance, const char *name) -{ - return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name); -} - static const struct vulkan_funcs *get_vulkan_driver(UINT version) { static pthread_once_t init_once = PTHREAD_ONCE_INIT;

1 0

Rémi Bernon : winex11: Remove unnecessary vkDestroySurfaceKHR NULL checks.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: e3e628247df00091e2c60746a63b89e3a068ca5a URL: https://gitlab.winehq.org/wine/wine/-/commit/e3e628247df00091e2c60746a63b89… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 13:18:17 2024 +0100 winex11: Remove unnecessary vkDestroySurfaceKHR NULL checks. --- dlls/winex11.drv/vulkan.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index c589f6923fe..0de6c72862c 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -371,13 +371,8 @@ static void X11DRV_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ - if (x11_surface) - { - pvkDestroySurfaceKHR( instance, x11_surface->host_surface, NULL /* allocator */ ); - - wine_vk_surface_release(x11_surface); - } + pvkDestroySurfaceKHR( instance, x11_surface->host_surface, NULL /* allocator */ ); + wine_vk_surface_release(x11_surface); } static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain,

1 0

Rémi Bernon : winemac: Remove unnecessary vkDestroySurfaceKHR NULL checks.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: a3adb19bef63540ffe5da799ea29d9ae66ee4058 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3adb19bef63540ffe5da799ea29d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 13:17:46 2024 +0100 winemac: Remove unnecessary vkDestroySurfaceKHR NULL checks. --- dlls/winemac.drv/vulkan.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d0ebd668933..472b2885b10 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -178,10 +178,6 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface *surface) { - /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ - if (!surface) - return; - pvkDestroySurfaceKHR(instance, surface->host_surface, NULL /* allocator */); if (surface->view)

1 0

Rémi Bernon : winewayland: Remove unnecessary vkDestroySurfaceKHR NULL checks.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 630d79439c5cd2031ddf918a08afbe7aed5bbe16 URL: https://gitlab.winehq.org/wine/wine/-/commit/630d79439c5cd2031ddf918a08afbe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 13:18:08 2024 +0100 winewayland: Remove unnecessary vkDestroySurfaceKHR NULL checks. --- dlls/winewayland.drv/vulkan.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 7a623c80713..88c7a62422a 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -417,9 +417,6 @@ static void wayland_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surfac if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ - if (!wine_vk_surface) return; - pvkDestroySurfaceKHR(instance, wine_vk_surface->host_surface, NULL /* allocator */); wine_vk_surface_destroy(wine_vk_surface); }

1 0

Alexandre Julliard : include: Move unwinding functions definitions to rtlsupportapi.h.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 9ac8d63e22f8105e10929eaa591726ff10505110 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ac8d63e22f8105e10929eaa591726… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 29 14:12:34 2024 +0100 include: Move unwinding functions definitions to rtlsupportapi.h. --- dlls/krnl386.exe16/thunk.c | 2 +- dlls/msvcp90/exception.c | 1 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm64ec.c | 6 ++-- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/tests/exception.c | 1 + dlls/ntdll/tests/unwind.c | 1 + dlls/ntdll/unwind.c | 42 ++++++++++++------------- dlls/win32u/main.c | 1 + dlls/wow64cpu/cpu.c | 1 + include/Makefile.in | 1 + include/rtlsupportapi.h | 75 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/exception.h | 1 + include/winnt.h | 48 ---------------------------- include/winternl.h | 1 - 15 files changed, 109 insertions(+), 75 deletions(-)

1 0

Alexandre Julliard : ntdll: Implement RtlVirtualUnwind2.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: ca5984059c9354844a3f82d2d52d7c79295b5ccc URL: https://gitlab.winehq.org/wine/wine/-/commit/ca5984059c9354844a3f82d2d52d7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 29 15:43:36 2024 +0100 ntdll: Implement RtlVirtualUnwind2. --- dlls/ntdll/signal_arm.c | 7 +- dlls/ntdll/signal_arm64.c | 8 +-- dlls/ntdll/signal_x86_64.c | 8 +-- dlls/ntdll/tests/unwind.c | 115 ++++++++++++++++++++++++++++--- dlls/ntdll/unwind.c | 165 +++++++++++++++++++++++++++++++-------------- 5 files changed, 232 insertions(+), 71 deletions(-)

1 0