August 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Save the context from the caller stack frame in RtlCaptureContext() on ARM64.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 1c9fdaab0f40040c4a18c0e3a65bc6be404c457e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9fdaab0f40040c4a18c0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 14:52:23 2019 +0200 ntdll: Save the context from the caller stack frame in RtlCaptureContext() on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 67 ++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index b8591a3..648a140 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -219,52 +219,31 @@ static void restore_fpu( CONTEXT *context, ucontext_t *sigcontext ) /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -/* FIXME: Use the Stack instead of the actual register values? */ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, - "stp x0, x1, [sp, #-32]!\n\t" - "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ - "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ - "str w1, [x0]\n\t" /* context->ContextFlags */ /* 32-bit, look at cpsr */ + "stp x1, x2, [x0, #0x10]\n\t" /* context->X1,X2 */ + "stp x3, x4, [x0, #0x20]\n\t" /* context->X3,X4 */ + "stp x5, x6, [x0, #0x30]\n\t" /* context->X5,X6 */ + "stp x7, x8, [x0, #0x40]\n\t" /* context->X7,X8 */ + "stp x9, x10, [x0, #0x50]\n\t" /* context->X9,X10 */ + "stp x11, x12, [x0, #0x60]\n\t" /* context->X11,X12 */ + "stp x13, x14, [x0, #0x70]\n\t" /* context->X13,X14 */ + "stp x15, x16, [x0, #0x80]\n\t" /* context->X15,X16 */ + "stp x17, x18, [x0, #0x90]\n\t" /* context->X17,X18 */ + "stp x19, x20, [x0, #0xa0]\n\t" /* context->X19,X20 */ + "stp x21, x22, [x0, #0xb0]\n\t" /* context->X21,X22 */ + "stp x23, x24, [x0, #0xc0]\n\t" /* context->X23,X24 */ + "stp x25, x26, [x0, #0xd0]\n\t" /* context->X25,X26 */ + "stp x27, x28, [x0, #0xe0]\n\t" /* context->X27,X28 */ + "ldp x1, x2, [x29]\n\t" + "stp x1, x2, [x0, #0xf0]\n\t" /* context->Fp,Lr */ + "add x1, x29, #0x10\n\t" + "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ + "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ + "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ + "str w1, [x0]\n\t" /* context->ContextFlags */ "mrs x1, NZCV\n\t" - "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ - "ldp x0, x1, [sp], #32\n\t" - "str x0, [x0, #0x8]\n\t" /* context->X0 */ - "str x1, [x0, #0x10]\n\t" /* context->X1 */ - "str x2, [x0, #0x18]\n\t" /* context->X2 */ - "str x3, [x0, #0x20]\n\t" /* context->X3 */ - "str x4, [x0, #0x28]\n\t" /* context->X4 */ - "str x5, [x0, #0x30]\n\t" /* context->X5 */ - "str x6, [x0, #0x38]\n\t" /* context->X6 */ - "str x7, [x0, #0x40]\n\t" /* context->X7 */ - "str x8, [x0, #0x48]\n\t" /* context->X8 */ - "str x9, [x0, #0x50]\n\t" /* context->X9 */ - "str x10, [x0, #0x58]\n\t" /* context->X10 */ - "str x11, [x0, #0x60]\n\t" /* context->X11 */ - "str x12, [x0, #0x68]\n\t" /* context->X12 */ - "str x13, [x0, #0x70]\n\t" /* context->X13 */ - "str x14, [x0, #0x78]\n\t" /* context->X14 */ - "str x15, [x0, #0x80]\n\t" /* context->X15 */ - "str x16, [x0, #0x88]\n\t" /* context->X16 */ - "str x17, [x0, #0x90]\n\t" /* context->X17 */ - "str x18, [x0, #0x98]\n\t" /* context->X18 */ - "str x19, [x0, #0xa0]\n\t" /* context->X19 */ - "str x20, [x0, #0xa8]\n\t" /* context->X20 */ - "str x21, [x0, #0xb0]\n\t" /* context->X21 */ - "str x22, [x0, #0xb8]\n\t" /* context->X22 */ - "str x23, [x0, #0xc0]\n\t" /* context->X23 */ - "str x24, [x0, #0xc8]\n\t" /* context->X24 */ - "str x25, [x0, #0xd0]\n\t" /* context->X25 */ - "str x26, [x0, #0xd8]\n\t" /* context->X26 */ - "str x27, [x0, #0xe0]\n\t" /* context->X27 */ - "str x28, [x0, #0xe8]\n\t" /* context->X28 */ - "str x29, [x0, #0xf0]\n\t" /* context->Fp */ - "str x30, [x0, #0xf8]\n\t" /* context->Lr */ - "mov x1, sp\n\t" - "str x1, [x0, #0x100]\n\t" /* context->Sp */ - "adr x1, 1f\n\t" - "1: str x1, [x0, #0x108]\n\t" /* context->Pc */ - "ret" - ) + "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ + "ret" ) /*********************************************************************** * set_cpu_context

