- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Store the PE function pointers as simple void pointers.
by Alexandre Julliard June 1, 2023

June 1, 2023

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 June 1, 2023

June 1, 2023

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

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on i386.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: d8c39b3d5ace3a7349cb2762aad84ced5bb1563a URL: https://gitlab.winehq.org/wine/wine/-/commit/d8c39b3d5ace3a7349cb2762aad84c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 12:44:21 2023 +0200 ntdll: Don't pass arguments on the stack for user callbacks on i386. --- dlls/ntdll/unix/signal_i386.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 748828ad99e..28cd29f4960 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1574,8 +1574,8 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context /*********************************************************************** * call_user_mode_callback */ -extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; +extern NTSTATUS call_user_mode_callback( ULONG id, void *args, ULONG len, void **ret_ptr, + ULONG *ret_len, void *func, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -1588,7 +1588,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") - "movl 0x18(%ebp),%edx\n\t" /* teb */ + "movl 0x20(%ebp),%edx\n\t" /* teb */ "pushl 0(%edx)\n\t" /* teb->Tib.ExceptionList */ "subl $0x384,%esp\n\t" /* sizeof(struct syscall_frame) + ebp */ "andl $~63,%esp\n\t" @@ -1600,8 +1600,13 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movl %eax,0x38(%esp)\n\t" "movl %ecx,0x3c(%esp)\n\t" /* frame->prev_frame */ "movl %esp,0x1f8(%edx)\n\t" /* x86_thread_data()->syscall_frame */ - "movl 8(%ebp),%ecx\n\t" /* func */ - "movl 12(%ebp),%esp\n\t" /* stack */ + "movl 0x1c(%ebp),%ecx\n\t" /* func */ + "movl 0x0c(%ebp),%edx\n\t" /* args */ + "leal -4(%edx),%esp\n\t" + "pushl 0x10(%ebp)\n\t" /* len */ + "pushl %edx\n\t" /* args */ + "pushl 0x08(%ebp)\n\t" /* id */ + "pushl $0\n\t" "xorl %ebp,%ebp\n\t" "jmpl *%ecx" ) @@ -1609,8 +1614,8 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, /*********************************************************************** * user_mode_callback_return */ -extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "movl 16(%esp),%edx\n" /* teb */ "movl 0x1f8(%edx),%eax\n\t" /* x86_thread_data()->syscall_frame */ @@ -1627,9 +1632,9 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, "movl 8(%esp),%edi\n\t" /* ret_len */ "movl 12(%esp),%eax\n\t" /* status */ "leal -16(%ebp),%esp\n\t" - "movl 0x10(%ebp),%ecx\n\t" /* ret_ptr */ + "movl 0x14(%ebp),%ecx\n\t" /* ret_ptr */ "movl %esi,(%ecx)\n\t" - "movl 0x14(%ebp),%ecx\n\t" /* ret_len */ + "movl 0x18(%ebp),%ecx\n\t" /* ret_len */ "movl %edi,(%ecx)\n\t" "popl 0(%edx)\n\t" /* teb->Tib.ExceptionList */ "popl %edi\n\t" @@ -1651,19 +1656,13 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct syscall_frame *frame = x86_thread_data()->syscall_frame; void *args_data = (void *)((frame->esp - len) & ~15); - ULONG_PTR *stack = args_data; if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; memcpy( args_data, args, len ); - *(--stack) = 0; - *(--stack) = len; - *(--stack) = (ULONG_PTR)args_data; - *(--stack) = id; - *(--stack) = 0xdeadbabe; - - return call_user_mode_callback( pKiUserCallbackDispatcher, stack, ret_ptr, ret_len, NtCurrentTeb() ); + return call_user_mode_callback( id, args_data, len, ret_ptr, ret_len, + pKiUserCallbackDispatcher, NtCurrentTeb() ); }

