- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Remove some noisy traces.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: effdb707b0587cba3dafb9ffb6be4927c322123b URL: https://gitlab.winehq.org/wine/wine/-/commit/effdb707b0587cba3dafb9ffb6be49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 09:55:02 2023 +0100 ntdll/tests: Remove some noisy traces. --- dlls/ntdll/tests/exception.c | 101 ++++++++++--------------------------------- 1 file changed, 22 insertions(+), 79 deletions(-)

1 0

Alexandre Julliard : ntdll: Fix stack layout for KiUserExceptionDispatcher on i386.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: 58a00854c3c22708a0dda9ea9a9b167247b81bce URL: https://gitlab.winehq.org/wine/wine/-/commit/58a00854c3c22708a0dda9ea9a9b16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 17:39:08 2023 +0100 ntdll: Fix stack layout for KiUserExceptionDispatcher on i386. --- dlls/ntdll/tests/exception.c | 21 +++++++---- dlls/ntdll/unix/signal_i386.c | 82 ++++++++++++++++++++++++++----------------- dlls/wow64/struct32.h | 7 ++++ dlls/wow64/syscall.c | 38 +++++++++++--------- 4 files changed, 91 insertions(+), 57 deletions(-)

1 0

Alexandre Julliard : ntdll: Skip NtRaiseException() call on ARM64 when debugger is not present.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: b5cd47f54156814437783ca0b89977849e0ab037 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5cd47f54156814437783ca0b89977… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 17:20:31 2023 +0100 ntdll: Skip NtRaiseException() call on ARM64 when debugger is not present. --- dlls/ntdll/signal_arm64.c | 6 +++++- dlls/ntdll/tests/exception.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 08fde6ccf1e..0083f78412c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1550,7 +1550,11 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ "str x5, [x1, #0x108]\n\t" /* context->Pc */ "str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ - "mov x2, #1\n\t" + "ldr x3, [x18, #0x60]\n\t" /* peb */ + "ldrb w2, [x3, #2]\n\t" /* peb->BeingDebugged */ + "cbnz w2, 1f\n\t" + "bl " __ASM_NAME("dispatch_exception") "\n" + "1:\tmov x2, #1\n\t" "bl " __ASM_NAME("NtRaiseException") "\n\t" "bl " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 792695869e2..3057ceb3f20 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8646,7 +8646,6 @@ static void test_KiUserExceptionDispatcher(void) pRtlRaiseException(&record); ok(got_exception, "Handler was not called.\n"); - todo_wine ok(!hook_called, "Hook was called.\n"); memcpy( pKiUserExceptionDispatcher, patched_code, sizeof(patched_code) );

1 0

Alexandre Julliard : ntdll: Fix stack layout and unwind information for KiUserExceptionDispatcher on ARM64.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: 9bbdf6c7b5fbe50c8f145aaaf2db889eb0baefa9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bbdf6c7b5fbe50c8f145aaaf2db88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 17:10:17 2023 +0100 ntdll: Fix stack layout and unwind information for KiUserExceptionDispatcher on ARM64. --- dlls/ntdll/signal_arm64.c | 25 +++++++--- dlls/ntdll/tests/exception.c | 101 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 109 ++++++++--------------------------------- 3 files changed, 141 insertions(+), 94 deletions(-)

1 0