1 0

Alexandre Julliard : ntdll: Implement setting the thread context on ARM64.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 94a98cf5a23e38824384a3412687b840c9d6b5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94a98cf5a23e38824384a341… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 14:53:07 2019 +0200 ntdll: Implement setting the thread context on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 648a140..1531a0e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -252,7 +252,8 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, */ static void set_cpu_context( const CONTEXT *context ) { - FIXME( "Not implemented on ARM64\n" ); + interlocked_xchg_ptr( (void **)&arm64_thread_data()->context, (void *)context ); + raise( SIGUSR2 ); } /*********************************************************************** @@ -861,6 +862,21 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } +/********************************************************************** + * usr2_handler + * + * Handler for SIGUSR2, used to set a thread context. + */ +static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + CONTEXT *context = interlocked_xchg_ptr( (void **)&arm64_thread_data()->context, NULL ); + if (!context) return; + if ((context->ContextFlags & ~CONTEXT_ARM64) & CONTEXT_FLOATING_POINT) + restore_fpu( context, sigcontext ); + restore_context( context, sigcontext ); +} + + /*********************************************************************** * __wine_set_signal_handler (NTDLL.@) */ @@ -955,6 +971,8 @@ void signal_init_process(void) if (sigaction( SIGQUIT, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = usr1_handler; if (sigaction( SIGUSR1, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = usr2_handler; + if (sigaction( SIGUSR2, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = segv_handler; if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error;

1 0

Alexandre Julliard : ntdll: Don' t run exception handlers on the signal stack on ARM64.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 3027c266fc02b650378cb083a18e82fb9c7cba19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3027c266fc02b650378cb083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 15:41:25 2019 +0200 ntdll: Don't run exception handlers on the signal stack on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 95 ++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 64 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 1531a0e..4ebccd2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -470,6 +470,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun stack->rec.NumberParameters = 0; save_context( &stack->context, sigcontext ); + save_fpu( &stack->context, sigcontext ); /* now modify the sigcontext to return to the raise function */ SP_sig(sigcontext) = (ULONG_PTR)stack; @@ -499,12 +500,21 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context break; } status = NtRaiseException( rec, context, TRUE ); - if (status) raise_status( status, rec ); + raise_status( status, rec ); done: set_cpu_context( context ); } /********************************************************************** + * raise_generic_exception + */ +static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); +} + +/********************************************************************** * call_stack_handlers * * Call the stack handlers chain. @@ -693,29 +703,19 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) */ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; + ucontext_t *context = ucontext; + EXCEPTION_RECORD *rec = setup_exception( context, raise_generic_exception ); - switch ( info->si_code ) + switch (info->si_code) { case TRAP_TRACE: - rec.ExceptionCode = EXCEPTION_SINGLE_STEP; + rec->ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: default: - rec.ExceptionCode = EXCEPTION_BREAKPOINT; + rec->ExceptionCode = EXCEPTION_BREAKPOINT; break; } - - save_context( &context, ucontext ); - rec.ExceptionFlags = EXCEPTION_CONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - restore_context( &context, ucontext ); } /********************************************************************** @@ -725,66 +725,52 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) */ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; - - save_fpu( &context, sigcontext ); - save_context( &context, sigcontext ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); switch (siginfo->si_code & 0xffff ) { #ifdef FPE_FLTSUB case FPE_FLTSUB: - rec.ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; + rec->ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; break; #endif #ifdef FPE_INTDIV case FPE_INTDIV: - rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; + rec->ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; break; #endif #ifdef FPE_INTOVF case FPE_INTOVF: - rec.ExceptionCode = EXCEPTION_INT_OVERFLOW; + rec->ExceptionCode = EXCEPTION_INT_OVERFLOW; break; #endif #ifdef FPE_FLTDIV case FPE_FLTDIV: - rec.ExceptionCode = EXCEPTION_FLT_DIVIDE_BY_ZERO; + rec->ExceptionCode = EXCEPTION_FLT_DIVIDE_BY_ZERO; break; #endif #ifdef FPE_FLTOVF case FPE_FLTOVF: - rec.ExceptionCode = EXCEPTION_FLT_OVERFLOW; + rec->ExceptionCode = EXCEPTION_FLT_OVERFLOW; break; #endif #ifdef FPE_FLTUND case FPE_FLTUND: - rec.ExceptionCode = EXCEPTION_FLT_UNDERFLOW; + rec->ExceptionCode = EXCEPTION_FLT_UNDERFLOW; break; #endif #ifdef FPE_FLTRES case FPE_FLTRES: - rec.ExceptionCode = EXCEPTION_FLT_INEXACT_RESULT; + rec->ExceptionCode = EXCEPTION_FLT_INEXACT_RESULT; break; #endif #ifdef FPE_FLTINV case FPE_FLTINV: #endif default: - rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + rec->ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - rec.ExceptionFlags = EXCEPTION_CONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - - restore_context( &context, sigcontext ); - restore_fpu( &context, sigcontext ); } /********************************************************************** @@ -796,19 +782,9 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { if (!dispatch_signal(SIGINT)) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; - - save_context( &context, sigcontext ); - rec.ExceptionCode = CONTROL_C_EXIT; - rec.ExceptionFlags = EXCEPTION_CONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - restore_context( &context, sigcontext ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); + + rec->ExceptionCode = CONTROL_C_EXIT; } } @@ -820,19 +796,10 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; + EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); - save_context( &context, sigcontext ); - rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; - rec.ExceptionFlags = EH_NONCONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - restore_context( &context, sigcontext ); + rec->ExceptionCode = EXCEPTION_WINE_ASSERTION; + rec->ExceptionFlags = EH_NONCONTINUABLE; }

1 0

Alexandre Julliard : ntdll: Fix support for breakpoint exceptions on ARM64.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: fc97373f6202c8fef8d070f8b3cc5671baa6b6c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc97373f6202c8fef8d070f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 15:41:55 2019 +0200 ntdll: Fix support for breakpoint exceptions on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4ebccd2..e405c90 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -506,6 +506,17 @@ done: } /********************************************************************** + * raise_trap_exception + */ +static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status; + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Pc += 4; + status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); +} + +/********************************************************************** * raise_generic_exception */ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) @@ -704,7 +715,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) static void trap_handler( int signal, siginfo_t *info, void *ucontext ) { ucontext_t *context = ucontext; - EXCEPTION_RECORD *rec = setup_exception( context, raise_generic_exception ); + EXCEPTION_RECORD *rec = setup_exception( context, raise_trap_exception ); switch (info->si_code) { @@ -1208,18 +1219,12 @@ void signal_exit_process( int status ) /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -void WINAPI DbgBreakPoint(void) -{ - kill(getpid(), SIGTRAP); -} +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0; ret") /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -void WINAPI DbgUserBreakPoint(void) -{ - kill(getpid(), SIGTRAP); -} +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0; ret") /********************************************************************** * NtCurrentTeb (NTDLL.@)

1 0

Alexandre Julliard : wineboot: Only use cpuid on platforms where it makes sense.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 44ee1c47ff8c76a64ac8760d53a483749f9bb1fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=44ee1c47ff8c76a64ac8760d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 20:24:48 2019 +0200 wineboot: Only use cpuid on platforms where it makes sense. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 55f2c6c..add8c47 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -185,6 +185,8 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value ) return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, (lstrlenW(value) + 1) * sizeof(WCHAR) ); } +#if defined(__i386__) || defined(__x86_64__) + #if defined(_MSC_VER) static void do_cpuid( unsigned int ax, unsigned int *p ) { @@ -205,7 +207,7 @@ __ASM_GLOBAL_FUNC( do_cpuid, "popl %ebx\n\t" "popl %esi\n\t" "ret" ) -#elif defined(__x86_64__) +#else extern void __cdecl do_cpuid( unsigned int ax, unsigned int *p ); __ASM_GLOBAL_FUNC( do_cpuid, "pushq %rsi\n\t" @@ -220,11 +222,6 @@ __ASM_GLOBAL_FUNC( do_cpuid, "popq %rbx\n\t" "popq %rsi\n\t" "ret" ) -#else -static void do_cpuid( unsigned int ax, unsigned int *p ) -{ - FIXME("\n"); -} #endif static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) @@ -291,6 +288,14 @@ static void get_namestring( WCHAR *buf ) for (i = lstrlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0; } +#else /* __i386__ || __x86_64__ */ + +static void get_identifier( WCHAR *buf, size_t size, const WCHAR *arch ) { } +static void get_vendorid( WCHAR *buf ) { } +static void get_namestring( WCHAR *buf ) { } + +#endif /* __i386__ || __x86_64__ */ + /* create the volatile hardware registry keys */ static void create_hardware_registry_keys(void) {

1 0

Chip Davis : configure: Add a missing comma.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 594c64543f616ba805b782608798d27da2111622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594c64543f616ba805b78260… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Aug 13 11:52:41 2019 -0500 configure: Add a missing comma. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 ++--- configure.ac | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 2103658..702023b 100755 --- a/configure +++ b/configure @@ -14252,10 +14252,9 @@ $as_echo "#define HAVE_PPDEV 1" >>confdefs.h fi ac_wine_check_funcs_save_LIBS="$LIBS" -LIBS="$LIBS " +LIBS="$LIBS $PTHREAD_LIBS" for ac_func in \ - pthread_getthreadid_np \ - $PTHREAD_LIBS + pthread_getthreadid_np do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 59d5fa6..499c4f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1564,7 +1564,7 @@ fi dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ - pthread_getthreadid_np \ + pthread_getthreadid_np, [$PTHREAD_LIBS]) dnl **** Check for zlib ****