1 0

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on ARM.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 091513ffaafd3b09dccada5df2ce31406a347c22 URL: https://gitlab.winehq.org/wine/wine/-/commit/091513ffaafd3b09dccada5df2ce31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 13:26:19 2023 +0200 ntdll: Don't pass arguments on the stack for user callbacks on ARM. --- dlls/ntdll/unix/signal_arm.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f862610497f..4021019ab43 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1152,13 +1152,14 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context /*********************************************************************** * call_user_mode_callback */ -extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; +extern NTSTATUS call_user_mode_callback( ULONG id, void *args, ULONG len, void **ret_ptr, + ULONG *ret_len, void *func, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, - "push {r2-r12,lr}\n\t" + "push {r4-r12,lr}\n\t" + "ldr ip, [sp, #0x2c]\n\t" /* func */ "ldr r4, [sp, #0x30]\n\t" /* teb */ "ldr r5, [r4]\n\t" /* teb->Tib.ExceptionList */ - "str r5, [sp, #0x28]\n\t" + "push {r3, r5}\n\t" #ifndef __SOFTFP__ "sub sp, sp, #0x90\n\t" "mov r5, sp\n\t" @@ -1172,17 +1173,15 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "str sp, [r4, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "ldr r6, [r5, #0x50]\n\t" /* prev_frame->syscall_table */ "str r6, [sp, #0x50]\n\t" /* frame->syscall_table */ - "mov ip, r0\n\t" "mov sp, r1\n\t" - "pop {r0-r3}\n\t" "bx ip" ) /*********************************************************************** * user_mode_callback_return */ -extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "ldr r4, [r3, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "ldr r5, [r4, #0x4c]\n\t" /* frame->prev_frame */ @@ -1195,9 +1194,9 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, "add r5, r5, #0x90\n\t" #endif "mov sp, r5\n\t" - "ldr r5, [sp, #0x28]\n\t" - "str r5, [r3]\n\t" /* teb->Tib.ExceptionList */ - "pop {r5, r6}\n\t" /* ret_ptr, ret_len */ + "pop {r5, r7}\n\t" + "ldr r6, [sp, #0x28]\n\t" /* ret_len */ + "str r7, [r3]\n\t" /* teb->Tib.ExceptionList */ "str r0, [r5]\n\t" /* ret_ptr */ "str r1, [r6]\n\t" /* ret_len */ "mov r0, r2\n\t" /* status */ @@ -1211,18 +1210,13 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct syscall_frame *frame = arm_thread_data()->syscall_frame; void *args_data = (void *)((frame->sp - len) & ~15); - ULONG_PTR *stack = args_data; if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; memcpy( args_data, args, len ); - *(--stack) = 0; - *(--stack) = len; - *(--stack) = (ULONG_PTR)args_data; - *(--stack) = id; - - return call_user_mode_callback( pKiUserCallbackDispatcher, stack, ret_ptr, ret_len, NtCurrentTeb() ); + return call_user_mode_callback( id, args_data, len, ret_ptr, ret_len, + pKiUserCallbackDispatcher, NtCurrentTeb() ); }

1 0

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on x86-64.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 50ac25554c8ecc799d5e94addb748cad503170ea URL: https://gitlab.winehq.org/wine/wine/-/commit/50ac25554c8ecc799d5e94addb748c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 12:06:56 2023 +0200 ntdll: Don't pass arguments on the stack for user callbacks on x86-64. And convert to the sysv ABI. --- dlls/ntdll/unix/signal_x86_64.c | 136 ++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 88 deletions(-)

