wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Alexandre Julliard : ntdll: Use the CPU area to get/set the Wow64 context on x86-64.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 11d6c52f32e4ac31414f1b8580606e61c738c452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d6c52f32e4ac31414f1b85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 12:17:29 2021 +0200 ntdll: Use the CPU area to get/set the Wow64 context on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 184 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 179 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index f9e82d72190..56dc640e082 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1614,7 +1614,8 @@ void *get_native_context( CONTEXT *context ) */ void *get_wow_context( CONTEXT *context ) { - return NULL; + if (context->SegCs != cs64_sel) return NULL; + return get_cpu_area( IMAGE_FILE_MACHINE_I386 ); } @@ -1851,10 +1852,97 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) */ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { - BOOL self; + BOOL self = (handle == GetCurrentThread()); + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + I386_CONTEXT *wow_frame; + const I386_CONTEXT *context = ctx; + DWORD flags = context->ContextFlags & ~CONTEXT_i386; if (size != sizeof(I386_CONTEXT)) return STATUS_INFO_LENGTH_MISMATCH; - return set_thread_context( handle, ctx, &self, IMAGE_FILE_MACHINE_I386 ); + + /* debug registers require a server call */ + if (self && (flags & CONTEXT_I386_DEBUG_REGISTERS)) + self = (amd64_thread_data()->dr0 == context->Dr0 && + amd64_thread_data()->dr1 == context->Dr1 && + amd64_thread_data()->dr2 == context->Dr2 && + amd64_thread_data()->dr3 == context->Dr3 && + amd64_thread_data()->dr6 == context->Dr6 && + amd64_thread_data()->dr7 == context->Dr7); + + if (!self) + { + NTSTATUS ret = set_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_I386 ); + if (ret || !self) return ret; + if (flags & CONTEXT_I386_DEBUG_REGISTERS) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } + if (!(flags & ~CONTEXT_I386_DEBUG_REGISTERS)) return ret; + } + + if (!(wow_frame = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) return STATUS_INVALID_PARAMETER; + + if (flags & CONTEXT_I386_INTEGER) + { + wow_frame->Eax = context->Eax; + wow_frame->Ebx = context->Ebx; + wow_frame->Ecx = context->Ecx; + wow_frame->Edx = context->Edx; + wow_frame->Esi = context->Esi; + wow_frame->Edi = context->Edi; + } + if (flags & CONTEXT_I386_CONTROL) + { + wow_frame->Esp = context->Esp; + wow_frame->Ebp = context->Ebp; + wow_frame->Eip = context->Eip; + wow_frame->EFlags = context->EFlags; + wow_frame->SegCs = cs32_sel; + wow_frame->SegSs = ds64_sel; + } + if (flags & CONTEXT_I386_SEGMENTS) + { + wow_frame->SegDs = ds64_sel; + wow_frame->SegEs = ds64_sel; + wow_frame->SegFs = 0; /* FIXME */ + wow_frame->SegGs = ds64_sel; + } + if (flags & CONTEXT_I386_DEBUG_REGISTERS) + { + wow_frame->Dr0 = context->Dr0; + wow_frame->Dr1 = context->Dr1; + wow_frame->Dr2 = context->Dr2; + wow_frame->Dr3 = context->Dr3; + wow_frame->Dr6 = context->Dr6; + wow_frame->Dr7 = context->Dr7; + } + if (flags & CONTEXT_I386_EXTENDED_REGISTERS) + { + memcpy( &frame->xsave, context->ExtendedRegisters, sizeof(frame->xsave) ); + } + else if (flags & CONTEXT_I386_FLOATING_POINT) + { + fpu_to_fpux( &frame->xsave, &context->FloatSave ); + } + if (flags & CONTEXT_I386_XSTATE) + { + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); + + if (xs->Mask & XSTATE_MASK_GSSE) + { + frame->xstate.Mask |= XSTATE_MASK_GSSE; + memcpy( &frame->xstate.YmmContext, &xs->YmmContext, sizeof(xs->YmmContext) ); + } + else frame->xstate.Mask &= ~XSTATE_MASK_GSSE; + frame->restore_flags |= CONTEXT_I386_XSTATE; + } + return STATUS_SUCCESS; } @@ -1863,10 +1951,96 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) */ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) { - BOOL self; + DWORD needed_flags; + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + I386_CONTEXT *wow_frame, *context = ctx; + BOOL self = (handle == GetCurrentThread()); if (size != sizeof(I386_CONTEXT)) return STATUS_INFO_LENGTH_MISMATCH; - return get_thread_context( handle, ctx, &self, IMAGE_FILE_MACHINE_I386 ); + + needed_flags = context->ContextFlags & ~CONTEXT_i386; + + /* debug registers require a server call */ + if (needed_flags & CONTEXT_I386_DEBUG_REGISTERS) self = FALSE; + + if (!self) + { + NTSTATUS ret = get_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_I386 ); + if (ret || !self) return ret; + /* update the cached version of the debug registers */ + if (needed_flags & CONTEXT_I386_DEBUG_REGISTERS) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } + if (!(needed_flags & ~CONTEXT_I386_DEBUG_REGISTERS)) return ret; + } + + if (!(wow_frame = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) return STATUS_INVALID_PARAMETER; + + if (needed_flags & CONTEXT_I386_INTEGER) + { + context->Eax = wow_frame->Eax; + context->Ebx = wow_frame->Ebx; + context->Ecx = wow_frame->Ecx; + context->Edx = wow_frame->Edx; + context->Esi = wow_frame->Esi; + context->Edi = wow_frame->Edi; + context->ContextFlags |= CONTEXT_I386_INTEGER; + } + if (needed_flags & CONTEXT_I386_CONTROL) + { + context->Esp = wow_frame->Esp; + context->Ebp = wow_frame->Ebp; + context->Eip = wow_frame->Eip; + context->EFlags = wow_frame->EFlags; + context->SegCs = wow_frame->SegCs; + context->SegSs = wow_frame->SegSs; + context->ContextFlags |= CONTEXT_I386_CONTROL; + } + if (needed_flags & CONTEXT_I386_SEGMENTS) + { + context->SegDs = wow_frame->SegDs; + context->SegEs = wow_frame->SegEs; + context->SegFs = wow_frame->SegFs; + context->SegGs = wow_frame->SegGs; + context->ContextFlags |= CONTEXT_I386_SEGMENTS; + } + if (needed_flags & CONTEXT_I386_EXTENDED_REGISTERS) + { + memcpy( context->ExtendedRegisters, &frame->xsave, sizeof(context->ExtendedRegisters) ); + context->ContextFlags |= CONTEXT_I386_EXTENDED_REGISTERS; + } + if (needed_flags & CONTEXT_I386_FLOATING_POINT) + { + fpux_to_fpu( &context->FloatSave, &frame->xsave ); + context->ContextFlags |= CONTEXT_I386_FLOATING_POINT; + } + if ((needed_flags & CONTEXT_I386_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) + { + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); + unsigned int mask; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) || + context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; + xstate->Mask = frame->xstate.Mask & mask; + xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; + memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); + if (xstate->Mask) + { + if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; + memcpy( &xstate->YmmContext, &frame->xstate.YmmContext, sizeof(xstate->YmmContext) ); + } + } + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : ntdll: Initialize the Wow64 context on x86-64.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 4acecd8619219b750fa5f2d0d233cd246fe498fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4acecd8619219b750fa5f2d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 11:46:05 2021 +0200 ntdll: Initialize the Wow64 context on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5901d9cf867..f9e82d72190 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -362,6 +362,9 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) context->ContextFlags |= CONTEXT_XSTATE; } +static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ +static USHORT cs64_sel; /* selector for %cs in 64-bit mode */ +static USHORT ds64_sel; /* selector for %ds/%es/%ss in 64-bit mode */ /*********************************************************************** * Definitions for Dwarf unwind tables @@ -2479,6 +2482,8 @@ NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_E */ void signal_init_threading(void) { + __asm__( "movw %%cs,%0" : "=m" (cs64_sel) ); + __asm__( "movw %%ss,%0" : "=m" (ds64_sel) ); } @@ -2607,6 +2612,13 @@ void signal_init_process(void) if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) __wine_syscall_flags |= SYSCALL_HAVE_XSAVE; if (xstate_compaction_enabled) __wine_syscall_flags |= SYSCALL_HAVE_XSAVEC; +#ifdef __linux__ + if (NtCurrentTeb()->WowTebOffset) + { + cs32_sel = 0x23; + } +#endif + sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK; @@ -2642,17 +2654,39 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B struct amd64_thread_data *thread_data = (struct amd64_thread_data *)&teb->GdiTebBatch; struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { 0 }; + I386_CONTEXT *wow_context; context.ContextFlags = CONTEXT_ALL; context.Rcx = (ULONG_PTR)entry; context.Rdx = (ULONG_PTR)arg; context.Rsp = (ULONG_PTR)teb->Tib.StackBase - 0x28; context.Rip = (ULONG_PTR)pRtlUserThreadStart; + context.SegCs = cs64_sel; + context.SegDs = ds64_sel; + context.SegEs = ds64_sel; + context.SegGs = ds64_sel; + context.SegSs = ds64_sel; context.EFlags = 0x200; context.u.FltSave.ControlWord = 0x27f; context.u.FltSave.MxCsr = context.MxCsr = 0x1f80; - __asm__( "movw %%cs,%0" : "=m" (context.SegCs) ); - __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); + + if ((wow_context = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) + { + wow_context->ContextFlags = CONTEXT_I386_ALL; + wow_context->Eax = (ULONG_PTR)entry; + wow_context->Ebx = (ULONG_PTR)arg; + wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; + wow_context->Eip = (ULONG_PTR)pRtlUserThreadStart; + wow_context->SegCs = cs32_sel; + wow_context->SegDs = context.SegDs; + wow_context->SegEs = context.SegEs; + wow_context->SegFs = context.SegFs; + wow_context->SegGs = context.SegGs; + wow_context->SegSs = context.SegSs; + wow_context->EFlags = 0x202; + wow_context->FloatSave.ControlWord = context.u.FltSave.ControlWord; + *(XSAVE_FORMAT *)wow_context->ExtendedRegisters = context.u.FltSave; + } if (suspend) wait_suspend( &context );