Alexandre Julliard : ntdll: Fix stack layout and unwind information for KiUserCallbackDispatcher on ARM64.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: d6bd264460a3f211cce2d9396b039700ddc4064d URL: https://gitlab.winehq.org/wine/wine/-/commit/d6bd264460a3f211cce2d9396b0397… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 17:18:13 2023 +0100 ntdll: Fix stack layout and unwind information for KiUserCallbackDispatcher on ARM64. --- dlls/ntdll/signal_arm64.c | 13 +++++++++- dlls/ntdll/tests/exception.c | 55 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 57 +++++++++++++++++++++++++++++------------- 3 files changed, 106 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 34624f4aa0c..08fde6ccf1e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -605,7 +605,7 @@ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, /******************************************************************* * KiUserCallbackDispatcher (NTDLL.@) */ -void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +void WINAPI dispatch_callback( void *args, ULONG len, ULONG id ) { NTSTATUS status; @@ -623,6 +623,17 @@ void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) RtlRaiseStatus( status ); } +__ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, + __ASM_SEH(".seh_pushframe\n\t") + "nop\n\t" + __ASM_SEH(".seh_stackalloc 0x20\n\t") + "nop\n\t" + __ASM_SEH(".seh_save_reg lr, 0x18\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldr x0, [sp]\n\t" /* args */ + "ldp w1, w2, [sp, #0x08]\n\t" /* len, id */ + "bl " __ASM_NAME("dispatch_callback") "\n\t" + "brk #1" ) /*********************************************************************** diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 69bfbf0771d..792695869e2 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8750,6 +8750,60 @@ static void test_KiUserApcDispatcher(void) VirtualProtect( pKiUserApcDispatcher, sizeof(saved_code), old_protect, &old_protect ); } +static void WINAPI hook_KiUserCallbackDispatcher(void *sp) +{ + struct + { + void *args; + ULONG len; + ULONG id; + ULONG64 unknown; + ULONG64 lr; + ULONG64 sp; + ULONG64 pc; + BYTE args_data[0]; + } *stack = sp; + ULONG_PTR redzone = (BYTE *)stack->sp - &stack->args_data[stack->len]; + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[stack->id]; + + trace( "stack=%p len=%lx id=%lx unk=%Ix lr=%Ix sp=%Ix pc=%Ix\n", + stack, stack->len, stack->id, stack->unknown, stack->lr, stack->sp, stack->pc ); + + ok( stack->args == stack->args_data, "wrong args %p / %p\n", stack->args, stack->args_data ); + ok( redzone >= 16 && redzone <= 32, "wrong sp %p / %p (%Iu)\n", + (void *)stack->sp, stack->args_data, redzone ); + + if (pRtlPcToFileHeader) + { + void *mod, *win32u = GetModuleHandleA("win32u.dll"); + + pRtlPcToFileHeader( (void *)stack->pc, &mod ); + ok( mod == win32u, "pc %Ix not in win32u %p\n", stack->pc, win32u ); + } + NtCallbackReturn( NULL, 0, func( stack->args, stack->len )); +} + + void test_KiUserCallbackDispatcher(void) +{ + DWORD old_protect; + BOOL ret; + + ret = VirtualProtect( pKiUserCallbackDispatcher, sizeof(saved_code), + PAGE_EXECUTE_READWRITE, &old_protect ); + ok( ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError() ); + + memcpy( saved_code, pKiUserCallbackDispatcher, sizeof(saved_code)); + *(void **)&patched_code[3] = hook_KiUserCallbackDispatcher; + memcpy( pKiUserCallbackDispatcher, patched_code, sizeof(patched_code)); + FlushInstructionCache(GetCurrentProcess(), pKiUserCallbackDispatcher, sizeof(patched_code)); + + DestroyWindow( CreateWindowA( "Static", "test", 0, 0, 0, 0, 0, 0, 0, 0, 0 )); + + memcpy( pKiUserCallbackDispatcher, saved_code, sizeof(saved_code)); + FlushInstructionCache(GetCurrentProcess(), pKiUserCallbackDispatcher, sizeof(saved_code)); + VirtualProtect( pKiUserCallbackDispatcher, sizeof(saved_code), old_protect, &old_protect ); +} + #endif /* __aarch64__ */ #if defined(__i386__) || defined(__x86_64__) @@ -12014,6 +12068,7 @@ START_TEST(exception) test_virtual_unwind(); test_KiUserExceptionDispatcher(); test_KiUserApcDispatcher(); + test_KiUserCallbackDispatcher(); #elif defined(__arm__) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 86bf3c9e349..f96ec330796 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -151,6 +151,21 @@ struct apc_stack_layout C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); C_ASSERT( sizeof(struct apc_stack_layout) == 0x3d0 ); +/* stack layout when calling KiUserCallbackDispatcher */ +struct callback_stack_layout +{ + void *args; /* 000 arguments */ + ULONG len; /* 008 arguments len */ + ULONG id; /* 00c function id */ + ULONG64 unknown; /* 010 */ + ULONG64 lr; /* 018 */ + ULONG64 sp; /* 020 sp+pc (machine frame) */ + ULONG64 pc; /* 028 */ + BYTE args_data[0]; /* 030 copied argument data*/ +}; +C_ASSERT( offsetof(struct callback_stack_layout, sp) == 0x20 ); +C_ASSERT( sizeof(struct callback_stack_layout) == 0x30 ); + struct syscall_frame { ULONG64 x[29]; /* 000 */ @@ -1053,8 +1068,8 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context /*********************************************************************** * call_user_mode_callback */ -extern NTSTATUS call_user_mode_callback( ULONG id, void *args, ULONG len, void **ret_ptr, - ULONG *ret_len, void *func, TEB *teb ); +extern NTSTATUS call_user_mode_callback( ULONG64 user_sp, void **ret_ptr, ULONG *ret_len, + void *func, TEB *teb ); __ASM_GLOBAL_FUNC( call_user_mode_callback, "stp x29, x30, [sp,#-0xc0]!\n\t" __ASM_CFI(".cfi_def_cfa_offset 0xc0\n\t") @@ -1081,22 +1096,22 @@ __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 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" + "stp x1, x2, [x29, #0xa0]\n\t" /* ret_ptr, ret_len */ + "mov x18, x4\n\t" /* teb */ + "mrs x1, fpcr\n\t" + "mrs x2, fpsr\n\t" + "bfi x1, x2, #0, #32\n\t" + "ldr x2, [x18]\n\t" /* teb->Tib.ExceptionList */ + "stp x1, x2, [x29, #0xb0]\n\t" "ldr x7, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ - "sub x3, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ - "str x3, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ + "sub x1, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ + "str x1, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "add x8, x29, #0xc0\n\t" - "stp x7, x8, [x3, #0x110]\n\t" /* frame->prev_frame,syscall_cfa */ + "stp x7, x8, [x1, #0x110]\n\t" /* frame->prev_frame,syscall_cfa */ /* switch to user stack */ - "mov sp, x1\n\t" /* stack */ - "br x5" ) + "mov sp, x0\n\t" /* user_sp */ + "br x3" ) /*********************************************************************** @@ -1186,14 +1201,20 @@ __ASM_GLOBAL_FUNC( user_mode_abort_thread, 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); + ULONG64 sp = (frame->sp - offsetof( struct callback_stack_layout, args_data[len] ) - 16) & ~15; + struct callback_stack_layout *stack = (struct callback_stack_layout *)sp; if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; - memcpy( args_data, args, len ); - return call_user_mode_callback( id, args_data, len, ret_ptr, ret_len, - pKiUserCallbackDispatcher, NtCurrentTeb() ); + stack->args = stack->args_data; + stack->len = len; + stack->id = id; + stack->lr = frame->lr; + stack->sp = frame->sp; + stack->pc = frame->pc; + memcpy( stack->args_data, args, len ); + return call_user_mode_callback( sp, ret_ptr, ret_len, pKiUserCallbackDispatcher, NtCurrentTeb() ); }