1 0

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on ARM64.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: efa99eab0bc3edbf3f23bee9da316d901f7a14cb URL: https://gitlab.winehq.org/wine/wine/-/commit/efa99eab0bc3edbf3f23bee9da316d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 11:26:22 2023 +0200 ntdll: Don't pass arguments on the stack for user callbacks on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 45 +++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 75ba53acda3..eb9fd4c8442 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1092,14 +1092,11 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context /*********************************************************************** * call_user_mode_callback */ -extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; +extern NTSTATUS call_user_mode_callback( ULONG id, void *args, ULONG len, void **ret_ptr, + ULONG *ret_len, void *func, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "stp x29, x30, [sp,#-0xc0]!\n\t" "mov x29, sp\n\t" - "mov x16, x0\n\t" /* func */ - "mov x17, x1\n\t" /* stack */ - "mov x18, x4\n\t" /* teb */ "stp x19, x20, [x29, #0x10]\n\t" "stp x21, x22, [x29, #0x20]\n\t" "stp x23, x24, [x29, #0x30]\n\t" @@ -1109,29 +1106,28 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "stp d10, d11, [x29, #0x70]\n\t" "stp d12, d13, [x29, #0x80]\n\t" "stp d14, d15, [x29, #0x90]\n\t" - "stp x2, x3, [x29, #0xa0]\n\t" /* ret_ptr, ret_len */ - "mrs x5, fpcr\n\t" - "mrs x6, fpsr\n\t" - "bfi x5, x6, #0, #32\n\t" - "ldr x6, [x18]\n\t" /* teb->Tib.ExceptionList */ - "stp x5, x6, [x29, #0xb0]\n\t" + "stp x3, x4, [x29, #0xa0]\n\t" /* ret_ptr, ret_len */ + "mov x18, x6\n\t" /* teb */ + "mrs x3, fpcr\n\t" + "mrs x4, fpsr\n\t" + "bfi x3, x4, #0, #32\n\t" + "ldr x4, [x18]\n\t" /* teb->Tib.ExceptionList */ + "stp x3, x4, [x29, #0xb0]\n\t" "ldr x7, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ - "sub x5, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ - "str x5, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "sub x3, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ + "str x3, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "ldr x8, [x7, #0x118]\n\t" /* prev_frame->syscall_table */ - "ldp x0, x1, [x17]\n\t" /* id, args */ - "ldr x2, [x17, #0x10]\n\t" /* len */ - "mov sp, x17\n\t" - "stp x7, x8, [x5, #0x110]\n\t" /* frame->prev_frame, frame->syscall_table */ - "br x16" ) + "mov sp, x1\n\t" /* stack */ + "stp x7, x8, [x3, #0x110]\n\t" /* frame->prev_frame, frame->syscall_table */ + "br x5" ) /*********************************************************************** * user_mode_callback_return */ -extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "ldr x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "ldr x5, [x4, #0x110]\n\t" /* prev_frame */ @@ -1167,18 +1163,13 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; void *args_data = (void *)((frame->sp - len) & ~15); - ULONG_PTR *stack = args_data; if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; memcpy( args_data, args, len ); - *(--stack) = 0; - *(--stack) = len; - *(--stack) = (ULONG_PTR)args_data; - *(--stack) = id; - - return call_user_mode_callback( pKiUserCallbackDispatcher, stack, ret_ptr, ret_len, NtCurrentTeb() ); + return call_user_mode_callback( id, args_data, len, ret_ptr, ret_len, + pKiUserCallbackDispatcher, NtCurrentTeb() ); }

1 0

Rémi Bernon : user32/tests: Test more ClipCursor reset scenarios.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: 0a33018211ab50620923943876994266c06cfe3e URL: https://gitlab.winehq.org/wine/wine/-/commit/0a33018211ab506209239438769942… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 31 14:42:16 2023 +0200 user32/tests: Test more ClipCursor reset scenarios. --- dlls/user32/tests/input.c | 294 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 294 insertions(+)

1 0

