- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Generate stub entry points as x86-64 code on ARM64EC.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 4e0e623859aefee9d28a383dffe155fd1cfb3f38 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e0e623859aefee9d28a383dffe155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:28:29 2024 +0200 ntdll: Generate stub entry points as x86-64 code on ARM64EC. Partial revert of 220a70bee268415925d1ae747611f48e51665e64. --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c5d82e8c68c..6e3f67ef593 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -436,7 +436,7 @@ struct stub const char *name; const void* entry; }; -#elif defined(__aarch64__) || defined(__arm64ec__) +#elif defined(__aarch64__) struct stub { DWORD ldr_x0; /* ldr x0, $dll */ @@ -500,7 +500,7 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->dll = dll; stub->name = name; stub->entry = stub_entry_point; -#elif defined(__aarch64__) || defined(__arm64ec__) +#elif defined(__aarch64__) stub->ldr_x0 = 0x580000a0; /* ldr x0, #20 ($dll) */ stub->ldr_x1 = 0x580000c1; /* ldr x1, #24 ($name) */ stub->mov_x2_lr = 0xaa1e03e2; /* mov x2, lr */

1 0

Alexandre Julliard : ntdll: Build __chkstk as x86-64 code on ARM64EC.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 6d931c271a9c9df332c0a9fe084f667919f7081a URL: https://gitlab.winehq.org/wine/wine/-/commit/6d931c271a9c9df332c0a9fe084f66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:28:00 2024 +0200 ntdll: Build __chkstk as x86-64 code on ARM64EC. Based on a patch by Jacek Caban. --- dlls/ntdll/signal_arm64ec.c | 11 ----------- dlls/ntdll/signal_x86_64.c | 26 +++++++++++++++++--------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index e9e9b2a6bb3..8caf4218ab9 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2323,17 +2323,6 @@ static void __attribute__((naked)) arm64x_check_call(void) } -/************************************************************************** - * __chkstk (NTDLL.@) - * - * Supposed to touch all the stack pages, but we shouldn't need that. - */ -void __attribute__((naked)) __chkstk(void) -{ - asm( "ret" ); -} - - /************************************************************************** * __chkstk_arm64ec (NTDLL.@) * diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 78afadbe387..d6218dc61b7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if defined(__x86_64__) && !defined(__arm64ec__) +#if 0 +#pragma makedep arm64ec_x64 +#endif + +#ifdef __x86_64__ #include <stdlib.h> #include <stdarg.h> @@ -34,6 +38,17 @@ #include "wine/debug.h" #include "ntsyscalls.h" + +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); + + +#ifndef __arm64ec_x64__ + WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -81,14 +96,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } -/************************************************************************** - * __chkstk (NTDLL.@) - * - * Supposed to touch all the stack pages, but we shouldn't need that. - */ -__ASM_GLOBAL_FUNC( __chkstk, "ret" ); - - /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ @@ -1043,4 +1050,5 @@ __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" ); +#endif /* __arm64ec_x64__ */ #endif /* __x86_64__ */

1 0

Alexandre Julliard : oleaut32: Move the call_method thunk to a separate file.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 6af17eec91f37149c34cee7eef2f24bcd47209cb URL: https://gitlab.winehq.org/wine/wine/-/commit/6af17eec91f37149c34cee7eef2f24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:24:48 2024 +0200 oleaut32: Move the call_method thunk to a separate file. And build it as x86-64 code on ARM64EC. --- dlls/oleaut32/Makefile.in | 1 + dlls/oleaut32/thunks.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 145 ----------------------------------- 3 files changed, 188 insertions(+), 145 deletions(-)

1 0

Alexandre Julliard : widl: Default to fully interpreted stubs mode.
by Alexandre Julliard May 2, 2024

May 2, 2024

1 0

Rémi Bernon : winex11: Remove now unnecessary surface wrapper struct.
by Alexandre Julliard May 1, 2024

May 1, 2024

