June 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Don't use WINAPI for KeUserModeCallback().
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 231f1854f5e7b91e500c077d9a6be899317bb9f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/231f1854f5e7b91e500c077d9a6be8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 13:59:14 2023 +0200 ntdll: Don't use WINAPI for KeUserModeCallback(). --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- include/wine/unixlib.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 4021019ab43..28cb2222809 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1206,7 +1206,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, /*********************************************************************** * KeUserModeCallback */ -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { struct syscall_frame *frame = arm_thread_data()->syscall_frame; void *args_data = (void *)((frame->sp - len) & ~15); diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index eb9fd4c8442..f553aac1993 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1159,7 +1159,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, /*********************************************************************** * KeUserModeCallback */ -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; void *args_data = (void *)((frame->sp - len) & ~15); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 28cd29f4960..293b8689c06 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1652,7 +1652,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, /*********************************************************************** * KeUserModeCallback */ -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { struct syscall_frame *frame = x86_thread_data()->syscall_frame; void *args_data = (void *)((frame->esp - len) & ~15); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 7ec519a6efd..508a3a5b323 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1668,7 +1668,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, /*********************************************************************** * KeUserModeCallback */ -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { struct syscall_frame *frame = amd64_thread_data()->syscall_frame; void *args_data = (void *)((frame->rsp - len) & ~15); diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index f8360f1549e..2513edfd5ed 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -81,7 +81,7 @@ extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); } \ } while (0); -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); /* wide char string functions */

1 0

Alexandre Julliard : ntdll: Store the PE function pointers as simple void pointers.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 1aa2f0d1281334b812d0c78c79ed430b3c15d266 URL: https://gitlab.winehq.org/wine/wine/-/commit/1aa2f0d1281334b812d0c78c79ed43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 17:23:03 2023 +0200 ntdll: Store the PE function pointers as simple void pointers. Their prototypes are not meaningful on the Unix side. --- dlls/ntdll/unix/loader.c | 16 ++++++++-------- dlls/ntdll/unix/unix_private.h | 17 ++++++++--------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5b8b6962b4a..4d855a18cff 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -104,14 +104,14 @@ static const char so_dir[] = "/aarch64-unix"; static const char so_dir[] = ""; #endif -void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; -NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; -NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; -void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; -void (WINAPI *pKiUserCallbackDispatcher)(ULONG,void*,ULONG) = NULL; -void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; -void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; -void (WINAPI *p__wine_ctrl_routine)(void*); +void *pDbgUiRemoteBreakin = NULL; +void *pKiRaiseUserExceptionDispatcher = NULL; +void *pKiUserExceptionDispatcher = NULL; +void *pKiUserApcDispatcher = NULL; +void *pKiUserCallbackDispatcher = NULL; +void *pLdrInitializeThunk = NULL; +void *pRtlUserThreadStart = NULL; +void *p__wine_ctrl_routine = NULL; SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; static void *p__wine_syscall_dispatcher; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7fd536db909..a9a829a1685 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -121,16 +121,15 @@ static const LONG teb_offset = 0x2000; #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) /* callbacks to PE ntdll from the Unix side */ -extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; -extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; -extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; -extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; -extern void (WINAPI *pKiUserCallbackDispatcher)(ULONG,void*,ULONG) DECLSPEC_HIDDEN; -extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; -extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; -extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN; +extern void *pDbgUiRemoteBreakin DECLSPEC_HIDDEN; +extern void *pKiRaiseUserExceptionDispatcher DECLSPEC_HIDDEN; +extern void *pKiUserExceptionDispatcher DECLSPEC_HIDDEN; +extern void *pKiUserApcDispatcher DECLSPEC_HIDDEN; +extern void *pKiUserCallbackDispatcher DECLSPEC_HIDDEN; +extern void *pLdrInitializeThunk DECLSPEC_HIDDEN; +extern void *pRtlUserThreadStart DECLSPEC_HIDDEN; +extern void *p__wine_ctrl_routine DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; -extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; struct _FILE_FS_DEVICE_INFORMATION;

1 0

Alexandre Julliard : include: Only declare __wine_unix_call() on the PE side.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 7d279bcd3b86bfc18d9a10313e4504ad3a973383 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d279bcd3b86bfc18d9a10313e4504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 20:56:35 2023 +0200 include: Only declare __wine_unix_call() on the PE side. --- include/wine/unixlib.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 2513edfd5ed..aa97e7d0843 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -21,9 +21,9 @@ #ifndef __WINE_WINE_UNIXLIB_H #define __WINE_WINE_UNIXLIB_H -typedef UINT64 unixlib_handle_t; +#include "winternl.h" -extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); +typedef UINT64 unixlib_handle_t; #ifdef WINE_UNIX_LIB @@ -267,6 +267,7 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */ +extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); extern unixlib_handle_t __wine_unixlib_handle 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;

1 0