1 0

Alexandre Julliard : ntdll: Fix stack layout and unwind information for KiUserApcDispatcher on ARM64.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: 060a8b4af236b69d131ac49e8f32b9dea073ed9e URL: https://gitlab.winehq.org/wine/wine/-/commit/060a8b4af236b69d131ac49e8f32b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 17:15:07 2023 +0100 ntdll: Fix stack layout and unwind information for KiUserApcDispatcher on ARM64. --- dlls/ntdll/signal_arm64.c | 20 ++++++---- dlls/ntdll/tests/exception.c | 85 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 31 ++++++++++----- 3 files changed, 120 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 985ee28a540..34624f4aa0c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -587,13 +587,19 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, /******************************************************************* * KiUserApcDispatcher (NTDLL.@) */ -void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, - PNTAPCFUNC apc ) -{ - void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*) = (void *)apc; - func( arg1, arg2, arg3, context ); - NtContinue( context, TRUE ); -} +__ASM_GLOBAL_FUNC( KiUserApcDispatcher, + __ASM_SEH(".seh_context\n\t") + "nop\n\t" + __ASM_SEH(".seh_stackalloc 0x30\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldp x16, x0, [sp]\n\t" /* func, arg1 */ + "ldp x1, x2, [sp, #0x10]\n\t" /* arg2, arg3 */ + "add x3, sp, #0x30\n\t" /* context (FIXME) */ + "blr x16\n\t" + "add x0, sp, #0x30\n\t" /* context */ + "ldr w1, [sp, #0x20]\n\t" /* alertable */ + "bl " __ASM_NAME("NtContinue") "\n\t" + "brk #1" ) /******************************************************************* diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7a8090868b8..69bfbf0771d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8666,6 +8666,90 @@ static void test_KiUserExceptionDispatcher(void) VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_code), old_protect, &old_protect); } + +static UINT apc_count; + +static void CALLBACK apc_func( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) +{ + ok( arg1 == 0x1234 + apc_count, "wrong arg1 %Ix\n", arg1 ); + ok( arg2 == 0x5678, "wrong arg2 %Ix\n", arg2 ); + ok( arg3 == 0xdeadbeef, "wrong arg3 %Ix\n", arg3 ); + apc_count++; +} + +static void * WINAPI hook_KiUserApcDispatcher(void *stack) +{ + struct + { + void *func; + ULONG64 args[3]; + ULONG64 alertable; + ULONG64 align; + CONTEXT context; + } *args = stack; + + trace( "stack=%p func=%p args=%Ix,%Ix,%Ix alertable=%Ix context=%p pc=%Ix sp=%Ix (%Ix)\n", + args, args->func, args->args[0], args->args[1], args->args[2], + args->alertable, &args->context, args->context.Pc, args->context.Sp, + args->context.Sp - (ULONG_PTR)stack ); + + ok( args->func == apc_func, "wrong func %p / %p\n", args->func, apc_func ); + ok( args->args[0] == 0x1234 + apc_count, "wrong arg1 %Ix\n", args->args[0] ); + ok( args->args[1] == 0x5678, "wrong arg2 %Ix\n", args->args[1] ); + ok( args->args[2] == 0xdeadbeef, "wrong arg3 %Ix\n", args->args[2] ); + + if (apc_count) args->alertable = FALSE; + pNtQueueApcThread( GetCurrentThread(), apc_func, 0x1234 + apc_count + 1, 0x5678, 0xdeadbeef ); + + hook_called = TRUE; + memcpy( pKiUserApcDispatcher, saved_code, sizeof(saved_code)); + FlushInstructionCache( GetCurrentProcess(), pKiUserApcDispatcher, sizeof(saved_code)); + return pKiUserApcDispatcher; +} + +static void test_KiUserApcDispatcher(void) +{ + ULONG hook_trampoline[] = + { + 0x910003e0, /* mov x0, sp */ + 0x5800006f, /* ldr x15, 1f */ + 0xd63f01e0, /* blr x15 */ + 0xd61f0000, /* br x0 */ + 0, 0, /* 1: hook_KiUserApcDispatcher */ + }; + DWORD old_protect; + BOOL ret; + + *(void **)&hook_trampoline[4] = hook_KiUserApcDispatcher; + memcpy(code_mem, hook_trampoline, sizeof(hook_trampoline)); + + ret = VirtualProtect( pKiUserApcDispatcher, sizeof(saved_code), + PAGE_EXECUTE_READWRITE, &old_protect ); + ok( ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError() ); + + memcpy( saved_code, pKiUserApcDispatcher, sizeof(saved_code) ); + *(void **)&patched_code[3] = code_mem; + memcpy( pKiUserApcDispatcher, patched_code, sizeof(patched_code) ); + FlushInstructionCache( GetCurrentProcess(), pKiUserApcDispatcher, sizeof(patched_code)); + + hook_called = FALSE; + apc_count = 0; + pNtQueueApcThread( GetCurrentThread(), apc_func, 0x1234, 0x5678, 0xdeadbeef ); + SleepEx( 0, TRUE ); + ok( apc_count == 2, "APC count %u\n", apc_count ); + ok( hook_called, "hook was not called\n" ); + + memcpy( pKiUserApcDispatcher, patched_code, sizeof(patched_code) ); + FlushInstructionCache( GetCurrentProcess(), pKiUserApcDispatcher, sizeof(patched_code)); + pNtQueueApcThread( GetCurrentThread(), apc_func, 0x1234 + apc_count, 0x5678, 0xdeadbeef ); + SleepEx( 0, TRUE ); + ok( apc_count == 3, "APC count %u\n", apc_count ); + SleepEx( 0, TRUE ); + ok( apc_count == 4, "APC count %u\n", apc_count ); + + VirtualProtect( pKiUserApcDispatcher, sizeof(saved_code), old_protect, &old_protect ); +} + #endif /* __aarch64__ */ #if defined(__i386__) || defined(__x86_64__) @@ -11929,6 +12013,7 @@ START_TEST(exception) test_continue(); test_virtual_unwind(); test_KiUserExceptionDispatcher(); + test_KiUserApcDispatcher(); #elif defined(__arm__) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ab38d83477f..86bf3c9e349 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -138,6 +138,19 @@ struct exc_stack_layout C_ASSERT( offsetof(struct exc_stack_layout, rec) == 0x390 ); C_ASSERT( sizeof(struct exc_stack_layout) == 0x440 ); +/* stack layout when calling KiUserApcDispatcher */ +struct apc_stack_layout +{ + void *func; /* 000 APC to call*/ + ULONG64 args[3]; /* 008 function arguments */ + ULONG64 alertable; /* 020 */ + ULONG64 align; /* 028 */ + CONTEXT context; /* 030 */ + ULONG64 redzone[2]; /* 3c0 */ +}; +C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); +C_ASSERT( sizeof(struct apc_stack_layout) == 0x3d0 ); + struct syscall_frame { ULONG64 x[29]; /* 000 */ @@ -979,7 +992,7 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; ULONG64 sp = context ? context->Sp : frame->sp; - struct apc_stack_layout { CONTEXT context; } *stack; + struct apc_stack_layout *stack; sp &= ~15; stack = (struct apc_stack_layout *)sp - 1; @@ -994,14 +1007,14 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a NtGetContextThread( GetCurrentThread(), &stack->context ); stack->context.X0 = status; } - frame->sp = (ULONG64)stack; - frame->pc = (ULONG64)pKiUserApcDispatcher; - frame->x[0] = (ULONG64)&stack->context; - frame->x[1] = arg1; - frame->x[2] = arg2; - frame->x[3] = arg3; - frame->x[4] = (ULONG64)func; - frame->restore_flags |= CONTEXT_CONTROL | CONTEXT_INTEGER; + stack->func = func; + stack->args[0] = arg1; + stack->args[1] = arg2; + stack->args[2] = arg3; + + frame->sp = (ULONG64)stack; + frame->pc = (ULONG64)pKiUserApcDispatcher; + frame->restore_flags |= CONTEXT_CONTROL; syscall_frame_fixup_for_fastpath( frame ); return status; }