Module: wine Branch: master Commit: 3fa9023bf61e6dd17e997b5ed3ec8c27cfcd2f3e URL: https://gitlab.winehq.org/wine/wine/-/commit/3fa9023bf61e6dd17e997b5ed3ec8c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 13:06:36 2024 +0100 winex11: Remove now unnecessary surface wrapper struct. --- dlls/winex11.drv/vulkan.c | 97 ++++++++--------------------------------------- 1 file changed, 15 insertions(+), 82 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index fbe0f6a87ab..85993bc517a 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -48,21 +48,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN -static pthread_mutex_t vulkan_mutex; - #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 -static struct list surface_list = LIST_INIT( surface_list ); - -struct wine_vk_surface -{ - LONG ref; - struct list entry; - Window window; - HWND hwnd; - DWORD hwnd_thread_id; -}; - typedef struct VkXlibSurfaceCreateInfoKHR { VkStructureType sType; @@ -77,41 +64,13 @@ static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevi static const struct vulkan_driver_funcs x11drv_vulkan_driver_funcs; -static void wine_vk_surface_release( struct wine_vk_surface *surface ) -{ - if (InterlockedDecrement(&surface->ref)) - return; - - if (surface->entry.next) - { - pthread_mutex_lock(&vulkan_mutex); - list_remove(&surface->entry); - pthread_mutex_unlock(&vulkan_mutex); - } - - destroy_client_window( surface->hwnd, surface->window ); - free(surface); -} - -void destroy_vk_surface( HWND hwnd ) -{ - struct wine_vk_surface *surface, *next; - - pthread_mutex_lock( &vulkan_mutex ); - LIST_FOR_EACH_ENTRY_SAFE( surface, next, &surface_list, struct wine_vk_surface, entry ) - { - if (surface->hwnd != hwnd) continue; - surface->hwnd_thread_id = 0; - surface->hwnd = NULL; - } - pthread_mutex_unlock( &vulkan_mutex ); -} - static VkResult X11DRV_vulkan_surface_create( HWND hwnd, VkInstance instance, VkSurfaceKHR *surface, void **private ) { - VkResult res; - VkXlibSurfaceCreateInfoKHR create_info_host; - struct wine_vk_surface *x11_surface; + VkXlibSurfaceCreateInfoKHR info = + { + .sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR, + .dpy = gdi_display, + }; TRACE( "%p %p %p %p\n", hwnd, instance, surface, private ); @@ -122,44 +81,20 @@ static VkResult X11DRV_vulkan_surface_create( HWND hwnd, VkInstance instance, Vk return VK_ERROR_INCOMPATIBLE_DRIVER; } - x11_surface = calloc(1, sizeof(*x11_surface)); - if (!x11_surface) - return VK_ERROR_OUT_OF_HOST_MEMORY; - - x11_surface->ref = 1; - x11_surface->hwnd = hwnd; - x11_surface->window = create_client_window( hwnd, &default_visual, default_colormap ); - x11_surface->hwnd_thread_id = NtUserGetWindowThread( x11_surface->hwnd, NULL ); - - if (!x11_surface->window) + if (!(info.window = create_client_window( hwnd, &default_visual, default_colormap ))) { ERR("Failed to allocate client window for hwnd=%p\n", hwnd); - - /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ - free(x11_surface); return VK_ERROR_OUT_OF_HOST_MEMORY; } - create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; - create_info_host.pNext = NULL; - create_info_host.flags = 0; /* reserved */ - create_info_host.dpy = gdi_display; - create_info_host.window = x11_surface->window; - - res = pvkCreateXlibSurfaceKHR( instance, &create_info_host, NULL /* allocator */, surface ); - if (res != VK_SUCCESS) + if (pvkCreateXlibSurfaceKHR( instance, &info, NULL /* allocator */, surface )) { - ERR("Failed to create Xlib surface, res=%d\n", res); - destroy_client_window( x11_surface->hwnd, x11_surface->window ); - free(x11_surface); - return res; + ERR("Failed to create Xlib surface\n"); + destroy_client_window( hwnd, info.window ); + return VK_ERROR_OUT_OF_HOST_MEMORY; } - pthread_mutex_lock(&vulkan_mutex); - list_add_tail(&surface_list, &x11_surface->entry); - pthread_mutex_unlock(&vulkan_mutex); - - *private = x11_surface; + *private = (void *)info.window; TRACE("Created surface 0x%s, private %p\n", wine_dbgstr_longlong(*surface), *private); return VK_SUCCESS; @@ -167,23 +102,23 @@ static VkResult X11DRV_vulkan_surface_create( HWND hwnd, VkInstance instance, Vk static void X11DRV_vulkan_surface_destroy( HWND hwnd, void *private ) { - struct wine_vk_surface *x11_surface = private; + Window client_window = (Window)private; TRACE( "%p %p\n", hwnd, private ); - wine_vk_surface_release(x11_surface); + destroy_client_window( hwnd, client_window ); } static void X11DRV_vulkan_surface_detach( HWND hwnd, void *private ) { - struct wine_vk_surface *x11_surface = private; + Window client_window = (Window)private; struct x11drv_win_data *data; TRACE( "%p %p\n", hwnd, private ); if ((data = get_win_data( hwnd ))) { - detach_client_window( data, x11_surface->window ); + detach_client_window( data, client_window ); release_win_data( data ); } } @@ -225,8 +160,6 @@ UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, const struct vulkan_d return STATUS_INVALID_PARAMETER; } - init_recursive_mutex( &vulkan_mutex ); - #define LOAD_FUNCPTR( f ) if (!(p##f = dlsym( vulkan_handle, #f ))) return STATUS_PROCEDURE_NOT_FOUND; LOAD_FUNCPTR( vkCreateXlibSurfaceKHR ); LOAD_FUNCPTR( vkGetPhysicalDeviceXlibPresentationSupportKHR );

