- Wine-Commits - list.winehq.org

Paul Gofman : netapi32: Force debug info in critical sections.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: ed8b7b5e2a5bf48ee2689751e39214bc57de576a URL: https://gitlab.winehq.org/wine/wine/-/commit/ed8b7b5e2a5bf48ee2689751e39214… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:36:43 2024 -0600 netapi32: Force debug info in critical sections. --- dlls/netapi32/nbcmdqueue.c | 2 +- dlls/netapi32/nbnamecache.c | 2 +- dlls/netapi32/nbt.c | 2 +- dlls/netapi32/netbios.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/nbcmdqueue.c b/dlls/netapi32/nbcmdqueue.c index df15c616261..f02e5eb12d8 100644 --- a/dlls/netapi32/nbcmdqueue.c +++ b/dlls/netapi32/nbcmdqueue.c @@ -61,7 +61,7 @@ struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap) if (queue) { queue->heap = heap; - InitializeCriticalSection(&queue->cs); + InitializeCriticalSectionEx(&queue->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); queue->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NBCmdQueue.cs"); queue->head = NULL; } diff --git a/dlls/netapi32/nbnamecache.c b/dlls/netapi32/nbnamecache.c index 0ec9a9d5158..5bc529addac 100644 --- a/dlls/netapi32/nbnamecache.c +++ b/dlls/netapi32/nbnamecache.c @@ -100,7 +100,7 @@ struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS) if (cache) { cache->heap = heap; - InitializeCriticalSection(&cache->cs); + InitializeCriticalSectionEx(&cache->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); cache->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NBNameCache.cs"); cache->entryExpireTimeMS = entryExpireTimeMS; cache->head = NULL; diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index c364a116fca..7eac6477439 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1036,7 +1036,7 @@ static UCHAR NetBTCall(void *adapt, PNCB ncb, void **sess) if (session) { session->fd = fd; - InitializeCriticalSection(&session->cs); + InitializeCriticalSectionEx(&session->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBTSession.cs"); *sess = session; } diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index e74c9bf1b0f..d7414a8db07 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -103,7 +103,7 @@ static UCHAR nbResizeAdapterTable(UCHAR newSize) void NetBIOSInit(void) { memset(&gNBTable, 0, sizeof(gNBTable)); - InitializeCriticalSection(&gNBTable.cs); + InitializeCriticalSectionEx(&gNBTable.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); gNBTable.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBIOSAdapterTable.cs"); } @@ -211,7 +211,7 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *data) gNBTable.table[i].impl.ifIndex = ifIndex; gNBTable.table[i].impl.data = data; gNBTable.table[i].cmdQueue = NBCmdQueueCreate(GetProcessHeap()); - InitializeCriticalSection(&gNBTable.table[i].cs); + InitializeCriticalSectionEx(&gNBTable.table[i].cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); gNBTable.table[i].cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBIOSAdapterTable.NetBIOSAdapter.cs"); gNBTable.table[i].enabled = TRUE; ret = TRUE;

1 0