1 0

Naveen Narayanan : ntdll: Set pthread stack guard size to 0 for NetBSD.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: de5392bfe7919c180d6650eec7b57b5386a4796f URL: https://source.winehq.org/git/wine.git/?a=commit;h=de5392bfe7919c180d6650ee… Author: Naveen Narayanan <zerous(a)nocebo.space> Date: Mon Aug 12 19:29:22 2019 +0200 ntdll: Set pthread stack guard size to 0 for NetBSD. pthread_attr_setstack(3) in NetBSD 8.0 and newer sets the guard size to 65536 and extends the stack beyond the specified range. Signed-off-by: Naveen Narayanan <zerous(a)nocebo.space> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 126bf76..97bd4bf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -525,6 +525,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, pthread_attr_init( &attr ); pthread_attr_setstack( &attr, teb->DeallocationStack, (char *)teb->Tib.StackBase + extra_stack - (char *)teb->DeallocationStack ); + pthread_attr_setguardsize( &attr, 0 ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ interlocked_xchg_add( &nb_threads, 1 ); if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info ))

1 0

Alex Henrie : include: Add WTS_SESSION_INFO_1[AW].
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: d7030f66df9717ef9c550ed7127f46c243fa3924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7030f66df9717ef9c550ed7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 13 01:17:43 2019 -0600 include: Add WTS_SESSION_INFO_1[AW]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47612 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wtsapi32.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/wtsapi32.h b/include/wtsapi32.h index f329bd5..91309cc 100644 --- a/include/wtsapi32.h +++ b/include/wtsapi32.h @@ -122,6 +122,33 @@ typedef struct _WTS_SESSION_INFOW DECL_WINELIB_TYPE_AW(WTS_SESSION_INFO) DECL_WINELIB_TYPE_AW(PWTS_SESSION_INFO) +typedef struct _WTS_SESSION_INFO_1A +{ + DWORD ExecEnvId; + WTS_CONNECTSTATE_CLASS State; + DWORD SessionId; + char *pSessionName; + char *pHostName; + char *pUserName; + char *pDomainName; + char *pFarmName; +} WTS_SESSION_INFO_1A, *PWTS_SESSION_INFO_1A; + +typedef struct _WTS_SESSION_INFO_1W +{ + DWORD ExecEnvId; + WTS_CONNECTSTATE_CLASS State; + DWORD SessionId; + WCHAR *pSessionName; + WCHAR *pHostName; + WCHAR *pUserName; + WCHAR *pDomainName; + WCHAR *pFarmName; +} WTS_SESSION_INFO_1W, *PWTS_SESSION_INFO_1W; + +DECL_WINELIB_TYPE_AW(WTS_SESSION_INFO_1) +DECL_WINELIB_TYPE_AW(PWTS_SESSION_INFO_1) + typedef struct _WTS_SERVER_INFOA { LPSTR pServerName;

1 0

Alex Henrie : wtsapi32: Add stubs for WTSEnumerateSessionsEx[AW].
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 1b911f915850b90c76159cf0e024ca07dddf3793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b911f915850b90c76159cf0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 13 01:17:44 2019 -0600 wtsapi32: Add stubs for WTSEnumerateSessionsEx[AW]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47612 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 20 ++++++++++++++++++++ dlls/wtsapi32/wtsapi32.spec | 2 ++ 2 files changed, 22 insertions(+) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 72025c3..e64079c 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -149,6 +149,26 @@ BOOL WINAPI WTSEnumerateServersW(LPWSTR pDomainName, DWORD Reserved, DWORD Versi /************************************************************ + * WTSEnumerateEnumerateSessionsExW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateSessionsExW(HANDLE server, DWORD *level, DWORD filter, WTS_SESSION_INFO_1W* info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, filter, info, count); + if (count) *count = 0; + return FALSE; +} + +/************************************************************ + * WTSEnumerateEnumerateSessionsExA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateSessionsExA(HANDLE server, DWORD *level, DWORD filter, WTS_SESSION_INFO_1A* info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, filter, info, count); + if (count) *count = 0; + return FALSE; +} + +/************************************************************ * WTSEnumerateEnumerateSessionsA (WTSAPI32.@) */ BOOL WINAPI WTSEnumerateSessionsA(HANDLE hServer, DWORD Reserved, DWORD Version, diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 5d70da7..8510980 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -10,6 +10,8 @@ @ stdcall WTSEnumerateServersA(ptr long long ptr ptr) @ stdcall WTSEnumerateServersW(ptr long long ptr ptr) @ stdcall WTSEnumerateSessionsA(long long long ptr ptr) +@ stdcall WTSEnumerateSessionsExA(ptr ptr long ptr ptr) +@ stdcall WTSEnumerateSessionsExW(ptr ptr long ptr ptr) @ stdcall WTSEnumerateSessionsW(long long long ptr ptr) @ stdcall WTSFreeMemory(ptr) @ stdcall WTSLogoffSession(long long long)

1 0

Alex Henrie : wtsapi32: Add stubs for WTSOpenServerEx[AW].
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: dd2144da4d9badd80999e9a9fbed3731463b91f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd2144da4d9badd80999e9a9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 13 01:17:45 2019 -0600 wtsapi32: Add stubs for WTSOpenServerEx[AW]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47612 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 21 +++++++++++++++++++++ dlls/wtsapi32/wtsapi32.spec | 6 ++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index e64079c..9384379 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -222,6 +222,27 @@ BOOL WINAPI WTSLogoffSession(HANDLE hserver, DWORD session_id, BOOL bwait) return FALSE; } + +/************************************************************ + * WTSOpenServerExW (WTSAPI32.@) + */ +HANDLE WINAPI WTSOpenServerExW(WCHAR *server_name) +{ + FIXME("(%s) stub\n", debugstr_w(server_name)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/************************************************************ + * WTSOpenServerExA (WTSAPI32.@) + */ +HANDLE WINAPI WTSOpenServerExA(char *server_name) +{ + FIXME("(%s) stub\n", debugstr_a(server_name)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /************************************************************ * WTSOpenServerA (WTSAPI32.@) */ diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 8510980..7f76b44 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -15,8 +15,10 @@ @ stdcall WTSEnumerateSessionsW(long long long ptr ptr) @ stdcall WTSFreeMemory(ptr) @ stdcall WTSLogoffSession(long long long) -@ stdcall WTSOpenServerA(ptr) -@ stdcall WTSOpenServerW(ptr) +@ stdcall WTSOpenServerA(str) +@ stdcall WTSOpenServerExA(str) +@ stdcall WTSOpenServerExW(wstr) +@ stdcall WTSOpenServerW(wstr) @ stdcall WTSQuerySessionInformationA(long long long ptr ptr) @ stdcall WTSQuerySessionInformationW(long long long ptr ptr) @ stdcall WTSQueryUserConfigA(ptr ptr long ptr ptr)

1 0