1 0

Rémi Bernon : win32u: Move thread detach from winex11.
by Alexandre Julliard May 1, 2024

May 1, 2024

Module: wine Branch: master Commit: d519cf6cccbbc3ec8e8106e3d8a22f0632348874 URL: https://gitlab.winehq.org/wine/wine/-/commit/d519cf6cccbbc3ec8e8106e3d8a22f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 12 09:30:00 2024 +0200 win32u: Move thread detach from winex11. --- dlls/win32u/vulkan.c | 6 ++++++ dlls/winemac.drv/vulkan.c | 5 +++++ dlls/winewayland.drv/vulkan.c | 5 +++++ dlls/winex11.drv/vulkan.c | 41 +++++++++++++++-------------------------- dlls/winex11.drv/window.c | 3 +-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 1 - include/wine/vulkan_driver.h | 3 ++- 8 files changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index b9a22204248..4fae491b1db 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -185,6 +185,10 @@ static void nulldrv_vulkan_surface_destroy( HWND hwnd, void *private ) { } +static void nulldrv_vulkan_surface_detach( HWND hwnd, void *private ) +{ +} + static void nulldrv_vulkan_surface_presented( HWND hwnd, VkResult result ) { } @@ -203,6 +207,7 @@ static const struct vulkan_driver_funcs nulldrv_funcs = { .p_vulkan_surface_create = nulldrv_vulkan_surface_create, .p_vulkan_surface_destroy = nulldrv_vulkan_surface_destroy, + .p_vulkan_surface_detach = nulldrv_vulkan_surface_detach, .p_vulkan_surface_presented = nulldrv_vulkan_surface_presented, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = nulldrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, .p_get_host_surface_extension = nulldrv_get_host_surface_extension, @@ -257,6 +262,7 @@ void vulkan_detach_surfaces( struct list *surfaces ) LIST_FOR_EACH_ENTRY( surface, surfaces, struct surface, entry ) { + driver_funcs->p_vulkan_surface_detach( surface->hwnd, surface->driver_private ); list_remove( &surface->entry ); list_init( &surface->entry ); } diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d61e88f60af..d5a3df579d0 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -178,6 +178,10 @@ static void macdrv_vulkan_surface_destroy(HWND hwnd, void *private) wine_vk_surface_destroy(mac_surface); } +static void macdrv_vulkan_surface_detach(HWND hwnd, void *private) +{ +} + static void macdrv_vulkan_surface_presented(HWND hwnd, VkResult result) { } @@ -199,6 +203,7 @@ static const struct vulkan_driver_funcs macdrv_vulkan_driver_funcs = { .p_vulkan_surface_create = macdrv_vulkan_surface_create, .p_vulkan_surface_destroy = macdrv_vulkan_surface_destroy, + .p_vulkan_surface_detach = macdrv_vulkan_surface_detach, .p_vulkan_surface_presented = macdrv_vulkan_surface_presented, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 4312d9b5e59..16084175013 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -132,6 +132,10 @@ static void wayland_vulkan_surface_destroy(HWND hwnd, void *private) wine_vk_surface_destroy(client); } +static void wayland_vulkan_surface_detach(HWND hwnd, void *private) +{ +} + static void wayland_vulkan_surface_presented(HWND hwnd, VkResult result) { struct wayland_surface *wayland_surface; @@ -171,6 +175,7 @@ static const struct vulkan_driver_funcs wayland_vulkan_driver_funcs = { .p_vulkan_surface_create = wayland_vulkan_surface_create, .p_vulkan_surface_destroy = wayland_vulkan_surface_destroy, + .p_vulkan_surface_detach = wayland_vulkan_surface_detach, .p_vulkan_surface_presented = wayland_vulkan_surface_presented, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index baf54c28781..fbe0f6a87ab 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -107,24 +107,6 @@ void destroy_vk_surface( HWND hwnd ) pthread_mutex_unlock( &vulkan_mutex ); } -void vulkan_thread_detach(void) -{ - struct wine_vk_surface *surface, *next; - DWORD thread_id = GetCurrentThreadId(); - - pthread_mutex_lock(&vulkan_mutex); - LIST_FOR_EACH_ENTRY_SAFE(surface, next, &surface_list, struct wine_vk_surface, entry) - { - if (surface->hwnd_thread_id != thread_id) - continue; - - TRACE("Detaching surface %p, hwnd %p.\n", surface, surface->hwnd); - XReparentWindow(gdi_display, surface->window, get_dummy_parent(), 0, 0); - XSync(gdi_display, False); - } - pthread_mutex_unlock(&vulkan_mutex); -} - static VkResult X11DRV_vulkan_surface_create( HWND hwnd, VkInstance instance, VkSurfaceKHR *surface, void **private ) { VkResult res; @@ -192,6 +174,20 @@ static void X11DRV_vulkan_surface_destroy( HWND hwnd, void *private ) wine_vk_surface_release(x11_surface); } +static void X11DRV_vulkan_surface_detach( HWND hwnd, void *private ) +{ + struct wine_vk_surface *x11_surface = private; + struct x11drv_win_data *data; + + TRACE( "%p %p\n", hwnd, private ); + + if ((data = get_win_data( hwnd ))) + { + detach_client_window( data, x11_surface->window ); + release_win_data( data ); + } +} + static void X11DRV_vulkan_surface_presented(HWND hwnd, VkResult result) { } @@ -214,6 +210,7 @@ static const struct vulkan_driver_funcs x11drv_vulkan_driver_funcs = { .p_vulkan_surface_create = X11DRV_vulkan_surface_create, .p_vulkan_surface_destroy = X11DRV_vulkan_surface_destroy, + .p_vulkan_surface_detach = X11DRV_vulkan_surface_detach, .p_vulkan_surface_presented = X11DRV_vulkan_surface_presented, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR, @@ -247,12 +244,4 @@ UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, const struct vulkan_d return STATUS_NOT_IMPLEMENTED; } -void destroy_vk_surface( HWND hwnd ) -{ -} - -void vulkan_thread_detach(void) -{ -} - #endif /* SONAME_LIBVULKAN */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 24b421d5fd7..957a46dba86 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1604,7 +1604,7 @@ static void client_window_events_disable( struct x11drv_win_data *data, Window c /********************************************************************** * detach_client_window */ -static void detach_client_window( struct x11drv_win_data *data, Window client_window ) +void detach_client_window( struct x11drv_win_data *data, Window client_window ) { if (data->client_window != client_window || !client_window) return; @@ -1940,7 +1940,6 @@ void X11DRV_DestroyWindow( HWND hwnd ) release_win_data( data ); free( data ); destroy_gl_drawable( hwnd ); - destroy_vk_surface( hwnd ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c308f54adb3..1e13122076c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,7 +641,6 @@ extern void sync_gl_drawable( HWND hwnd, BOOL known_child ); extern void set_gl_drawable_parent( HWND hwnd, HWND parent ); extern void destroy_gl_drawable( HWND hwnd ); extern void destroy_vk_surface( HWND hwnd ); -extern void vulkan_thread_detach(void); extern void wait_for_withdrawn_state( HWND hwnd, BOOL set ); extern Window init_clip_window(void); @@ -650,6 +649,7 @@ extern void read_net_wm_states( Display *display, struct x11drv_win_data *data ) extern void update_net_wm_states( struct x11drv_win_data *data ); extern void make_window_embedded( struct x11drv_win_data *data ); extern Window create_client_window( HWND hwnd, const XVisualInfo *visual, Colormap colormap ); +extern void detach_client_window( struct x11drv_win_data *data, Window client_window ); extern void destroy_client_window( HWND hwnd, Window client_window ); extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ); extern void change_systray_owner( Display *display, Window systray_window ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 4c8fd943ffd..180573128e7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -696,7 +696,6 @@ void X11DRV_ThreadDetach(void) if (data) { - vulkan_thread_detach(); if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XSync( gdi_display, False ); /* make sure XReparentWindow requests have completed before closing the thread display */ diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index c5b2f82234a..7ddba4739f4 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -21,7 +21,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 33 +#define WINE_VULKAN_DRIVER_VERSION 34 struct vulkan_funcs { @@ -46,6 +46,7 @@ struct vulkan_driver_funcs { VkResult (*p_vulkan_surface_create)(HWND, VkInstance, VkSurfaceKHR *, void **); void (*p_vulkan_surface_destroy)(HWND, void *); + void (*p_vulkan_surface_detach)(HWND, void *); void (*p_vulkan_surface_presented)(HWND, VkResult); VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t);