1 0

Alexandre Julliard : ntdll: Add a helper function to retrieve the CPU area context on the Unix side.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: bedfb31d7cfe0f1683e142ab6b0c1575cfc4c933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bedfb31d7cfe0f1683e142ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 11:16:27 2021 +0200 ntdll: Add a helper function to retrieve the CPU area context on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 6 +----- dlls/ntdll/unix/signal_i386.c | 6 +----- dlls/ntdll/unix/thread.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index e3ad240c718..a86805b113c 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -921,11 +921,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.Sp = (DWORD)teb->Tib.StackBase; context.Pc = (DWORD)pRtlUserThreadStart; if (context.Pc & 1) context.Cpsr |= 0x20; /* thumb mode */ - if (NtCurrentTeb64()) - { - WOW64_CPURESERVED *cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); - memcpy( cpu + 1, &context, sizeof(context) ); - } + if ((ctx = get_cpu_area( IMAGE_FILE_MACHINE_ARMNT ))) *ctx = context; if (suspend) wait_suspend( &context ); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1560251e3a1..72aff4614ca 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2337,11 +2337,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.FloatSave.ControlWord = 0x27f; ((XSAVE_FORMAT *)context.ExtendedRegisters)->ControlWord = 0x27f; ((XSAVE_FORMAT *)context.ExtendedRegisters)->MxCsr = 0x1f80; - if (NtCurrentTeb64()) - { - WOW64_CPURESERVED *cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); - memcpy( cpu + 1, &context, sizeof(context) ); - } + if ((ctx = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) *ctx = context; if (suspend) wait_suspend( &context ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 05c412620f6..4383a4779be 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1097,6 +1097,35 @@ static SIZE_T get_machine_context_size( USHORT machine ) } +/*********************************************************************** + * get_cpu_area + * + * cf. RtlWow64GetCurrentCpuArea + */ +void *get_cpu_area( USHORT machine ) +{ + WOW64_CPURESERVED *cpu; + ULONG align; + + if (!NtCurrentTeb()->WowTebOffset) return NULL; +#ifdef _WIN64 + cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; +#else + cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); +#endif + if (cpu->Machine != machine) return NULL; + switch (cpu->Machine) + { + case IMAGE_FILE_MACHINE_I386: align = TYPE_ALIGNMENT(I386_CONTEXT); break; + case IMAGE_FILE_MACHINE_AMD64: align = TYPE_ALIGNMENT(ARM_CONTEXT); break; + case IMAGE_FILE_MACHINE_ARMNT: align = TYPE_ALIGNMENT(AMD64_CONTEXT); break; + case IMAGE_FILE_MACHINE_ARM64: align = TYPE_ALIGNMENT(ARM64_NT_CONTEXT); break; + default: return NULL; + } + return (void *)(((ULONG_PTR)(cpu + 1) + align - 1) & ~(align - 1)); +} + + /*********************************************************************** * set_thread_id */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 20b78e2a266..3ab546eb254 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -181,6 +181,7 @@ extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux ) DECLSPEC_HIDDEN; extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu ) DECLSPEC_HIDDEN; +extern void *get_cpu_area( USHORT machine ) DECLSPEC_HIDDEN; extern void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) DECLSPEC_HIDDEN; extern NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Clear the 32-bit TLS for ZeroTlsCell in Wow64 mode.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 8794879335652df5785203f30253866239f8590e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8794879335652df5785203f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 09:00:08 2021 +0200 ntdll: Clear the 32-bit TLS for ZeroTlsCell in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2484450055d..34b332a613c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3017,6 +3017,11 @@ NTSTATUS virtual_clear_tls_index( ULONG index ) LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry ) { TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch ); +#ifdef _WIN64 + WOW_TEB *wow_teb = get_wow_teb( teb ); + if (wow_teb) wow_teb->TlsSlots[index] = 0; + else +#endif teb->TlsSlots[index] = 0; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3030,6 +3035,15 @@ NTSTATUS virtual_clear_tls_index( ULONG index ) LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry ) { TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch ); +#ifdef _WIN64 + WOW_TEB *wow_teb = get_wow_teb( teb ); + if (wow_teb) + { + if (wow_teb->TlsExpansionSlots) + ((ULONG *)ULongToPtr( wow_teb->TlsExpansionSlots ))[index] = 0; + } + else +#endif if (teb->TlsExpansionSlots) teb->TlsExpansionSlots[index] = 0; } server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Alexandre Julliard : ntdll: Implement RtlWow64GetThreadSelectorEntry().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 3469ebf90e80290aefff07a988d4da717ab616b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3469ebf90e80290aefff07a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 08:57:35 2021 +0200 ntdll: Implement RtlWow64GetThreadSelectorEntry(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 67 +++++++++++++++++++++ dlls/ntdll/tests/wow64.c | 137 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 2 +- include/winternl.h | 1 + 5 files changed, 207 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3469ebf90e80290aefff…

1 0

Alex Henrie : tbs: Add Tbsi_Context_Create stub.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: dbabe2fa496fb5ba43a32636658106945ecc1d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbabe2fa496fb5ba43a32636… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 29 20:33:48 2021 -0600 tbs: Add Tbsi_Context_Create stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51335 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tbs/Makefile.in | 3 +++ dlls/tbs/tbs.c | 31 +++++++++++++++++++++++++++++++ dlls/tbs/tbs.spec | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/tbs/Makefile.in b/dlls/tbs/Makefile.in index 8f23c81e4f9..454d66bc6f4 100644 --- a/dlls/tbs/Makefile.in +++ b/dlls/tbs/Makefile.in @@ -1,3 +1,6 @@ MODULE = tbs.dll EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + tbs.c diff --git a/dlls/tbs/tbs.c b/dlls/tbs/tbs.c new file mode 100644 index 00000000000..452a3890e68 --- /dev/null +++ b/dlls/tbs/tbs.c @@ -0,0 +1,31 @@ +/* + * Trusted Platform Module Base Services + * + * Copyright 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "tbs.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tbs); + +TBS_RESULT WINAPI Tbsi_Context_Create(const TBS_CONTEXT_PARAMS *params, TBS_HCONTEXT *out) +{ + FIXME("(%p, %p) stub\n", params, out); + return TBS_E_TPM_NOT_FOUND; +} diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec index 3fa5c04f863..151ea1c6478 100644 --- a/dlls/tbs/tbs.spec +++ b/dlls/tbs/tbs.spec @@ -3,7 +3,7 @@ @ stub GetDeviceID @ stub GetDeviceIDString @ stub GetDeviceIDWithTimeout -@ stub Tbsi_Context_Create +@ stdcall Tbsi_Context_Create(ptr ptr) @ stub Tbsi_Create_Windows_Key @ stub Tbsi_FilterLog @ stub Tbsi_GetDeviceInfo

1 0

Alex Henrie : tbs: Add stub dll.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 91c42ffe46687c611bd9323996a08798633823a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c42ffe46687c611bd93239… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 29 20:33:45 2021 -0600 tbs: Add stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51335 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/tbs/Makefile.in | 3 +++ dlls/tbs/tbs.spec | 21 +++++++++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/configure b/configure index 14c9dd2ff7d..1789634ea84 100755 --- a/configure +++ b/configure @@ -1626,6 +1626,7 @@ enable_sxs enable_t2embed enable_tapi32 enable_taskschd +enable_tbs enable_tdh enable_tdi_sys enable_traffic @@ -20990,6 +20991,7 @@ wine_fn_config_makefile dlls/tapi32 enable_tapi32 wine_fn_config_makefile dlls/tapi32/tests enable_tests wine_fn_config_makefile dlls/taskschd enable_taskschd wine_fn_config_makefile dlls/taskschd/tests enable_tests +wine_fn_config_makefile dlls/tbs enable_tbs wine_fn_config_makefile dlls/tdh enable_tdh wine_fn_config_makefile dlls/tdi.sys enable_tdi_sys wine_fn_config_makefile dlls/toolhelp.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 09c58aaff28..f0a42cf3b0a 100644 --- a/configure.ac +++ b/configure.ac @@ -3665,6 +3665,7 @@ WINE_CONFIG_MAKEFILE(dlls/tapi32) WINE_CONFIG_MAKEFILE(dlls/tapi32/tests) WINE_CONFIG_MAKEFILE(dlls/taskschd) WINE_CONFIG_MAKEFILE(dlls/taskschd/tests) +WINE_CONFIG_MAKEFILE(dlls/tbs) WINE_CONFIG_MAKEFILE(dlls/tdh) WINE_CONFIG_MAKEFILE(dlls/tdi.sys) WINE_CONFIG_MAKEFILE(dlls/toolhelp.dll16,enable_win16) diff --git a/dlls/tbs/Makefile.in b/dlls/tbs/Makefile.in new file mode 100644 index 00000000000..8f23c81e4f9 --- /dev/null +++ b/dlls/tbs/Makefile.in @@ -0,0 +1,3 @@ +MODULE = tbs.dll + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec new file mode 100644 index 00000000000..3fa5c04f863 --- /dev/null +++ b/dlls/tbs/tbs.spec @@ -0,0 +1,21 @@ +@ stub Tbsi_Create_Attestation_From_Log +@ stub Tbsi_Get_TCG_Logs +@ stub GetDeviceID +@ stub GetDeviceIDString +@ stub GetDeviceIDWithTimeout +@ stub Tbsi_Context_Create +@ stub Tbsi_Create_Windows_Key +@ stub Tbsi_FilterLog +@ stub Tbsi_GetDeviceInfo +@ stub Tbsi_Get_OwnerAuth +@ stub Tbsi_Get_TCG_Log +@ stub Tbsi_Get_TCG_Log_Ex +@ stub Tbsi_Physical_Presence_Command +@ stub Tbsi_Revoke_Attestation +@ stub Tbsi_ShaHash +@ stub Tbsip_Cancel_Commands +@ stub Tbsip_Context_Close +@ stub Tbsip_Submit_Command +@ stub Tbsip_Submit_Command_NonBlocking +@ stub Tbsip_TestInterruptInformation +@ stub Tbsip_TestMorBit

1 0

Alex Henrie : include: Add TBS_E_* to winerror.h.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 3ffb15eb34564a4d848aeb2a570c94bfafeb31dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ffb15eb34564a4d848aeb2a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 29 21:00:35 2021 -0600 include: Add TBS_E_* to winerror.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 8765e177029..f22b24f267b 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3639,6 +3639,29 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) #define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) +#define TBS_E_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x80284001) +#define TBS_E_BAD_PARAMETER _HRESULT_TYPEDEF_(0x80284002) +#define TBS_E_INVALID_OUTPUT_POINTER _HRESULT_TYPEDEF_(0x80284003) +#define TBS_E_INVALID_CONTEXT _HRESULT_TYPEDEF_(0x80284004) +#define TBS_E_INSUFFICIENT_BUFFER _HRESULT_TYPEDEF_(0x80284005) +#define TBS_E_IOERROR _HRESULT_TYPEDEF_(0x80284006) +#define TBS_E_INVALID_CONTEXT_PARAM _HRESULT_TYPEDEF_(0x80284007) +#define TBS_E_SERVICE_NOT_RUNNING _HRESULT_TYPEDEF_(0x80284008) +#define TBS_E_TOO_MANY_TBS_CONTEXTS _HRESULT_TYPEDEF_(0x80284009) +#define TBS_E_TOO_MANY_RESOURCES _HRESULT_TYPEDEF_(0x8028400a) +#define TBS_E_SERVICE_START_PENDING _HRESULT_TYPEDEF_(0x8028400b) +#define TBS_E_PPI_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8028400c) +#define TBS_E_COMMAND_CANCELED _HRESULT_TYPEDEF_(0x8028400d) +#define TBS_E_BUFFER_TOO_LARGE _HRESULT_TYPEDEF_(0x8028400e) +#define TBS_E_TPM_NOT_FOUND _HRESULT_TYPEDEF_(0x8028400f) +#define TBS_E_SERVICE_DISABLED _HRESULT_TYPEDEF_(0x80284010) +#define TBS_E_NO_EVENT_LOG _HRESULT_TYPEDEF_(0x80284011) +#define TBS_E_ACCESS_DENIED _HRESULT_TYPEDEF_(0x80284012) +#define TBS_E_PROVISIONING_NOT_ALLOWED _HRESULT_TYPEDEF_(0x80284013) +#define TBS_E_PPI_FUNCTION_UNSUPPORTED _HRESULT_TYPEDEF_(0x80284014) +#define TBS_E_OWNERAUTH_NOT_FOUND _HRESULT_TYPEDEF_(0x80284015) +#define TBS_E_PROVISIONING_INCOMPLETE _HRESULT_TYPEDEF_(0x80284016) + #define UI_E_CREATE_FAILED _HRESULT_TYPEDEF_(0x802a0001) #define UI_E_SHUTDOWN_CALLED _HRESULT_TYPEDEF_(0x802a0002) #define UI_E_ILLEGAL_REENTRANCY _HRESULT_TYPEDEF_(0x802a0003)

1 0

Alex Henrie : include: Add tbs.h.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 295c657de7f4c03a5b699bad0e26dd3a834094cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=295c657de7f4c03a5b699bad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 29 20:33:46 2021 -0600 include: Add tbs.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/tbs.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index e6477d13cef..d5e4679c5db 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -686,6 +686,7 @@ SOURCES = \ t2embapi.h \ tapi.h \ taskschd.idl \ + tbs.h \ tchar.h \ tcpestats.h \ tcpmib.h \ diff --git a/include/tbs.h b/include/tbs.h new file mode 100644 index 00000000000..749624c2aee --- /dev/null +++ b/include/tbs.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _TBS_H_ +#define _TBS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef UINT32 TBS_RESULT; + +typedef struct tdTBS_CONTEXT_PARAMS +{ + UINT32 version; +} TBS_CONTEXT_PARAMS, *PTBS_CONTEXT_PARAMS; + +typedef void *TBS_HCONTEXT, **PTBS_HCONTEXT; + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_ADD_MEMBERSHIP) implementation to ntdll.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 96766e67943d55983f655d1bf9ab36a38e2edb8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=96766e67943d55983f655d1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:39 2021 -0500 ws2_32: Move the setsockopt(IP_ADD_MEMBERSHIP) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 38cb80997ff..f65feef763f 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1675,6 +1675,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; } + case IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_MEMBERSHIP, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 650885a101e..87966545bb8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3624,6 +3624,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IP: switch(optname) { + case WS_IP_ADD_MEMBERSHIP: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP, optval, optlen ); + case WS_IP_ADD_SOURCE_MEMBERSHIP: case WS_IP_DROP_SOURCE_MEMBERSHIP: case WS_IP_BLOCK_SOURCE: @@ -3640,7 +3643,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } - case WS_IP_ADD_MEMBERSHIP: case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL case WS_IP_HDRINCL: diff --git a/include/wine/afd.h b/include/wine/afd.h index 44a8b1a5ff9..c672168bc6a 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -179,6 +179,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 236, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 237, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 238, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP CTL_CODE(FILE_DEVICE_NETWORK, 239, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021