1 0

Paul Gofman : setupapi: Add stubs for SetupDiGetCustomDeviceProperty{A|W}().
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 1e4db62e0ba0b8595748c94b032dfb0064207de1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e4db62e0ba0b8595748c94b032dfb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 24 15:39:13 2023 -0600 setupapi: Add stubs for SetupDiGetCustomDeviceProperty{A|W}(). --- dlls/setupapi/devinst.c | 20 ++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 ++ 2 files changed, 22 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2a8820ba07f..7e2d683daa6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -5288,3 +5288,23 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) return TRUE; } + +BOOL WINAPI SetupDiGetCustomDevicePropertyA(HDEVINFO devinfo, SP_DEVINFO_DATA *data, const char *name, DWORD flags, + DWORD *reg_type, BYTE *buffer, DWORD bufsize, DWORD *required) +{ + FIXME("devinfo %p, data %p, name %s, flags %#lx, reg_type %p, buffer %p, bufsize %lu, required %p stub.\n", + devinfo, data, debugstr_a(name), flags, reg_type, buffer, bufsize, required); + + SetLastError(ERROR_INVALID_DATA); + return FALSE; +} + +BOOL WINAPI SetupDiGetCustomDevicePropertyW(HDEVINFO devinfo, SP_DEVINFO_DATA *data, const WCHAR *name, DWORD flags, + DWORD *reg_type, BYTE *buffer, DWORD bufsize, DWORD *required) +{ + FIXME("devinfo %p, data %p, name %s, flags %#lx, reg_type %p, buffer %p, bufsize %lu, required %p stub.\n", + devinfo, data, debugstr_w(name), flags, reg_type, buffer, bufsize, required); + + SetLastError(ERROR_INVALID_DATA); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 7578fb25c9c..4d144fe739b 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -337,6 +337,8 @@ @ stub SetupDiGetClassInstallParamsA @ stub SetupDiGetClassInstallParamsW @ stdcall SetupDiGetClassRegistryPropertyW(ptr long ptr ptr long ptr wstr ptr) +@ stdcall SetupDiGetCustomDevicePropertyA(ptr ptr str long ptr ptr long ptr) +@ stdcall SetupDiGetCustomDevicePropertyW(ptr ptr wstr long ptr ptr long ptr) @ stub SetupDiGetDeviceInfoListClass @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr)

