Alexandre Julliard : ntdll: Move the Unix function tables to avoid forward declarations, and make them static.
Module: wine Branch: master Commit: f5d272f5610fc0644fced4fe7d54571920a01396 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5d272f5610fc0644fced4fe7d54571...
Author: Alexandre Julliard julliard@winehq.org Date: Thu May 11 13:04:07 2023 +0200
ntdll: Move the Unix function tables to avoid forward declarations, and make them static.
---
dlls/ntdll/unix/loader.c | 222 +++++++++++++++++++++-------------------- dlls/ntdll/unix/unix_private.h | 3 - 2 files changed, 112 insertions(+), 113 deletions(-)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 53f9ba8af2b..893f2566ed9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1037,77 +1037,6 @@ static const void *get_module_data_dir( HMODULE module, ULONG dir, ULONG *size ) return get_rva( module, data->VirtualAddress ); }
-static void load_ntdll_functions( HMODULE module ) -{ - void **p__wine_unix_call_dispatcher; - unixlib_handle_t *p__wine_unixlib_handle; - - ntdll_exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); - assert( ntdll_exports ); - -#define GET_FUNC(name) \ - if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ - ERR( "%s not found\n", #name ) - - GET_FUNC( DbgUiRemoteBreakin ); - GET_FUNC( KiRaiseUserExceptionDispatcher ); - GET_FUNC( KiUserExceptionDispatcher ); - GET_FUNC( KiUserApcDispatcher ); - GET_FUNC( KiUserCallbackDispatcher ); - GET_FUNC( LdrInitializeThunk ); - GET_FUNC( LdrSystemDllInitBlock ); - GET_FUNC( RtlUserThreadStart ); - GET_FUNC( __wine_ctrl_routine ); - GET_FUNC( __wine_syscall_dispatcher ); - GET_FUNC( __wine_unix_call_dispatcher ); - GET_FUNC( __wine_unixlib_handle ); - *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; - *p__wine_unixlib_handle = (UINT_PTR)__wine_unix_call_funcs; -#ifdef __aarch64__ - { - void **p__wine_current_teb; - GET_FUNC( __wine_current_teb ); - *p__wine_current_teb = NtCurrentTeb; - } -#endif -#undef GET_FUNC -} - -static void load_ntdll_wow64_functions( HMODULE module ) -{ - const IMAGE_EXPORT_DIRECTORY *exports; - - exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); - assert( exports ); - - pLdrSystemDllInitBlock->ntdll_handle = (ULONG_PTR)module; - -#define GET_FUNC(name) pLdrSystemDllInitBlock->p##name = find_named_export( module, exports, #name ) - GET_FUNC( KiUserApcDispatcher ); - GET_FUNC( KiUserCallbackDispatcher ); - GET_FUNC( KiUserExceptionDispatcher ); - GET_FUNC( LdrInitializeThunk ); - GET_FUNC( LdrSystemDllInitBlock ); - GET_FUNC( RtlUserThreadStart ); - GET_FUNC( RtlpFreezeTimeBias ); - GET_FUNC( RtlpQueryProcessDebugInformationRemote ); -#undef GET_FUNC - - p__wine_ctrl_routine = (void *)find_named_export( module, exports, "__wine_ctrl_routine" ); - -#ifdef _WIN64 - { - unixlib_handle_t *p__wine_unixlib_handle = (void *)find_named_export( module, exports, - "__wine_unixlib_handle" ); - *p__wine_unixlib_handle = (UINT_PTR)__wine_unix_call_wow64_funcs; - } -#endif - - /* also set the 32-bit LdrSystemDllInitBlock */ - memcpy( (void *)(ULONG_PTR)pLdrSystemDllInitBlock->pLdrSystemDllInitBlock, - pLdrSystemDllInitBlock, sizeof(*pLdrSystemDllInitBlock) ); -} - /* reimplementation of LdrProcessRelocationBlock */ static const IMAGE_BASE_RELOCATION *process_relocation_block( void *module, const IMAGE_BASE_RELOCATION *rel, INT_PTR delta ) @@ -1343,6 +1272,39 @@ static NTSTATUS load_so_dll( void *args ) }
+static const unixlib_entry_t unix_call_funcs[] = +{ + load_so_dll, + unwind_builtin_dll, + unixcall_wine_dbg_write, + unixcall_wine_server_call, + unixcall_wine_server_fd_to_handle, + unixcall_wine_server_handle_to_fd, + unixcall_wine_spawnvp, + system_time_precise, +}; + + +#ifdef _WIN64 + +static NTSTATUS wow64_load_so_dll( void *args ) { return STATUS_INVALID_IMAGE_FORMAT; } +static NTSTATUS wow64_unwind_builtin_dll( void *args ) { return STATUS_UNSUCCESSFUL; } + +const unixlib_entry_t unix_call_wow64_funcs[] = +{ + wow64_load_so_dll, + wow64_unwind_builtin_dll, + wow64_wine_dbg_write, + wow64_wine_server_call, + wow64_wine_server_fd_to_handle, + wow64_wine_server_handle_to_fd, + wow64_wine_spawnvp, + system_time_precise, +}; + +#endif /* _WIN64 */ + + /* check if the library is the correct architecture */ /* only returns false for a valid library of the wrong arch */ static int check_library_arch( int fd ) @@ -1833,6 +1795,85 @@ NTSTATUS load_start_exe( WCHAR **image, void **module ) }
+/*********************************************************************** + * load_ntdll_functions + */ +static void load_ntdll_functions( HMODULE module ) +{ + void **p__wine_unix_call_dispatcher; + unixlib_handle_t *p__wine_unixlib_handle; + + ntdll_exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); + assert( ntdll_exports ); + +#define GET_FUNC(name) \ + if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ + ERR( "%s not found\n", #name ) + + GET_FUNC( DbgUiRemoteBreakin ); + GET_FUNC( KiRaiseUserExceptionDispatcher ); + GET_FUNC( KiUserExceptionDispatcher ); + GET_FUNC( KiUserApcDispatcher ); + GET_FUNC( KiUserCallbackDispatcher ); + GET_FUNC( LdrInitializeThunk ); + GET_FUNC( LdrSystemDllInitBlock ); + GET_FUNC( RtlUserThreadStart ); + GET_FUNC( __wine_ctrl_routine ); + GET_FUNC( __wine_syscall_dispatcher ); + GET_FUNC( __wine_unix_call_dispatcher ); + GET_FUNC( __wine_unixlib_handle ); + *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; + *p__wine_unixlib_handle = (UINT_PTR)unix_call_funcs; +#ifdef __aarch64__ + { + void **p__wine_current_teb; + GET_FUNC( __wine_current_teb ); + *p__wine_current_teb = NtCurrentTeb; + } +#endif +#undef GET_FUNC +} + + +/*********************************************************************** + * load_ntdll_wow64_functions + */ +static void load_ntdll_wow64_functions( HMODULE module ) +{ + const IMAGE_EXPORT_DIRECTORY *exports; + + exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); + assert( exports ); + + pLdrSystemDllInitBlock->ntdll_handle = (ULONG_PTR)module; + +#define GET_FUNC(name) pLdrSystemDllInitBlock->p##name = find_named_export( module, exports, #name ) + GET_FUNC( KiUserApcDispatcher ); + GET_FUNC( KiUserCallbackDispatcher ); + GET_FUNC( KiUserExceptionDispatcher ); + GET_FUNC( LdrInitializeThunk ); + GET_FUNC( LdrSystemDllInitBlock ); + GET_FUNC( RtlUserThreadStart ); + GET_FUNC( RtlpFreezeTimeBias ); + GET_FUNC( RtlpQueryProcessDebugInformationRemote ); +#undef GET_FUNC + + p__wine_ctrl_routine = (void *)find_named_export( module, exports, "__wine_ctrl_routine" ); + +#ifdef _WIN64 + { + unixlib_handle_t *p__wine_unixlib_handle = (void *)find_named_export( module, exports, + "__wine_unixlib_handle" ); + *p__wine_unixlib_handle = (UINT_PTR)unix_call_wow64_funcs; + } +#endif + + /* also set the 32-bit LdrSystemDllInitBlock */ + memcpy( (void *)(ULONG_PTR)pLdrSystemDllInitBlock->pLdrSystemDllInitBlock, + pLdrSystemDllInitBlock, sizeof(*pLdrSystemDllInitBlock) ); +} + + /*********************************************************************** * load_ntdll */ @@ -2001,45 +2042,6 @@ static ULONG_PTR get_image_address(void) return 0; }
- -/*********************************************************************** - * __wine_unix_call_funcs - */ -const unixlib_entry_t __wine_unix_call_funcs[] = -{ - load_so_dll, - unwind_builtin_dll, - unixcall_wine_dbg_write, - unixcall_wine_server_call, - unixcall_wine_server_fd_to_handle, - unixcall_wine_server_handle_to_fd, - unixcall_wine_spawnvp, - system_time_precise, -}; - - -#ifdef _WIN64 - -static NTSTATUS wow64_load_so_dll( void *args ) { return STATUS_INVALID_IMAGE_FORMAT; } -static NTSTATUS wow64_unwind_builtin_dll( void *args ) { return STATUS_UNSUCCESSFUL; } - -/*********************************************************************** - * __wine_unix_call_wow64_funcs - */ -const unixlib_entry_t __wine_unix_call_wow64_funcs[] = -{ - wow64_load_so_dll, - wow64_unwind_builtin_dll, - wow64_wine_dbg_write, - wow64_wine_server_call, - wow64_wine_server_fd_to_handle, - wow64_wine_server_handle_to_fd, - wow64_wine_spawnvp, - system_time_precise, -}; - -#endif /* _WIN64 */ - /*********************************************************************** * start_main_thread */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7b2dacf8afd..eac6434b64d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -42,9 +42,6 @@ static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64; #endif extern WORD native_machine DECLSPEC_HIDDEN;
-extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN; -extern const unixlib_entry_t __wine_unix_call_wow64_funcs[] DECLSPEC_HIDDEN; - static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
static inline BOOL is_machine_64bit( WORD machine )
-
Alexandre Julliard