Module: wine Branch: master Commit: 90adeb125f3c9f0a42d1768b42dee620c067ae71 URL: https://gitlab.winehq.org/wine/wine/-/commit/90adeb125f3c9f0a42d1768b42dee62...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 30 17:02:54 2022 +0100
ntdll: Export the Unix call dispatcher function pointer.
---
dlls/ntdll/loader.c | 1 + dlls/ntdll/ntdll.spec | 3 ++- dlls/winecrt0/unix_lib.c | 8 ++++---- dlls/winevulkan/loader.c | 2 +- include/wine/unixlib.h | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 682fda9ed15..d8dba0ea357 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -71,6 +71,7 @@ typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_DATA_TABLE_ENTRY *, void *, BOOLEAN *);
void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) = NULL; +NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = __wine_unix_call;
static DWORD (WINAPI *pCtrlRoutine)(void *);
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1d4218e7b52..9225779eeaa 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1693,7 +1693,8 @@ @ stdcall -syscall __wine_unix_call(int64 long ptr) @ stdcall -syscall __wine_unix_spawnvp(long ptr) @ stdcall __wine_ctrl_routine(ptr) -@ extern __wine_syscall_dispatcher +@ extern -private __wine_syscall_dispatcher +@ extern -private __wine_unix_call_dispatcher @ extern -arch=arm64 __wine_current_teb
# Debugging diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index 1c8e2117dd0..5b809b6949d 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -44,17 +44,17 @@ static NTSTATUS WINAPI unix_call_fallback( unixlib_handle_t handle, unsigned int }
unixlib_handle_t __wine_unixlib_handle = 0; -NTSTATUS (WINAPI *__wine_unix_call_ptr)( unixlib_handle_t, unsigned int, void * ) = unix_call_fallback; +NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = unix_call_fallback;
NTSTATUS WINAPI __wine_init_unix_call(void) { NTSTATUS status; HMODULE module = GetModuleHandleW( L"ntdll.dll" ); - void *proc = GetProcAddress( module, "__wine_unix_call" ); + void **p__wine_unix_call_dispatcher = (void **)GetProcAddress( module, "__wine_unix_call_dispatcher" );
- if (!proc) return STATUS_DLL_NOT_FOUND; + if (!p__wine_unix_call_dispatcher) return STATUS_DLL_NOT_FOUND; status = NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); - if (!status) __wine_unix_call_ptr = proc; + if (!status) __wine_unix_call_dispatcher = *p__wine_unix_call_dispatcher; return status; } diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index f168e824ae8..6e20565179d 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -236,7 +236,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { NTSTATUS status = __wine_init_unix_call();
- p_vk_direct_unix_call = __wine_unix_call_ptr; + p_vk_direct_unix_call = __wine_unix_call_dispatcher; if (status) return FALSE; return !vk_unix_call(unix_init, &p_vk_direct_unix_call); } diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 977dabc77f3..f8360f1549e 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -268,10 +268,10 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */
extern unixlib_handle_t __wine_unixlib_handle DECLSPEC_HIDDEN; -extern NTSTATUS (WINAPI *__wine_unix_call_ptr)( unixlib_handle_t, unsigned int, void * ) DECLSPEC_HIDDEN; +extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI __wine_init_unix_call(void) DECLSPEC_HIDDEN;
-#define WINE_UNIX_CALL(code,args) __wine_unix_call_ptr( __wine_unixlib_handle, (code), (args) ) +#define WINE_UNIX_CALL(code,args) __wine_unix_call_dispatcher( __wine_unixlib_handle, (code), (args) )
#endif /* WINE_UNIX_LIB */