Module: wine Branch: master Commit: 29f320edd9ec2908e999a03f25b025f4247bd4f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/29f320edd9ec2908e999a03f25b025f...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Aug 18 01:24:45 2022 +0200
win32u: Move process initialization to NtUserInitializeClientPfnArrays.
On wow64 64-bit win32u.dll is always loaded, causing win32u.so to initialize at earlier stage than it would otherwise do. This patch makes it more consistent across environments.
---
dlls/win32u/class.c | 12 ++++++++++++ dlls/win32u/gdiobj.c | 5 ++--- dlls/win32u/syscall.c | 8 +------- dlls/win32u/win32u_private.h | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 6f368b50431..28eabcc1f51 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -246,6 +246,14 @@ DLGPROC get_dialog_proc( DLGPROC ret, BOOL ansi ) return ansi ? proc->procA : proc->procW; }
+static void init_user(void) +{ + gdi_init(); + winstation_init(); + sysparams_init(); + register_desktop_class(); +} + /*********************************************************************** * NtUserInitializeClientPfnArrays (win32u.@) */ @@ -253,6 +261,8 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs const struct user_client_procs *client_procsW, const void *client_workers, HINSTANCE user_module ) { + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + winproc_array[WINPROC_BUTTON].procA = client_procsA->pButtonWndProc; winproc_array[WINPROC_BUTTON].procW = client_procsW->pButtonWndProc; winproc_array[WINPROC_COMBO].procA = client_procsA->pComboWndProc; @@ -283,6 +293,8 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs winproc_array[WINPROC_MESSAGE].procW = client_procsW->pMessageWndProc;
user32_module = user_module; + + pthread_once( &init_once, init_user ); return STATUS_SUCCESS; }
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 881c76ee165..f8a1bd96f8f 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1153,7 +1153,7 @@ static struct unix_funcs unix_funcs = __wine_send_input, };
-NTSTATUS gdi_init(void) +void gdi_init(void) { pthread_mutexattr_t attr; unsigned int dpi; @@ -1165,11 +1165,10 @@ NTSTATUS gdi_init(void)
NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); init_gdi_shared(); - if (!gdi_shared) return STATUS_NO_MEMORY; + if (!gdi_shared) return;
dpi = font_init(); init_stock_objects( dpi ); - return 0; }
NTSTATUS callbacks_init( void *args ) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index e36e7097047..5f78d8c6ab9 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -314,13 +314,7 @@ static SYSTEM_SERVICE_TABLE syscall_table =
static NTSTATUS init( void *dispatcher ) { - NTSTATUS status; - if ((status = ntdll_init_syscalls( 1, &syscall_table, dispatcher ))) return status; - if ((status = gdi_init())) return status; - winstation_init(); - sysparams_init(); - register_desktop_class(); - return STATUS_SUCCESS; + return ntdll_init_syscalls( 1, &syscall_table, dispatcher ); }
unixlib_entry_t __wine_unix_call_funcs[] = diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e1d163ea8eb..298cafcf7bf 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -411,7 +411,7 @@ static inline void release_win_ptr( struct tagWND *ptr ) }
extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; -extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; +extern void gdi_init(void) DECLSPEC_HIDDEN; extern NTSTATUS callbacks_init( void *args ) DECLSPEC_HIDDEN; extern void winstation_init(void) DECLSPEC_HIDDEN; extern void sysparams_init(void) DECLSPEC_HIDDEN;