Paul Gofman : rsaenh: Force debug info in critical sections.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: c837cb3e77e3201c15075b1108139c3f8be398f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c837cb3e77e3201c15075b1108139c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:37:14 2024 -0600 rsaenh: Force debug info in critical sections. --- dlls/rsaenh/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 88887b9f45f..e0f828f72ce 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -55,7 +55,7 @@ void init_handle_table(struct handle_table *lpTable) lpTable->paEntries = NULL; lpTable->iEntries = 0; lpTable->iFirstFree = 0; - InitializeCriticalSection(&lpTable->mutex); + InitializeCriticalSectionEx(&lpTable->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETABLE.mutex"); }

1 0

Vijay Kiran Kamuju : include: Add IRegistrationTrigger definition.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: c34159db3960104d96d6d0804476b5feda8bd522 URL: https://gitlab.winehq.org/wine/wine/-/commit/c34159db3960104d96d6d0804476b5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 20:25:02 2024 +0100 include: Add IRegistrationTrigger definition. --- include/taskschd.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/taskschd.idl b/include/taskschd.idl index d5577555e56..6c5e5533934 100644 --- a/include/taskschd.idl +++ b/include/taskschd.idl @@ -407,6 +407,18 @@ interface IDailyTrigger : ITrigger [propput] HRESULT RandomDelay([in] BSTR randomDelay); } +[ + uuid(4c8fec3a-c218-4e0c-b23d-629024db91a2), + oleautomation, + dual, + nonextensible +] +interface IRegistrationTrigger : ITrigger +{ + [propget] HRESULT Delay([out, retval] BSTR *pDelay); + [propput] HRESULT Delay([in] BSTR delay); +} + [ object, oleautomation,

1 0

Paul Gofman : msvcrt: Force debug info in critical sections.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: a02d35d386e5e04def0b304729c083421d1532b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a02d35d386e5e04def0b304729c083… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:35:12 2024 -0600 msvcrt: Force debug info in critical sections. --- dlls/msvcrt/concurrency.c | 4 ++-- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/lock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index a9879879301..c612758f033 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1637,7 +1637,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, this->shutdown_count = this->shutdown_size = 0; this->shutdown_events = NULL; - InitializeCriticalSection(&this->cs); + InitializeCriticalSectionEx(&this->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ThreadScheduler"); list_init(&this->scheduled_chores); @@ -3525,7 +3525,7 @@ _ReentrantBlockingLock* __thiscall _ReentrantBlockingLock_ctor(_ReentrantBlockin { TRACE("(%p)\n", this); - InitializeCriticalSection(&this->cs); + InitializeCriticalSectionEx(&this->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _ReentrantBlockingLock"); return this; } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b4e80a4b5d0..a3a872d4be3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -606,7 +606,7 @@ static FILE* msvcrt_alloc_fp(void) { if (file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) { - InitializeCriticalSection(&((file_crit*)file)->crit); + InitializeCriticalSectionEx(&((file_crit*)file)->crit, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); } MSVCRT_stream_idx++; diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 216d3d71504..886bb625b10 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -44,7 +44,7 @@ static inline void msvcrt_mlock_set_entry_initialized( int locknum, BOOL initial static inline void msvcrt_initialize_mlock( int locknum ) { - InitializeCriticalSection( &(lock_table[ locknum ].crit) ); + InitializeCriticalSectionEx( &(lock_table[ locknum ].crit), 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); lock_table[ locknum ].crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": LOCKTABLEENTRY.crit"); msvcrt_mlock_set_entry_initialized( locknum, TRUE ); }

1 0

Paul Gofman : msvcp: Force debug info in critical sections.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: bca70386925c1858d81ae50cbbeeafbe5031341f URL: https://gitlab.winehq.org/wine/wine/-/commit/bca70386925c1858d81ae50cbbeeaf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:31:31 2024 -0600 msvcp: Force debug info in critical sections. --- dlls/msvcp90/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c297f635e90..e8998383ecc 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -264,7 +264,7 @@ DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { CRITICAL_SECTION *cs = operator_new(sizeof(*cs)); - InitializeCriticalSection(cs); + InitializeCriticalSectionEx(cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); this->mutex = cs; return this; @@ -347,7 +347,7 @@ void __cdecl _Init_locks__Init_locks_ctor(_Init_locks *this) { for(i=0; i<_MAX_LOCK; i++) { - InitializeCriticalSection(&lockit_cs[i]); + InitializeCriticalSectionEx(&lockit_cs[i], 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lockit_cs[i].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); } }

1 0

Alexandre Julliard : wow64: Update Wow64RaiseException behavior to match i386 hardware exceptions.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 259b92d13e2d2c67876006ff0485e7031f4ec7bf URL: https://gitlab.winehq.org/wine/wine/-/commit/259b92d13e2d2c67876006ff0485e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:02:18 2024 +0100 wow64: Update Wow64RaiseException behavior to match i386 hardware exceptions. --- dlls/wow64/syscall.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index db51948057f..78338f7ef6a 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -1330,11 +1330,13 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) int_rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; break; case 0x01: /* single-step */ + ctx32.i386.EFlags &= ~0x100; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); int_rec.ExceptionCode = EXCEPTION_SINGLE_STEP; break; case 0x03: /* breakpoint */ int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; - int_rec.ExceptionAddress = (void *)(ULONG_PTR)(ctx32.i386.Eip + 1); + int_rec.ExceptionAddress = (void *)(ULONG_PTR)(ctx32.i386.Eip - 1); int_rec.NumberParameters = 1; break; case 0x04: /* overflow */ @@ -1352,6 +1354,9 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) case 0x0c: /* stack fault */ int_rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; break; + case 0x0d: /* general protection fault */ + int_rec.ExceptionCode = EXCEPTION_PRIV_INSTRUCTION; + break; case 0x29: /* __fastfail */ int_rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; int_rec.ExceptionFlags = EH_NONCONTINUABLE; @@ -1360,7 +1365,7 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) first_chance = FALSE; break; case 0x2d: /* debug service */ - ctx32.i386.Eip++; + ctx32.i386.Eip += 3; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; @@ -1368,8 +1373,6 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) int_rec.ExceptionInformation[0] = ctx32.i386.Eax; break; default: - ctx32.i386.Eip -= 2; - pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); int_rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; int_rec.NumberParameters = 2;

1 0

Paul Gofman : ntdll: Support generic xstate config in context manipulation functions.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: beec1b57fbaf9034a05051ea2ceeba0ffdbf0857 URL: https://gitlab.winehq.org/wine/wine/-/commit/beec1b57fbaf9034a05051ea2ceeba… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 18 11:51:36 2024 -0600 ntdll: Support generic xstate config in context manipulation functions. --- dlls/ntdll/exception.c | 121 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 102 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 529ff125242..1a216e3170b 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -586,6 +586,52 @@ static const struct context_parameters *context_get_parameters( ULONG context_fl return NULL; } +/* offset is from the start of XSAVE_AREA_HEADER. */ +static int next_compacted_xstate_offset( int off, UINT64 compaction_mask, int feature_idx ) +{ + const UINT64 feature_mask = (UINT64)1 << feature_idx; + + if (compaction_mask & feature_mask) off += user_shared_data->XState.Features[feature_idx].Size; + if (user_shared_data->XState.AlignedFeatures & (feature_mask << 1)) + off = (off + 63) & ~63; + return off; +} + +/* size includes XSAVE_AREA_HEADER but not XSAVE_FORMAT (legacy save area). */ +static int xstate_get_compacted_size( UINT64 mask ) +{ + UINT64 compaction_mask; + unsigned int i; + int off; + + compaction_mask = ((UINT64)1 << 63) | mask; + mask >>= 2; + off = sizeof(XSAVE_AREA_HEADER); + i = 2; + while (mask) + { + if (mask == 1) return off + user_shared_data->XState.Features[i].Size; + off = next_compacted_xstate_offset( off, compaction_mask, i ); + mask >>= 1; + ++i; + } + return off; +} + +static int xstate_get_size( UINT64 mask ) +{ + unsigned int i; + + mask >>= 2; + if (!mask) return sizeof(XSAVE_AREA_HEADER); + i = 2; + while (mask != 1) + { + mask >>= 1; + ++i; + } + return user_shared_data->XState.Features[i].Offset + user_shared_data->XState.Features[i].Size - sizeof(XSAVE_FORMAT); +} /********************************************************************** * RtlGetExtendedContextLength2 (NTDLL.@) @@ -611,12 +657,12 @@ NTSTATUS WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length if (!(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0) )) return STATUS_NOT_SUPPORTED; - compaction_mask &= supported_mask; - - size = p->context_size + p->context_ex_size + offsetof(XSTATE, YmmContext) + 63; + size = p->context_size + p->context_ex_size + 63; - if (compaction_mask & supported_mask & (1 << XSTATE_AVX)) - size += sizeof(YMMCONTEXT); + compaction_mask &= supported_mask & ~(ULONG64)3; + if (user_shared_data->XState.CompactionEnabled) size += xstate_get_compacted_size( compaction_mask ); + else if (compaction_mask) size += xstate_get_size( compaction_mask ); + else size += sizeof(XSAVE_AREA_HEADER); *length = size; return STATUS_SUCCESS; @@ -667,11 +713,11 @@ NTSTATUS WINAPI RtlInitializeExtendedContext2( void *context, ULONG context_flag xs = (XSTATE *)(((ULONG_PTR)c_ex + p->context_ex_size + 63) & ~(ULONG_PTR)63); c_ex->XState.Offset = (ULONG_PTR)xs - (ULONG_PTR)c_ex; - c_ex->XState.Length = offsetof(XSTATE, YmmContext); compaction_mask &= supported_mask; - if (compaction_mask & (1 << XSTATE_AVX)) - c_ex->XState.Length += sizeof(YMMCONTEXT); + if (user_shared_data->XState.CompactionEnabled) c_ex->XState.Length = xstate_get_compacted_size( compaction_mask ); + else if (compaction_mask & ~(ULONG64)3) c_ex->XState.Length = xstate_get_size( compaction_mask ); + else c_ex->XState.Length = sizeof(XSAVE_AREA_HEADER); memset( xs, 0, c_ex->XState.Length ); if (user_shared_data->XState.CompactionEnabled) @@ -705,6 +751,10 @@ NTSTATUS WINAPI RtlInitializeExtendedContext( void *context, ULONG context_flags void * WINAPI RtlLocateExtendedFeature2( CONTEXT_EX *context_ex, ULONG feature_id, XSTATE_CONFIGURATION *xstate_config, ULONG *length ) { + UINT64 feature_mask = (ULONG64)1 << feature_id; + XSAVE_AREA_HEADER *xs; + unsigned int offset, i; + TRACE( "context_ex %p, feature_id %lu, xstate_config %p, length %p.\n", context_ex, feature_id, xstate_config, length ); @@ -720,16 +770,31 @@ void * WINAPI RtlLocateExtendedFeature2( CONTEXT_EX *context_ex, ULONG feature_i return NULL; } - if (feature_id != XSTATE_AVX) + if (feature_id < 2 || feature_id >= 64) return NULL; + xs = (XSAVE_AREA_HEADER *)((BYTE *)context_ex + context_ex->XState.Offset); + if (length) - *length = sizeof(YMMCONTEXT); + *length = xstate_config->Features[feature_id].Size; + + if (xstate_config->CompactionEnabled) + { + if (!(xs->CompactionMask & feature_mask)) return NULL; + offset = sizeof(XSAVE_AREA_HEADER); + for (i = 2; i < feature_id; ++i) + offset = next_compacted_xstate_offset( offset, xs->CompactionMask, i ); + } + else + { + if (!(feature_mask & xstate_config->EnabledFeatures)) return NULL; + offset = xstate_config->Features[feature_id].Offset - sizeof(XSAVE_FORMAT); + } - if (context_ex->XState.Length < sizeof(XSTATE)) + if (context_ex->XState.Length < offset + xstate_config->Features[feature_id].Size) return NULL; - return (BYTE *)context_ex + context_ex->XState.Offset + offsetof(XSTATE, YmmContext); + return (BYTE *)xs + offset; } @@ -859,8 +924,9 @@ NTSTATUS WINAPI RtlCopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CONTEXT_EX *src ) { const struct context_parameters *p; - XSTATE *dst_xs, *src_xs; + XSAVE_AREA_HEADER *dst_xs, *src_xs; ULONG64 feature_mask; + unsigned int i, off, size; TRACE( "dst %p, context_flags %#lx, src %p.\n", dst, context_flags, src ); @@ -875,18 +941,35 @@ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CO if (!(context_flags & 0x40)) return STATUS_SUCCESS; - if (dst->XState.Length < offsetof(XSTATE, YmmContext)) + if (dst->XState.Length < sizeof(XSAVE_AREA_HEADER)) return STATUS_BUFFER_OVERFLOW; - dst_xs = (XSTATE *)((BYTE *)dst + dst->XState.Offset); - src_xs = (XSTATE *)((BYTE *)src + src->XState.Offset); + dst_xs = (XSAVE_AREA_HEADER *)((BYTE *)dst + dst->XState.Offset); + src_xs = (XSAVE_AREA_HEADER *)((BYTE *)src + src->XState.Offset); - memset(dst_xs, 0, offsetof(XSTATE, YmmContext)); + memset(dst_xs, 0, sizeof(XSAVE_AREA_HEADER)); dst_xs->Mask = (src_xs->Mask & ~(ULONG64)3) & feature_mask; dst_xs->CompactionMask = user_shared_data->XState.CompactionEnabled ? ((ULONG64)1 << 63) | (src_xs->CompactionMask & feature_mask) : 0; - if (dst_xs->Mask & 4 && src->XState.Length >= sizeof(XSTATE) && dst->XState.Length >= sizeof(XSTATE)) - memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); + + if (dst_xs->CompactionMask) feature_mask &= dst_xs->CompactionMask; + feature_mask = dst_xs->Mask >> 2; + + i = 2; + off = sizeof(XSAVE_AREA_HEADER); + while (1) + { + if (feature_mask & 1) + { + if (!dst_xs->CompactionMask) off = user_shared_data->XState.Features[i].Offset - sizeof(XSAVE_FORMAT); + size = user_shared_data->XState.Features[i].Size; + if (src->XState.Length < off + size || dst->XState.Length < off + size) break; + memcpy( (BYTE *)dst_xs + off, (BYTE *)src_xs + off, size ); + } + if (!(feature_mask >>= 1)) break; + if (dst_xs->CompactionMask) off = next_compacted_xstate_offset( off, dst_xs->CompactionMask, i); + ++i; + } return STATUS_SUCCESS; }

1 0

Paul Gofman : ntdll: Mind context compaction mask in context_from_server().
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: ba1e2d5dda84f64bd784ae1797ad2825d8b8f096 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba1e2d5dda84f64bd784ae1797ad28… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 1 11:47:42 2024 -0600 ntdll: Mind context compaction mask in context_from_server(). --- dlls/ntdll/unix/signal_i386.c | 17 ++--------------- dlls/ntdll/unix/signal_x86_64.c | 5 ----- dlls/ntdll/unix/thread.c | 8 ++++---- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 3ac12a35db6..e9a86e68948 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -607,7 +607,6 @@ struct xcontext { CONTEXT c; CONTEXT_EX c_ex; - ULONG64 host_compaction_mask; }; static inline XSAVE_AREA_HEADER *xstate_from_context( const CONTEXT *context ) @@ -831,11 +830,7 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); - if (xstate_extended_features() && (xs = XState_sig(fpux))) - { - context_init_xstate( context, xs ); - xcontext->host_compaction_mask = xs->CompactionMask; - } + if (xstate_extended_features() && (xs = XState_sig(fpux))) context_init_xstate( context, xs ); } if (!fpu && !fpux) save_fpu( context ); } @@ -876,15 +871,7 @@ static inline void restore_context( const struct xcontext *xcontext, ucontext_t SS_sig(sigcontext) = context->SegSs; if (fpu) *fpu = context->FloatSave; - if (fpux) - { - XSAVE_AREA_HEADER *xs; - - memcpy( fpux, context->ExtendedRegisters, sizeof(*fpux) ); - - if (xstate_extended_features() && (xs = XState_sig(fpux))) - xs->CompactionMask = xcontext->host_compaction_mask; - } + if (fpux) memcpy( fpux, context->ExtendedRegisters, sizeof(*fpux) ); if (!fpu && !fpux) restore_fpu( context ); } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 01bbd2e3572..b6586f88803 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -479,7 +479,6 @@ struct xcontext { CONTEXT c; CONTEXT_EX c_ex; - ULONG64 host_compaction_mask; }; static inline XSAVE_AREA_HEADER *xstate_from_context( const CONTEXT *context ) @@ -907,7 +906,6 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex * just reference sigcontext without overflowing 32 bit XState.Offset */ context_init_xstate( context, xs ); assert( xcontext->c_ex.XState.Offset == (BYTE *)xs - (BYTE *)&xcontext->c_ex ); - xcontext->host_compaction_mask = xs->CompactionMask; } } } @@ -921,7 +919,6 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcontext ) { const CONTEXT *context = &xcontext->c; - XSAVE_AREA_HEADER *xs; amd64_thread_data()->dr0 = context->Dr0; amd64_thread_data()->dr1 = context->Dr1; @@ -931,8 +928,6 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon amd64_thread_data()->dr7 = context->Dr7; set_sigcontext( context, sigcontext ); if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->FltSave; - if (xstate_extended_features() && (xs = XState_sig(FPU_sig(sigcontext)))) - xs->CompactionMask = xcontext->host_compaction_mask; leave_handler( sigcontext ); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 578399f43f3..660d8389cae 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -691,7 +691,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); xs->Mask &= ~4; - if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004; + if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) { if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; @@ -765,7 +765,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); xs->Mask &= ~4; - if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004; + if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) { if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; @@ -840,7 +840,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); xs->Mask &= ~4; - if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004; + if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) { if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; @@ -922,7 +922,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); xs->Mask &= ~4; - if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004; + if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) { if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;

1 0

Alexandre Julliard : ntdll: Use a .seh handler in RtlUserThreadStart on ARM64EC.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 631a43c577420c272cbab1741fc82373ab4c7805 URL: https://gitlab.winehq.org/wine/wine/-/commit/631a43c577420c272cbab1741fc823… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:49:42 2024 +0100 ntdll: Use a .seh handler in RtlUserThreadStart on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 5fc4b113a97..9174eafc3e3 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1740,17 +1740,25 @@ void WINAPI RtlRaiseException( struct _EXCEPTION_RECORD * rec) /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ -void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) +void __attribute__((naked)) RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) { - __TRY - { - pBaseThreadInitThunk( 0, (LPTHREAD_START_ROUTINE)entry, arg ); - } - __EXCEPT(call_unhandled_exception_filter) - { - NtTerminateProcess( GetCurrentProcess(), GetExceptionCode() ); - } - __ENDTRY + asm( ".seh_proc RtlUserThreadStart\n\t" + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" + ".seh_endprologue\n\t" + "adrp x11, pBaseThreadInitThunk\n\t" + "ldr x11, [x11, #:lo12:pBaseThreadInitThunk]\n\t" + "adr x10, $iexit_thunk$cdecl$v$i8i8i8\n\t" + "mov x2, x1\n\t" + "mov x1, x0\n\t" + "mov x0, #0\n\t" + "adrp x16, __os_arm64x_dispatch_icall\n\t" + "ldr x16, [x16, #:lo12:__os_arm64x_dispatch_icall]\n\t" + "blr x16\n\t" + "blr x11\n\t" + "brk #1\n\t" + ".seh_handler call_unhandled_exception_handler, @except\n\t" + ".seh_endproc" ); }

1 0

Alexandre Julliard : wow64: Use a .seh handler for the simulation loop.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 89336772f810cf0ecc456d5a94ad766fb92e87e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/89336772f810cf0ecc456d5a94ad76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:20:55 2024 +0100 wow64: Use a .seh handler for the simulation loop. --- dlls/wow64/syscall.c | 75 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 78338f7ef6a..9f1f324ce35 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -940,25 +940,75 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) /********************************************************************** - * simulate_filter + * cpu_simulate */ +#ifdef __aarch64__ +extern void DECLSPEC_NORETURN cpu_simulate( void (*func)(void) ); +__ASM_GLOBAL_FUNC( cpu_simulate, + "stp x29, x30, [sp, #-32]!\n\t" + ".seh_save_fplr_x 32\n\t" + ".seh_endprologue\n\t" + ".seh_handler cpu_simulate_handler, @except\n\t" + "str x0, [sp, #16]\n" + ".Lcpu_simulate_loop:\n\t" + "ldr x0, [sp, #16]\n\t" + "blr x0\n\t" + "b .Lcpu_simulate_loop" ) +__ASM_GLOBAL_FUNC( cpu_simulate_handler, + "stp x29, x30, [sp, #-32]!\n\t" + ".seh_save_fplr_x 32\n\t" + ".seh_endprologue\n\t" + "mov x19, x0\n\t" /* record */ + "mov x20, x1\n\t" /* frame */ + "stp x0, x2, [sp, #16]\n\t" /* record, context */ + "add x0, sp, #16\n\t" + "bl Wow64PassExceptionToGuest\n\t" + "mov x20, x0\n\t" /* frame */ + "adr x1, .Lcpu_simulate_loop\n\t" /* target */ + "mov x19, x2\n\t" /* record */ + "bl RtlUnwind\n\t" + "brk #1" ) + +#elif defined __WINE_PE_BUILD +extern void DECLSPEC_NORETURN cpu_simulate( void (*func)(void) ); +__ASM_GLOBAL_FUNC( cpu_simulate, + "subq $0x28, %rsp\n\t" + ".seh_stackalloc 0x28\n\t" + ".seh_endprologue\n\t" + ".seh_handler cpu_simulate_handler, @except\n\t" + "movq %rcx,0x20(%rsp)\n" + ".Lcpu_simulate_loop:\n\t" + "call *0x20(%rsp)\n\t" + "jmp .Lcpu_simulate_loop" ) +__ASM_GLOBAL_FUNC( cpu_simulate_handler, + "subq $0x38, %rsp\n\t" + ".seh_stackalloc 0x38\n\t" + ".seh_endprologue\n\t" + "movq %rcx,%rsi\n\t" /* record */ + "movq %rcx,0x20(%rsp)\n\t" + "movq %rdx,%rdi\n\t" /* frame */ + "movq %r8,0x28(%rsp)\n\t" /* context */ + "leaq 0x20(%rsp),%rcx\n\t" + "call Wow64PassExceptionToGuest\n\t" + "movq %rdi,%rcx\n\t" /* frame */ + "leaq .Lcpu_simulate_loop(%rip), %rdx\n\t" /* target */ + "movq %rsi,%r8\n\t" /* record */ + "call RtlUnwind\n\t" + "int3" ) +#else static LONG CALLBACK simulate_filter( EXCEPTION_POINTERS *ptrs ) { Wow64PassExceptionToGuest( ptrs ); return EXCEPTION_EXECUTE_HANDLER; } - -/********************************************************************** - * cpu_simulate - */ -static void cpu_simulate(void) +static void cpu_simulate( void (*func)(void) ) { for (;;) { __TRY { - pBTCpuSimulate(); + func(); } __EXCEPT( simulate_filter ) { @@ -967,6 +1017,7 @@ static void cpu_simulate(void) __ENDTRY } } +#endif /********************************************************************** @@ -1039,7 +1090,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON ctx.Eip = pLdrSystemDllInitBlock->pKiUserApcDispatcher; frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); } break; @@ -1065,7 +1116,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON ctx.R3 = arg3; frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); } break; } @@ -1128,7 +1179,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); if (!__wine_setjmpex( &frame.jmpbuf, NULL )) - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); else pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &orig_ctx ); } @@ -1153,7 +1204,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); if (!__wine_setjmpex( &frame.jmpbuf, NULL )) - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); else pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &orig_ctx ); } @@ -1177,7 +1228,7 @@ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) RtlRunOnceExecuteOnce( &init_done, process_init, NULL, NULL ); thread_init(); - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); }

1 0