1 0

Rémi Bernon : win32u: Introduce a per-window vulkan surface list.
by Alexandre Julliard May 1, 2024

May 1, 2024

Module: wine Branch: master Commit: dc7dcbeed7badf13d7f1f294ec9ee3a3d8a906bf URL: https://gitlab.winehq.org/wine/wine/-/commit/dc7dcbeed7badf13d7f1f294ec9ee3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 12:12:38 2024 +0100 win32u: Introduce a per-window vulkan surface list. --- dlls/win32u/ntuser_private.h | 4 ++++ dlls/win32u/vulkan.c | 27 +++++++++++++++++++++++++++ dlls/win32u/window.c | 6 ++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index bb2169998b6..11b1a3ff8a1 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -77,6 +77,7 @@ typedef struct tagWND UINT dpi; /* window DPI */ DPI_AWARENESS dpi_awareness; /* DPI awareness */ struct window_surface *surface; /* Window surface if any */ + struct list vulkan_surfaces; /* list of vulkan surfaces created for this window */ struct tagDIALOGINFO *dlgInfo; /* Dialog additional info (dialogs only) */ int pixel_format; /* Pixel format set by the graphics driver */ int internal_pixel_format; /* Internal pixel format set via WGL_WINE_pixel_format_passthrough */ @@ -254,6 +255,9 @@ extern BOOL set_keyboard_auto_repeat( BOOL enable ); /* systray.c */ extern LRESULT system_tray_call( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, void *data ); +/* vulkan.c */ +extern void vulkan_detach_surfaces( struct list *surfaces ); + /* window.c */ HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type ); void *free_user_handle( HANDLE handle, unsigned int type ); diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 5677d02e128..b9a22204248 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -30,6 +30,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "win32u_private.h" +#include "ntuser_private.h" #define VK_NO_PROTOTYPES #define WINE_VK_HOST @@ -51,6 +52,7 @@ static void *(*p_vkGetInstanceProcAddr)(VkInstance, const char *); struct surface { + struct list entry; VkSurfaceKHR host_surface; void *driver_private; HWND hwnd; @@ -71,6 +73,7 @@ static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin { struct surface *surface; VkResult res; + WND *win; TRACE( "instance %p, info %p, allocator %p, handle %p\n", instance, info, allocator, handle ); if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); @@ -82,6 +85,14 @@ static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin return res; } + if (!(win = get_win_ptr( info->hwnd )) || win == WND_DESKTOP || win == WND_OTHER_PROCESS) + list_init( &surface->entry ); + else + { + list_add_tail( &win->vulkan_surfaces, &surface->entry ); + release_win_ptr( win ); + } + surface->hwnd = info->hwnd; *handle = surface_to_handle( surface ); return VK_SUCCESS; @@ -94,6 +105,7 @@ static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle TRACE( "instance %p, handle 0x%s, allocator %p\n", instance, wine_dbgstr_longlong(handle), allocator ); if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); + list_remove( &surface->entry ); p_vkDestroySurfaceKHR( instance, surface->host_surface, NULL /* allocator */ ); driver_funcs->p_vulkan_surface_destroy( surface->hwnd, surface->driver_private ); free( surface ); @@ -239,6 +251,17 @@ static void vulkan_init(void) #undef LOAD_FUNCPTR } +void vulkan_detach_surfaces( struct list *surfaces ) +{ + struct surface *surface; + + LIST_FOR_EACH_ENTRY( surface, surfaces, struct surface, entry ) + { + list_remove( &surface->entry ); + list_init( &surface->entry ); + } +} + /*********************************************************************** * __wine_get_vulkan_driver (win32u.so) */ @@ -258,6 +281,10 @@ const struct vulkan_funcs *__wine_get_vulkan_driver( UINT version ) #else /* SONAME_LIBVULKAN */ +void vulkan_detach_surfaces( struct list *surfaces ) +{ +} + /*********************************************************************** * __wine_get_vulkan_driver (win32u.so) */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 73a0fa9e896..13dd1c8d80a 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4705,6 +4705,7 @@ static void free_window_handle( HWND hwnd ) */ LRESULT destroy_window( HWND hwnd ) { + struct list vulkan_surfaces = LIST_INIT(vulkan_surfaces); struct window_surface *surface; HMENU menu = 0, sys_menu; WND *win; @@ -4751,6 +4752,7 @@ LRESULT destroy_window( HWND hwnd ) free_dce( win->dce, hwnd ); win->dce = NULL; NtUserDestroyCursor( win->hIconSmall2, 0 ); + list_move_tail( &vulkan_surfaces, &win->vulkan_surfaces ); surface = win->surface; win->surface = NULL; release_win_ptr( win ); @@ -4763,6 +4765,7 @@ LRESULT destroy_window( HWND hwnd ) window_surface_release( surface ); } + vulkan_detach_surfaces( &vulkan_surfaces ); user_driver->pDestroyWindow( hwnd ); free_window_handle( hwnd ); @@ -4885,6 +4888,8 @@ void destroy_thread_windows(void) free_list = win->obj.handle; TRACE( "destroying %p\n", win ); + vulkan_detach_surfaces( &win->vulkan_surfaces ); + if ((win->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD && win->wIDmenu) NtUserDestroyMenu( UlongToHandle(win->wIDmenu) ); if (win->hSysMenu) NtUserDestroyMenu( win->hSysMenu ); @@ -4987,6 +4992,7 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, win->cbWndExtra = extra_bytes; win->dpi = dpi; win->dpi_awareness = awareness; + list_init( &win->vulkan_surfaces ); set_user_handle_ptr( handle, &win->obj ); if (is_winproc_unicode( win->winproc, !ansi )) win->flags |= WIN_ISUNICODE; return win;