1 0

Robert Wilhelm : vbscript: Sub argument has precedence over global const and local dim.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: b13e7ba7a4953f4b3b14ade9358d24f5610a2913 URL: https://gitlab.winehq.org/wine/wine/-/commit/b13e7ba7a4953f4b3b14ade9358d24… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed Nov 29 21:09:04 2023 +0100 vbscript: Sub argument has precedence over global const and local dim. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55502 --- dlls/vbscript/compile.c | 57 ++++++++++++++++++++++---------------------- dlls/vbscript/tests/lang.vbs | 13 ++++++++++ 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index f86ecfded91..683c71e2f4e 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -425,6 +425,30 @@ static expression_t *lookup_const_decls(compile_ctx_t *ctx, const WCHAR *name, B return NULL; } +static BOOL lookup_args_name(compile_ctx_t *ctx, const WCHAR *name) +{ + unsigned i; + + for(i = 0; i < ctx->func->arg_cnt; i++) { + if(!wcsicmp(ctx->func->args[i].name, name)) + return TRUE; + } + + return FALSE; +} + +static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) +{ + dim_decl_t *dim_decl; + + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + if(!wcsicmp(dim_decl->name, name)) + return TRUE; + } + + return FALSE; +} + static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *ret) { unsigned arg_cnt = 0; @@ -479,10 +503,11 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t if (expr->obj_expr) /* FIXME: we should probably have a dedicated opcode as well */ return compile_member_call_expression(ctx, expr, 0, TRUE); - const_expr = lookup_const_decls(ctx, expr->identifier, TRUE); - if(const_expr) - return compile_expression(ctx, const_expr); - + if (!lookup_dim_decls(ctx, expr->identifier) && !lookup_args_name(ctx, expr->identifier)) { + const_expr = lookup_const_decls(ctx, expr->identifier, TRUE); + if(const_expr) + return compile_expression(ctx, const_expr); + } return push_instr_bstr(ctx, OP_ident, expr->identifier); } @@ -1104,30 +1129,6 @@ static HRESULT compile_call_statement(compile_ctx_t *ctx, call_statement_t *stat return S_OK; } -static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) -{ - dim_decl_t *dim_decl; - - for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { - if(!wcsicmp(dim_decl->name, name)) - return TRUE; - } - - return FALSE; -} - -static BOOL lookup_args_name(compile_ctx_t *ctx, const WCHAR *name) -{ - unsigned i; - - for(i = 0; i < ctx->func->arg_cnt; i++) { - if(!wcsicmp(ctx->func->args[i].name, name)) - return TRUE; - } - - return FALSE; -} - static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) { dim_decl_t *dim_decl = stat->dim_decls; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 55efdcb5a00..3c437f7f15d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -967,6 +967,19 @@ x = false Call TestFuncArgVal(x) Call ok(not x, "x is true after TestFuncArgVal call?") +const c10 = 10 +Sub TestParamvsConst(c10) + Call ok( c10 = 42, "precedence between const and parameter wrong!") +End Sub +Call TestParamvsConst(42) + +Sub TestDimVsConst + dim c10 + c10 = 42 + Call ok( c10 = 42, "precedence between const and dim is wrong") +End Sub +Call TestDimVsConst + Function TestFuncMultiArgs(a,b,c,d,e) Call ok(a=1, "a = " & a) Call ok(b=2, "b = " & b)

