zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mr/winewayland-unload-fix' into 'master'

Browse source 
winewayland: Delay setting user driver functions.

See merge request wine/wine!6438
This commit is contained in:
Aida Jonikienė 2024-11-19 00:27:32 +00:00
commit 30f133cc99
2 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dlls/winewayland.drv/wayland.c
View file

@ -32,6 +32,25 @@
WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv);
static const struct user_driver_funcs waylanddrv_funcs =
{
.pClipCursor = WAYLAND_ClipCursor,
.pDesktopWindowProc = WAYLAND_DesktopWindowProc,
.pDestroyWindow = WAYLAND_DestroyWindow,
.pKbdLayerDescriptor = WAYLAND_KbdLayerDescriptor,
.pReleaseKbdTables = WAYLAND_ReleaseKbdTables,
.pSetCursor = WAYLAND_SetCursor,
.pSetWindowText = WAYLAND_SetWindowText,
.pSysCommand = WAYLAND_SysCommand,
.pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices,
.pWindowMessage = WAYLAND_WindowMessage,
.pWindowPosChanged = WAYLAND_WindowPosChanged,
.pWindowPosChanging = WAYLAND_WindowPosChanging,
.pCreateWindowSurface = WAYLAND_CreateWindowSurface,
.pVulkanInit = WAYLAND_VulkanInit,
.pwine_get_wgl_driver = WAYLAND_wine_get_wgl_driver,
};
struct wayland process_wayland =
{
.seat.mutex = PTHREAD_MUTEX_INITIALIZER,
@ -244,8 +263,7 @@ BOOL wayland_process_init(void)
wl_registry_add_listener(process_wayland.wl_registry, &registry_listener, NULL);
/* We need two roundtrips. One to get and bind globals, one to handle all
* initial events produced from registering the globals. */
wl_display_roundtrip_queue(process_wayland.wl_display, process_wayland.wl_event_queue);
* initial events produced from registering the globals (which is ran later). */
wl_display_roundtrip_queue(process_wayland.wl_display, process_wayland.wl_event_queue);
/* Check for required protocol globals. */
@ -282,7 +300,11 @@ BOOL wayland_process_init(void)
if (!process_wayland.zwp_relative_pointer_manager_v1)
ERR("Wayland compositor doesn't support optional zwp_relative_pointer_manager_v1 (relative motion won't work)\n");
process_wayland.initialized = TRUE;
__wine_set_user_driver(&waylanddrv_funcs, WINE_GDI_DRIVER_VERSION);
/* The second roundtrip is delayed to avoid display device initialization. */
wl_display_roundtrip_queue(process_wayland.wl_display, process_wayland.wl_event_queue);
process_wayland.initialized = TRUE;
return TRUE;
}

29
dlls/winewayland.drv/waylanddrv_main.c
View file

@ -33,25 +33,6 @@
char *process_name = NULL;
static const struct user_driver_funcs waylanddrv_funcs =
{
.pClipCursor = WAYLAND_ClipCursor,
.pDesktopWindowProc = WAYLAND_DesktopWindowProc,
.pDestroyWindow = WAYLAND_DestroyWindow,
.pKbdLayerDescriptor = WAYLAND_KbdLayerDescriptor,
.pReleaseKbdTables = WAYLAND_ReleaseKbdTables,
.pSetCursor = WAYLAND_SetCursor,
.pSetWindowText = WAYLAND_SetWindowText,
.pSysCommand = WAYLAND_SysCommand,
.pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices,
.pWindowMessage = WAYLAND_WindowMessage,
.pWindowPosChanged = WAYLAND_WindowPosChanged,
.pWindowPosChanging = WAYLAND_WindowPosChanging,
.pCreateWindowSurface = WAYLAND_CreateWindowSurface,
.pVulkanInit = WAYLAND_VulkanInit,
.pwine_get_wgl_driver = WAYLAND_wine_get_wgl_driver,
};
static void wayland_init_process_name(void)
{
WCHAR *p, *appname;
@ -82,19 +63,11 @@ static void wayland_init_process_name(void)
static NTSTATUS waylanddrv_unix_init(void *arg)
{
/* Set the user driver functions now so that they are available during
* our initialization. We clear them on error. */
__wine_set_user_driver(&waylanddrv_funcs, WINE_GDI_DRIVER_VERSION);
wayland_init_process_name();
if (!wayland_process_init()) goto err;
if (!wayland_process_init()) return STATUS_UNSUCCESSFUL;
return 0;
err:
__wine_set_user_driver(NULL, WINE_GDI_DRIVER_VERSION);
return STATUS_UNSUCCESSFUL;
}
static NTSTATUS waylanddrv_unix_read_events(void *arg)