1 0

Rémi Bernon : winewayland: Get rid of the now unnecessary surface wrapper.
by Alexandre Julliard May 1, 2024

May 1, 2024

Module: wine Branch: master Commit: 1db352213f4e29845c0b0db783226e433a295d8c URL: https://gitlab.winehq.org/wine/wine/-/commit/1db352213f4e29845c0b0db783226e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 13:45:11 2024 +0100 winewayland: Get rid of the now unnecessary surface wrapper. --- dlls/winewayland.drv/vulkan.c | 65 +++++++++++++------------------------------ 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index c47277d8e5d..4312d9b5e59 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -58,76 +58,54 @@ static VkBool32 (*pvkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalD static const struct vulkan_driver_funcs wayland_vulkan_driver_funcs; -struct wine_vk_surface +static HWND wine_vk_surface_get_hwnd(struct wayland_client_surface *client) { - struct wayland_client_surface *client; -}; - -static HWND wine_vk_surface_get_hwnd(struct wine_vk_surface *wine_vk_surface) -{ - return wl_surface_get_user_data(wine_vk_surface->client->wl_surface); + return wl_surface_get_user_data(client->wl_surface); } -static void wine_vk_surface_destroy(struct wine_vk_surface *wine_vk_surface) +static void wine_vk_surface_destroy(struct wayland_client_surface *client) { - if (wine_vk_surface->client) - { - HWND hwnd = wine_vk_surface_get_hwnd(wine_vk_surface); - struct wayland_surface *wayland_surface = wayland_surface_lock_hwnd(hwnd); + HWND hwnd = wine_vk_surface_get_hwnd(client); + struct wayland_surface *wayland_surface = wayland_surface_lock_hwnd(hwnd); - if (wayland_client_surface_release(wine_vk_surface->client) && - wayland_surface) - { - wayland_surface->client = NULL; - } - - if (wayland_surface) pthread_mutex_unlock(&wayland_surface->mutex); + if (wayland_client_surface_release(client) && wayland_surface) + { + wayland_surface->client = NULL; } - free(wine_vk_surface); + if (wayland_surface) pthread_mutex_unlock(&wayland_surface->mutex); } static VkResult wayland_vulkan_surface_create(HWND hwnd, VkInstance instance, VkSurfaceKHR *surface, void **private) { VkResult res; VkWaylandSurfaceCreateInfoKHR create_info_host; - struct wine_vk_surface *wine_vk_surface; struct wayland_surface *wayland_surface; + struct wayland_client_surface *client; TRACE("%p %p %p %p\n", hwnd, instance, surface, private); - wine_vk_surface = calloc(1, sizeof(*wine_vk_surface)); - if (!wine_vk_surface) - { - ERR("Failed to allocate memory for wayland vulkan surface\n"); - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - wayland_surface = wayland_surface_lock_hwnd(hwnd); if (!wayland_surface) { ERR("Failed to find wayland surface for hwnd=%p\n", hwnd); - /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + return VK_ERROR_OUT_OF_HOST_MEMORY; } - wine_vk_surface->client = wayland_surface_get_client(wayland_surface); + client = wayland_surface_get_client(wayland_surface); pthread_mutex_unlock(&wayland_surface->mutex); - if (!wine_vk_surface->client) + if (!client) { ERR("Failed to create client surface for hwnd=%p\n", hwnd); - /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + return VK_ERROR_OUT_OF_HOST_MEMORY; } create_info_host.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ create_info_host.display = process_wayland.wl_display; - create_info_host.surface = wine_vk_surface->client->wl_surface; + create_info_host.surface = client->wl_surface; res = pvkCreateWaylandSurfaceKHR(instance, &create_info_host, NULL /* allocator */, @@ -135,26 +113,23 @@ static VkResult wayland_vulkan_surface_create(HWND hwnd, VkInstance instance, Vk if (res != VK_SUCCESS) { ERR("Failed to create vulkan wayland surface, res=%d\n", res); - goto err; + wine_vk_surface_destroy(client); + return res; } - *private = wine_vk_surface; + *private = client; TRACE("Created surface=0x%s, private=%p\n", wine_dbgstr_longlong(*surface), *private); return VK_SUCCESS; - -err: - wine_vk_surface_destroy(wine_vk_surface); - return res; } static void wayland_vulkan_surface_destroy(HWND hwnd, void *private) { - struct wine_vk_surface *wine_vk_surface = private; + struct wayland_client_surface *client = private; TRACE("%p %p\n", hwnd, private); - wine_vk_surface_destroy(wine_vk_surface); + wine_vk_surface_destroy(client); } static void wayland_vulkan_surface_presented(HWND hwnd, VkResult result)