1 0

Jacek Caban : configure: Don't use empty expression in clang check.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: d815623bf644b50df2d8961b329970880a2e626e URL: https://gitlab.winehq.org/wine/wine/-/commit/d815623bf644b50df2d8961b329970… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 00:18:49 2023 +0100 configure: Don't use empty expression in clang check. Avoids m4_default default action. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b54e50cd7a9..a6f056e839f 100755 --- a/configure +++ b/configure @@ -10733,7 +10733,7 @@ eval ac_res=\$$as_ac_var printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : - as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags $llvm_cflags" + : else $as_nop llvm_extra_cflags="" fi } diff --git a/configure.ac b/configure.ac index cafe3dbc047..6454b1c50a0 100644 --- a/configure.ac +++ b/configure.ac @@ -900,7 +900,7 @@ do WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags --no-default-config], [llvm_extra_cflags="$llvm_extra_cflags --no-default-config" llvm_extra_ldflags="--no-default-config"], - [WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags],[], + [WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags],[:], [llvm_extra_cflags=""])]) if test -n "$llvm_extra_cflags" then

1 0

Eric Pouech : ntdll: Restrict cases for std handle inheritance in CreateProcess().
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: bf97f9490a6a13b53ca7932ad0313022bc4ceee1 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf97f9490a6a13b53ca7932ad03130… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 30 18:38:53 2023 +0100 ntdll: Restrict cases for std handle inheritance in CreateProcess(). Only allow std handle inheritance when: - either bInherit flag of CreateProcess is TRUE, - or child process is in CUI subsystem and STARTF_USESTDHANDLES is no used. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 12 ++++++------ dlls/kernel32/tests/process.c | 6 +++--- dlls/ntdll/unix/env.c | 13 +++++++++---- dlls/ntdll/unix/process.c | 2 +- dlls/ntdll/unix/unix_private.h | 3 ++- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 54d1a80709b..74f8f467a9f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -5014,10 +5014,10 @@ static void test_CreateProcessCUI(void) {FALSE, DETACHED_PROCESS | CREATE_NO_WINDOW, NULL_STD, 0}, /* 5*/ {FALSE, CREATE_NEW_CONSOLE | CREATE_NO_WINDOW, NULL_STD, 0}, - {FALSE, 0, CONSOLE_STD, 0, TRUE}, + {FALSE, 0, CONSOLE_STD, 0}, {FALSE, DETACHED_PROCESS, CONSOLE_STD, 0}, {FALSE, CREATE_NEW_CONSOLE, CONSOLE_STD, 0}, - {FALSE, CREATE_NO_WINDOW, CONSOLE_STD, 0, TRUE}, + {FALSE, CREATE_NO_WINDOW, CONSOLE_STD, 0}, /*10*/ {FALSE, DETACHED_PROCESS | CREATE_NO_WINDOW, CONSOLE_STD, 0}, {FALSE, CREATE_NEW_CONSOLE | CREATE_NO_WINDOW, CONSOLE_STD, 0}, @@ -5070,10 +5070,10 @@ static void test_CreateProcessCUI(void) /* 5 */ {TRUE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, TRUE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER}, {TRUE, 0, STARTUPINFO_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_ENABLED_CTRLC}, {TRUE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER}, - {FALSE, 0, CONSOLE_STD, TRUE, 0, .is_todo = TRUE}, - {FALSE, CREATE_NEW_PROCESS_GROUP, CONSOLE_STD, TRUE, CP_GROUP_LEADER, .is_todo = TRUE}, -/* 10 */ {FALSE, 0, CONSOLE_STD, FALSE, CP_ENABLED_CTRLC, .is_todo = TRUE}, - {FALSE, CREATE_NEW_PROCESS_GROUP, CONSOLE_STD, FALSE, CP_GROUP_LEADER, .is_todo = TRUE}, + {FALSE, 0, CONSOLE_STD, TRUE, 0}, + {FALSE, CREATE_NEW_PROCESS_GROUP, CONSOLE_STD, TRUE, CP_GROUP_LEADER}, +/* 10 */ {FALSE, 0, CONSOLE_STD, FALSE, CP_ENABLED_CTRLC}, + {FALSE, CREATE_NEW_PROCESS_GROUP, CONSOLE_STD, FALSE, CP_GROUP_LEADER}, {FALSE, 0, STARTUPINFO_STD, TRUE, 0, .is_todo = TRUE}, {FALSE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, TRUE, CP_GROUP_LEADER, .is_todo = TRUE}, {FALSE, 0, STARTUPINFO_STD, FALSE, CP_ENABLED_CTRLC, .is_todo = TRUE}, diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2fd55e8dc4a..c0c56c69a29 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3254,7 +3254,7 @@ static void test_StdHandleInheritance(void) {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK, .is_todo = 6}, /* all others handles type behave as H_DISK */ - {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 6, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK, .is_todo = 6}, }, nothing_gui[] = @@ -3270,8 +3270,8 @@ static void test_StdHandleInheritance(void) {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, /* all others handles type behave as H_DISK */ - {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, - {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 7}, + {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 6, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 4}, }, detached_cui[] = { diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 4fd3254b2d2..3cb86da8401 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2146,7 +2146,8 @@ void init_startup_info(void) /*********************************************************************** * create_startup_info */ -void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCESS_PARAMETERS *params, +void *create_startup_info( const UNICODE_STRING *nt_image, ULONG process_flags, + const RTL_USER_PROCESS_PARAMETERS *params, const pe_image_info_t *pe_info, DWORD *info_size ) { startup_info_t *info; @@ -2175,9 +2176,13 @@ void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCES info->console_flags = params->ConsoleFlags; if (pe_info->subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) info->console = wine_server_obj_handle( params->ConsoleHandle ); - info->hstdin = wine_server_obj_handle( params->hStdInput ); - info->hstdout = wine_server_obj_handle( params->hStdOutput ); - info->hstderr = wine_server_obj_handle( params->hStdError ); + if ((process_flags & PROCESS_CREATE_FLAGS_INHERIT_HANDLES) || + (pe_info->subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI && !(params->dwFlags & STARTF_USESTDHANDLES))) + { + info->hstdin = wine_server_obj_handle( params->hStdInput ); + info->hstdout = wine_server_obj_handle( params->hStdOutput ); + info->hstderr = wine_server_obj_handle( params->hStdError ); + } info->x = params->dwX; info->y = params->dwY; info->xsize = params->dwXSize; diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index db0d92a1b36..71eab55920d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -802,7 +802,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ goto done; } if (!machine) machine = pe_info.machine; - if (!(startup_info = create_startup_info( attr.ObjectName, params, &pe_info, &startup_info_size ))) + if (!(startup_info = create_startup_info( attr.ObjectName, process_flags, params, &pe_info, &startup_info_size ))) goto done; env_size = get_env_size( params, &winedebug ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9aeacc7b823..1362c3a04d8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -178,7 +178,8 @@ extern struct ldt_copy __wine_ldt_copy; extern void init_environment( int argc, char *argv[], char *envp[] ); extern void init_startup_info(void); -extern void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCESS_PARAMETERS *params, +extern void *create_startup_info( const UNICODE_STRING *nt_image, ULONG process_flags, + const RTL_USER_PROCESS_PARAMETERS *params, const pe_image_info_t *pe_info, DWORD *info_size ); extern char **build_envp( const WCHAR *envW ); extern char *get_alternate_wineloader( WORD machine );

1 0