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

Alexandre Julliard : kernelbase: Implement RaiseException on ARM64EC.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 577c327a44025fb05fa9dbb12990e2c0e2be06d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/577c327a44025fb05fa9dbb12990e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 14:27:32 2024 +0100 kernelbase: Implement RaiseException on ARM64EC. --- dlls/kernelbase/debug.c | 33 ++++++++++++++++++++++++++++++--- dlls/ntdll/tests/exception.c | 3 ++- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 8eb5094dbef..b7df4a7c766 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -313,7 +313,34 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str ) /******************************************************************* * RaiseException (kernelbase.@) */ -#if defined(__x86_64__) +#ifdef __x86_64__ +#ifdef __arm64ec__ +void __attribute__((naked)) RaiseException( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args ) +{ + asm( ".seh_proc RaiseException\n\t" + "stp x29, x30, [sp, #-0xb0]!\n\t" + ".seh_save_fplr_x 0xb0\n\t" + ".seh_endprologue\n\t" + "and w1, w1, #0x01\n\t" /* EXCEPTION_NONCONTINUABLE */ + "stp w0, w1, [sp, #0x10]\n\t" /* ExceptionCode, ExceptionFlags */ + "adr x4, RaiseException\n\t" + "stp xzr, x4, [sp, #0x18]\n\t" /* ExceptionRecord, ExceptionAddress */ + "mov w5, #0x0f\n\t" /* EXCEPTION_MAXIMUM_PARAMETERS */ + "cmp w2, w5\n\t" + "csel w2, w2, w5, lo\n\t" + "str x2, [sp, #0x28]\n\t" /* NumberParameters */ + "cbz x3, 1f\n\t" + "lsl w2, w2, #3\n\t" + "add x0, sp, #0x30\n\t" /* ExceptionInformation */ + "mov x1, x3\n\t" /* args */ + "bl \"#memcpy\"\n" + "1:\tadd x0, sp, #0x10\n\t" /* rec */ + "bl \"#RtlRaiseException\"\n\t" + "ldp x29, x30, [sp], #0xb0\n\t" + "ret\n\t" + ".seh_endproc" ); +} +#else /* Some DRMs depend on RaiseException not altering non-volatile registers. */ __ASM_GLOBAL_FUNC( RaiseException, ".byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n\t" /* hotpatch prolog */ @@ -350,14 +377,14 @@ __ASM_GLOBAL_FUNC( RaiseException, "add $0xc8,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0xc8\n\t") "ret" ) - +#endif /* __arm64ec__ */ C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionCode) == 0 ); C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionFlags) == 4 ); C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionRecord) == 8 ); C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionAddress) == 0x10 ); C_ASSERT( offsetof(EXCEPTION_RECORD, NumberParameters) == 0x18 ); C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionInformation) == 0x20 ); -#else +#else /* __x86_64__ */ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args ) { EXCEPTION_RECORD record; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b0b76f37813..eed151cdb1f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5183,7 +5183,8 @@ static void test_raiseexception_regs(void) ++expected; ok(test_raiseexception_regs_context.Rdi == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rdi); ++expected; - ok(test_raiseexception_regs_context.Rbp == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rbp); + ok(test_raiseexception_regs_context.Rbp == expected || is_arm64ec /* x29 modified by entry thunk */, + "got %#I64x.\n", test_raiseexception_regs_context.Rbp); ++expected; ok(test_raiseexception_regs_context.R12 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R12); ++expected;

1 0

Alexandre Julliard : qwave/tests: Remove todo from a succeeding test.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: f9dd0fca4c0b4fe0972011a48ce9dae6ed69e812 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9dd0fca4c0b4fe0972011a48ce9da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 23:14:02 2024 +0100 qwave/tests: Remove todo from a succeeding test. --- dlls/qwave/tests/qos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c index efbc82e693d..1815784f30d 100644 --- a/dlls/qwave/tests/qos.c +++ b/dlls/qwave/tests/qos.c @@ -83,7 +83,7 @@ static void test_QOSCloseHandle(void) SetLastError(0xdeadbeef); ret = QOSCloseHandle(h); todo_wine ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = QOSCloseHandle((HANDLE)0xdeadbeef);

1 0

Alexandre Julliard : include: Move unwinding functions definitions to rtlsupportapi.h.
by Alexandre Julliard March 1, 2024

March 1, 2024

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

Rémi Bernon : winewayland: Remove unnecessary vkDestroySurfaceKHR NULL checks.
by Alexandre Julliard March 1, 2024

March 1, 2024

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 : ntdll: Implement RtlVirtualUnwind2.
by Alexandre Julliard March 1, 2024

March 1, 2024

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

Rémi Bernon : winemac: Remove unnecessary macdrv_get_vk_* helper.
by Alexandre Julliard March 1, 2024

March 1, 2024

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 : winemac: Remove unnecessary vkDestroySurfaceKHR NULL checks.
by Alexandre Julliard March 1, 2024

March 1, 2024

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 : winex11: Remove unnecessary vkDestroySurfaceKHR NULL checks.
by Alexandre Julliard March 1, 2024

March 1, 2024

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 now unnecessary vulkan function name mapping.
by Alexandre Julliard March 1, 2024

March 1, 2024

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 : winex11: Remove unnecessary X11DRV_get_vk_* helpers.
by Alexandre Julliard March 1, 2024

March 1, 2024

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