1 0

Rémi Bernon : win32u: Return the host surface directly from vulkan_surface_create.
by Alexandre Julliard May 1, 2024

May 1, 2024

Module: wine Branch: master Commit: f30f8a4258eadb8d4eb01dc51afc4871bbeec269 URL: https://gitlab.winehq.org/wine/wine/-/commit/f30f8a4258eadb8d4eb01dc51afc48… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 24 11:11:28 2024 +0200 win32u: Return the host surface directly from vulkan_surface_create. --- dlls/win32u/vulkan.c | 17 +++++------------ dlls/winemac.drv/vulkan.c | 36 ++++++++++-------------------------- dlls/winewayland.drv/vulkan.c | 33 ++++++++++----------------------- dlls/winex11.drv/vulkan.c | 34 +++++++++------------------------- include/wine/vulkan_driver.h | 7 +++---- 5 files changed, 37 insertions(+), 90 deletions(-)

1 0

Jacek Caban : mshtml: Move iface_wrapper_t IUnknown implementation to htmlobject.c.
by Alexandre Julliard May 1, 2024

May 1, 2024

Module: wine Branch: master Commit: 7d2d8c7e11f9181e2672910847e764b2a3a72339 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d2d8c7e11f9181e2672910847e764… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 1 16:51:23 2024 +0200 mshtml: Move iface_wrapper_t IUnknown implementation to htmlobject.c. And build ifacewrap.c as x86-64 code on ARM64EC. --- dlls/mshtml/htmlobject.c | 72 +++++++++-- dlls/mshtml/ifacewrap.c | 289 ++++++++++++++++--------------------------- dlls/mshtml/mshtml_private.h | 5 +- 3 files changed, 176 insertions(+), 190 deletions(-)

1 0