Tim Clem : loader: Reserve some space for 32-bit top-down allocations on 64-bit.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: 6b0836e3f157318b00effc1de563da4d4b0d16b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b0836e3f157318b00effc1de563da… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed May 31 10:21:23 2023 -0700 loader: Reserve some space for 32-bit top-down allocations on 64-bit. --- loader/preloader.c | 4 ++-- loader/preloader_mac.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 72556f09720..3fbee0877d4 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -108,11 +108,11 @@ static struct wine_preload_info preload_info[] = { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ + { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared user data + virtual heap */ #else { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x00007f000000, 0x00ff0000 }, /* 32-bit top-down allocations + shared user data */ { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 8e249a7dc4d..4e91128c575 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -90,11 +90,11 @@ static struct wine_preload_info preload_info[] = { (void *)0x00001000, 0x0000f000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ + { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared user data + virtual heap */ #else /* __i386__ */ { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x00007f000000, 0x00ff0000 }, /* 32-bit top-down allocations + shared user data */ { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ { (void *)0x7ff000000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */

1 0

Rémi Bernon : user32/tests: Zero-initialize keyboard state array.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: 29ac54e3004e2a37b77983253a64e456d5507ffd URL: https://gitlab.winehq.org/wine/wine/-/commit/29ac54e3004e2a37b77983253a64e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 30 23:27:53 2023 +0200 user32/tests: Zero-initialize keyboard state array. --- dlls/user32/tests/input.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f3d5750c2f..6ca8779eceb 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4374,7 +4374,7 @@ static DWORD WINAPI get_key_state_thread(void *arg) struct get_key_state_test_desc* test; HANDLE *semaphores = params->semaphores; DWORD result; - BYTE keystate[256]; + BYTE keystate[256] = {0}; BOOL has_queue; BOOL expect_x, expect_c; MSG msg; @@ -4436,7 +4436,7 @@ static void test_GetKeyState(void) struct get_key_state_thread_params params; HANDLE thread; DWORD result; - BYTE keystate[256]; + BYTE keystate[256] = {0}; BOOL expect_x, expect_c; HWND hwnd; MSG msg; @@ -4449,7 +4449,6 @@ static void test_GetKeyState(void) return; } - memset(keystate, 0, sizeof(keystate)); params.semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); ok(params.semaphores[0] != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); params.semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL);

1 0

Rémi Bernon : user32/tests: Add a helper to run a test in a process.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: 1bf316c0d9d9afe2c1af10a3a3b21735a6d88994 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bf316c0d9d9afe2c1af10a3a3b217… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 31 11:45:15 2023 +0200 user32/tests: Add a helper to run a test in a process. --- dlls/user32/tests/input.c | 86 ++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 53 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6ca8779eceb..d1e132d2491 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -180,6 +180,24 @@ static void init_function_pointers(void) is_wow64 = FALSE; } +#define run_in_process( a, b ) run_in_process_( __FILE__, __LINE__, a, b ) +static void run_in_process_( const char *file, int line, char **argv, const char *args ) +{ + STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION info = {0}; + char cmdline[MAX_PATH * 2]; + DWORD ret; + + sprintf( cmdline, "%s %s %s", argv[0], argv[1], args ); + ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + ok_(file, line)( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); + if (!ret) return; + + wait_child_process( info.hProcess ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); +} + static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) { UINT message; @@ -1471,13 +1489,10 @@ done: SetCursorPos(pt_org.x, pt_org.y); } -static void test_GetMouseMovePointsEx(const char *argv0) +static void test_GetMouseMovePointsEx( char **argv ) { #define BUFLIM 64 #define MYERROR 0xdeadbeef - PROCESS_INFORMATION process_info; - STARTUPINFOA startup_info; - char path[MAX_PATH]; int i, count, retval; MOUSEMOVEPOINT in; MOUSEMOVEPOINT out[200]; @@ -1695,16 +1710,7 @@ static void test_GetMouseMovePointsEx(const char *argv0) retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_HIGH_RESOLUTION_POINTS ); todo_wine ok( retval == 64, "expected to get 64 high resolution mouse move points but got %d\n", retval ); - sprintf(path, "%s input get_mouse_move_points_test", argv0); - memset(&startup_info, 0, sizeof(startup_info)); - startup_info.cb = sizeof(startup_info); - startup_info.dwFlags = STARTF_USESHOWWINDOW; - startup_info.wShowWindow = SW_SHOWNORMAL; - retval = CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info ); - ok(retval, "CreateProcess \"%s\" failed err %lu.\n", path, GetLastError()); - winetest_wait_child_process(process_info.hProcess); - CloseHandle(process_info.hProcess); - CloseHandle(process_info.hThread); + run_in_process( argv, "test_GetMouseMovePointsEx_process" ); #undef BUFLIM #undef MYERROR } @@ -5045,11 +5051,13 @@ static void test_GetPointerInfo( BOOL mouse_in_pointer_enabled ) ok( ret, "UnregisterClassW failed: %lu\n", GetLastError() ); } -static void test_EnableMouseInPointer_process( const char *arg ) +static void test_EnableMouseInPointer( const char *arg ) { DWORD enable = strtoul( arg, 0, 10 ); BOOL ret; + winetest_push_context( "enable %lu", enable ); + ret = pEnableMouseInPointer( enable ); todo_wine ok( ret, "EnableMouseInPointer failed, error %lu\n", GetLastError() ); @@ -5071,23 +5079,8 @@ static void test_EnableMouseInPointer_process( const char *arg ) ok( ret == enable, "IsMouseInPointerEnabled returned %u, error %lu\n", ret, GetLastError() ); test_GetPointerInfo( enable ); -} - -static void test_EnableMouseInPointer( char **argv, BOOL enable ) -{ - STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; - PROCESS_INFORMATION info = {0}; - char cmdline[MAX_PATH * 2]; - BOOL ret; - sprintf( cmdline, "%s %s EnableMouseInPointer %u", argv[0], argv[1], enable ); - ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); - ok( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); - if (!ret) return; - - wait_child_process( info.hProcess ); - CloseHandle( info.hThread ); - CloseHandle( info.hProcess ); + winetest_pop_context(); } START_TEST(input) @@ -5100,25 +5093,12 @@ START_TEST(input) GetCursorPos( &pos ); argc = winetest_get_mainargs(&argv); - if (argc >= 3 && strcmp(argv[2], "rawinput_test") == 0) - { - rawinput_test_process(); - return; - } - - if (argc >= 3 && strcmp(argv[2], "get_mouse_move_points_test") == 0) - { - test_GetMouseMovePointsEx_process(); - return; - } - - if (argc >= 4 && strcmp( argv[2], "EnableMouseInPointer" ) == 0) - { - winetest_push_context( "enable %s", argv[3] ); - test_EnableMouseInPointer_process( argv[3] ); - winetest_pop_context(); - return; - } + if (argc >= 3 && !strcmp( argv[2], "rawinput_test" )) + return rawinput_test_process(); + if (argc >= 3 && !strcmp( argv[2], "test_GetMouseMovePointsEx_process" )) + return test_GetMouseMovePointsEx_process(); + if (argc >= 4 && !strcmp( argv[2], "test_EnableMouseInPointer" )) + return test_EnableMouseInPointer( argv[3] ); test_SendInput(); test_Input_blackbox(); @@ -5144,7 +5124,7 @@ START_TEST(input) test_DefRawInputProc(); if(pGetMouseMovePointsEx) - test_GetMouseMovePointsEx(argv[0]); + test_GetMouseMovePointsEx( argv ); else win_skip("GetMouseMovePointsEx is not available\n"); @@ -5171,7 +5151,7 @@ START_TEST(input) win_skip( "EnableMouseInPointer not found, skipping tests\n" ); else { - test_EnableMouseInPointer( argv, FALSE ); - test_EnableMouseInPointer( argv, TRUE ); + run_in_process( argv, "test_EnableMouseInPointer 0" ); + run_in_process( argv, "test_EnableMouseInPointer 1" ); } }

1 0