November 2021 - Wine-Commits

Zebediah Figura : ntdll: Reimplement the critical section fast path on top of Win32 futexes.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: c577ce2671ba8b003dbbdb329ada56368a370778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c577ce2671ba8b003dbbdb32… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:55 2021 -0600 ntdll: Reimplement the critical section fast path on top of Win32 futexes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 35 ++++++++----- dlls/ntdll/unix/loader.c | 3 -- dlls/ntdll/unix/sync.c | 109 ----------------------------------------- dlls/ntdll/unix/unix_private.h | 4 -- dlls/ntdll/unixlib.h | 5 +- 5 files changed, 24 insertions(+), 132 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 78c68ddbe38..34b804b1463 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -172,19 +172,26 @@ static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) { - NTSTATUS ret; + LARGE_INTEGER time = {.QuadPart = timeout * (LONGLONG)-10000000}; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = unix_funcs->fast_RtlpWaitForCriticalSection( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit )) { HANDLE sem = get_semaphore( crit ); - LARGE_INTEGER time; - - time.QuadPart = timeout * (LONGLONG)-10000000; - ret = NtWaitForSingleObject( sem, FALSE, &time ); + return NtWaitForSingleObject( sem, FALSE, &time ); + } + else + { + int *lock = (int *)&crit->LockSemaphore; + while (!InterlockedCompareExchange( lock, 0, 1 )) + { + static const int zero; + /* this may wait longer than specified in case of multiple wake-ups */ + if (RtlWaitOnAddress( lock, &zero, sizeof(int), &time ) == STATUS_TIMEOUT) + return STATUS_TIMEOUT; + } + return STATUS_WAIT_0; } - return ret; } /****************************************************************************** @@ -274,8 +281,6 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } - if (unix_funcs->fast_RtlDeleteCriticalSection( crit ) == STATUS_NOT_IMPLEMENTED) - NtClose( crit->LockSemaphore ); } else NtClose( crit->LockSemaphore ); crit->LockSemaphore = 0; @@ -351,12 +356,18 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = unix_funcs->fast_RtlpUnWaitCriticalSection( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit )) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); } + else + { + int *lock = (int *)&crit->LockSemaphore; + InterlockedExchange( lock, 1 ); + RtlWakeAddressSingle( lock ); + ret = STATUS_SUCCESS; + } if (ret) RtlRaiseStatus( ret ); return ret; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 05ae264297a..1dbcc0d7a7b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2145,9 +2145,6 @@ static struct unix_funcs unix_funcs = NtCurrentTeb, #endif RtlGetSystemTimePrecise, - fast_RtlpWaitForCriticalSection, - fast_RtlpUnWaitCriticalSection, - fast_RtlDeleteCriticalSection, fast_RtlTryAcquireSRWLockExclusive, fast_RtlAcquireSRWLockExclusive, fast_RtlTryAcquireSRWLockShared, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 47a0a03b45f..12df0c90d73 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2550,115 +2550,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #endif -#ifdef __linux__ - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - int val; - struct timespec timespec; - - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - - timespec.tv_sec = timeout; - timespec.tv_nsec = 0; - while ((val = InterlockedCompareExchange( (int *)&crit->LockSemaphore, 0, 1 )) != 1) - { - /* note: this may wait longer than specified in case of signals or */ - /* multiple wake-ups, but that shouldn't be a problem */ - if (futex_wait( (int *)&crit->LockSemaphore, val, &timespec ) == -1 && errno == ETIMEDOUT) - return STATUS_TIMEOUT; - } - return STATUS_WAIT_0; -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - - *(int *)&crit->LockSemaphore = 1; - futex_wake( (int *)&crit->LockSemaphore, 1 ); - return STATUS_SUCCESS; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - return STATUS_SUCCESS; -} - -#elif defined(__APPLE__) - -static inline semaphore_t get_mach_semaphore( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_t ret = *(int *)&crit->LockSemaphore; - if (!ret) - { - semaphore_t sem; - if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) return 0; - if (!(ret = InterlockedCompareExchange( (int *)&crit->LockSemaphore, sem, 0 ))) - ret = sem; - else - semaphore_destroy( mach_task_self(), sem ); /* somebody beat us to it */ - } - return ret; -} - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - mach_timespec_t timespec; - semaphore_t sem = get_mach_semaphore( crit ); - - timespec.tv_sec = timeout; - timespec.tv_nsec = 0; - for (;;) - { - switch( semaphore_timedwait( sem, timespec )) - { - case KERN_SUCCESS: - return STATUS_WAIT_0; - case KERN_ABORTED: - continue; /* got a signal, restart */ - case KERN_OPERATION_TIMED_OUT: - return STATUS_TIMEOUT; - default: - return STATUS_INVALID_HANDLE; - } - } -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_t sem = get_mach_semaphore( crit ); - semaphore_signal( sem ); - return STATUS_SUCCESS; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_destroy( mach_task_self(), *(int *)&crit->LockSemaphore ); - return STATUS_SUCCESS; -} - -#else /* __APPLE__ */ - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -#endif - - #ifdef __linux__ /* Futex-based SRW lock implementation: diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 641de0c465f..d44a9e128ff 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -100,10 +100,6 @@ extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PT extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; - -extern NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index ded05c40e17..535f76a647e 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 129 +#define NTDLL_UNIXLIB_VERSION 130 struct unix_funcs { @@ -39,9 +39,6 @@ struct unix_funcs LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); /* fast locks */ - NTSTATUS (CDECL *fast_RtlpWaitForCriticalSection)( RTL_CRITICAL_SECTION *crit, int timeout ); - NTSTATUS (CDECL *fast_RtlpUnWaitCriticalSection)( RTL_CRITICAL_SECTION *crit ); - NTSTATUS (CDECL *fast_RtlDeleteCriticalSection)( RTL_CRITICAL_SECTION *crit ); NTSTATUS (CDECL *fast_RtlTryAcquireSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlAcquireSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlTryAcquireSRWLockShared)( RTL_SRWLOCK *lock );

1 0

Zebediah Figura : ntdll: Get rid of the direct futex path for condition variables.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: 87164ee3332c95f0cd9a1f3e4598056689cdfadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=87164ee3332c95f0cd9a1f3e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:56 2021 -0600 ntdll: Get rid of the direct futex path for condition variables. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 24 +++++--------- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unix/sync.c | 71 ------------------------------------------ dlls/ntdll/unix/unix_private.h | 3 -- dlls/ntdll/unixlib.h | 5 +-- 5 files changed, 9 insertions(+), 96 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 34b804b1463..4ceadebf0e7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -792,11 +792,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (unix_funcs->fast_RtlWakeConditionVariable( variable, 1 ) == STATUS_NOT_IMPLEMENTED) - { - InterlockedIncrement( (int *)&variable->Ptr ); - RtlWakeAddressSingle( variable ); - } + InterlockedIncrement( (int *)&variable->Ptr ); + RtlWakeAddressSingle( variable ); } /*********************************************************************** @@ -806,11 +803,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (unix_funcs->fast_RtlWakeConditionVariable( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) - { - InterlockedIncrement( (int *)&variable->Ptr ); - RtlWakeAddressAll( variable ); - } + InterlockedIncrement( (int *)&variable->Ptr ); + RtlWakeAddressAll( variable ); } /*********************************************************************** @@ -831,12 +825,11 @@ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, RTL_CRITICAL_SECTION *crit, const LARGE_INTEGER *timeout ) { - const void *value = variable->Ptr; + int value = *(int *)&variable->Ptr; NTSTATUS status; RtlLeaveCriticalSection( crit ); - if ((status = unix_funcs->fast_wait_cv( variable, value, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &value, sizeof(value), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &value, sizeof(value), timeout ); RtlEnterCriticalSection( crit ); return status; } @@ -863,7 +856,7 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) { - const void *value = variable->Ptr; + int value = *(int *)&variable->Ptr; NTSTATUS status; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) @@ -871,8 +864,7 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, else RtlReleaseSRWLockExclusive( lock ); - if ((status = unix_funcs->fast_wait_cv( variable, value, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( variable, &value, sizeof(value), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &value, sizeof(value), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1dbcc0d7a7b..32aa7267423 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2151,8 +2151,6 @@ static struct unix_funcs unix_funcs = fast_RtlAcquireSRWLockShared, fast_RtlReleaseSRWLockExclusive, fast_RtlReleaseSRWLockShared, - fast_RtlWakeConditionVariable, - fast_wait_cv, load_so_dll, init_builtin_dll, init_unix_lib, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 12df0c90d73..7a2466f5fa3 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -162,23 +162,6 @@ static int *get_futex(void **ptr) return NULL; } -static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) -{ - LARGE_INTEGER now; - timeout_t diff; - - if (timeout->QuadPart > 0) - { - NtQuerySystemTime( &now ); - diff = timeout->QuadPart - now.QuadPart; - } - else - diff = -timeout->QuadPart; - - timespec->tv_sec = diff / TICKSPERSEC; - timespec->tv_nsec = (diff % TICKSPERSEC) * 100; -} - #endif @@ -2802,50 +2785,6 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) return STATUS_SUCCESS; } -NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) -{ - const char *value_ptr; - int aligned_value, *futex; - struct timespec timespec; - int ret; - - if (!use_futexes()) - return STATUS_NOT_IMPLEMENTED; - - if (!(futex = get_futex( &variable->Ptr ))) - return STATUS_NOT_IMPLEMENTED; - - value_ptr = (const char *)&value; - value_ptr += ((ULONG_PTR)futex) - ((ULONG_PTR)&variable->Ptr); - aligned_value = *(int *)value_ptr; - - if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) - { - timespec_from_timeout( &timespec, timeout ); - ret = futex_wait( futex, aligned_value, &timespec ); - } - else - ret = futex_wait( futex, aligned_value, NULL ); - - if (ret == -1 && errno == ETIMEDOUT) - return STATUS_TIMEOUT; - return STATUS_WAIT_0; -} - -NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) -{ - int *futex; - - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - - if (!(futex = get_futex( &variable->Ptr ))) - return STATUS_NOT_IMPLEMENTED; - - InterlockedIncrement( futex ); - futex_wake( futex, count ); - return STATUS_SUCCESS; -} - #else NTSTATUS CDECL fast_RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) @@ -2878,14 +2817,4 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) return STATUS_NOT_IMPLEMENTED; } -NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) -{ - return STATUS_NOT_IMPLEMENTED; -} - #endif diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d44a9e128ff..61f37d4b22f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -106,10 +106,7 @@ extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLS extern NTSTATUS CDECL fast_RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) DECLSPEC_HIDDEN; extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, - const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 535f76a647e..a271bb05da9 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 130 +#define NTDLL_UNIXLIB_VERSION 131 struct unix_funcs { @@ -45,9 +45,6 @@ struct unix_funcs NTSTATUS (CDECL *fast_RtlAcquireSRWLockShared)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlReleaseSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlReleaseSRWLockShared)( RTL_SRWLOCK *lock ); - NTSTATUS (CDECL *fast_RtlWakeConditionVariable)( RTL_CONDITION_VARIABLE *variable, int count ); - NTSTATUS (CDECL *fast_wait_cv)( RTL_CONDITION_VARIABLE *variable, const void *value, - const LARGE_INTEGER *timeout ); /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module );

1 0

Zebediah Figura : ntdll: Reimplement SRW locks on top of Win32 futexes.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: f3e9498740d675b74d0f84b8120ef7e1e2122ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3e9498740d675b74d0f84b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:57 2021 -0600 ntdll: Reimplement SRW locks on top of Win32 futexes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 315 +++++++++++++++++++---------------------- dlls/ntdll/unix/loader.c | 6 - dlls/ntdll/unix/sync.c | 308 ---------------------------------------- dlls/ntdll/unix/unix_private.h | 6 - dlls/ntdll/unixlib.h | 10 +- 5 files changed, 143 insertions(+), 502 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3e9498740d675b74d0f…

1 0

Zebediah Figura : ntdll: Implement thread-ID alerts using futexes if possible.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: 9d79f72142dc027392b0f4a97d69c9df601d15aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d79f72142dc027392b0f4a9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 16 21:50:43 2021 -0600 ntdll: Implement thread-ID alerts using futexes if possible. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 33cd1d84dd5..59fe6bea8f5 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2342,6 +2342,9 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { HANDLE event; +#ifdef __linux__ + int futex; +#endif }; #define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) @@ -2376,6 +2379,11 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; +#ifdef __linux__ + if (use_futexes()) + return entry; +#endif + if (!entry->event) { HANDLE event; @@ -2401,10 +2409,43 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; +#ifdef __linux__ + if (use_futexes()) + { + int *futex = &entry->futex; + if (!InterlockedExchange( futex, 1 )) + futex_wake( futex, 1 ); + return STATUS_SUCCESS; + } +#endif + return NtSetEvent( entry->event, NULL ); } +#ifdef __linux__ +static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) +{ + LARGE_INTEGER now; + + if (timeout->QuadPart >= 0) return timeout->QuadPart; + NtQuerySystemTime( &now ); + return now.QuadPart - timeout->QuadPart; +} + +static LONGLONG update_timeout( ULONGLONG end ) +{ + LARGE_INTEGER now; + LONGLONG timeleft; + + NtQuerySystemTime( &now ); + timeleft = end - now.QuadPart; + if (timeleft < 0) timeleft = 0; + return timeleft; +} +#endif + + /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) */ @@ -2417,6 +2458,41 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG if (!entry) return STATUS_INVALID_CID; +#ifdef __linux__ + if (use_futexes()) + { + int *futex = &entry->futex; + ULONGLONG end; + int ret; + + if (timeout) + { + if (timeout->QuadPart == TIMEOUT_INFINITE) + timeout = NULL; + else + end = get_absolute_timeout( timeout ); + } + + while (!InterlockedExchange( futex, 0 )) + { + if (timeout) + { + LONGLONG timeleft = update_timeout( end ); + struct timespec timespec; + + timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + ret = futex_wait( futex, 0, &timespec ); + } + else + ret = futex_wait( futex, 0, NULL ); + + if (ret == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; + } + return STATUS_ALERTED; + } +#endif + status = NtWaitForSingleObject( entry->event, FALSE, timeout ); if (!status) return STATUS_ALERTED; return status;

1 0

Huw Davies : winecoreaudio: Move get_endpoint_ids to a unixlib.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: c84923b2003e21300d829de29e52056516adbab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84923b2003e21300d829de2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 17 09:08:49 2021 -0600 winecoreaudio: Move get_endpoint_ids to a unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/Makefile.in | 1 + dlls/winecoreaudio.drv/coreaudio.c | 229 ++++++++++++++++++++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 203 +++++++++----------------------- dlls/winecoreaudio.drv/unixlib.h | 44 +++++++ 4 files changed, 322 insertions(+), 155 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c84923b2003e21300d82…

1 0

Huw Davies : winecoreaudio: Introduce a stream structure.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: 9281d0154478cbb6d8f857397aa6a40abd99e7ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9281d0154478cbb6d8f85739… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 17 09:09:29 2021 -0600 winecoreaudio: Introduce a stream structure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 637 +++++++++++++++++++------------------- dlls/winecoreaudio.drv/unixlib.h | 23 ++ 2 files changed, 339 insertions(+), 321 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9281d0154478cbb6d8f8…

1 0

Huw Davies : winecoreaudio: Use the global lock to protect the audio client.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: 8e90b2569c4c7660038ea83aafe6489b012a503a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e90b2569c4c7660038ea83a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 17 09:10:16 2021 -0600 winecoreaudio: Use the global lock to protect the audio client. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 115 +++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e90b2569c4c7660038e…

1 0

Zebediah Figura : ntdll: Implement NtAlertThreadByThreadId and NtWaitForAlertByThreadId.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: 0e931fa5fd5141bd845bacac5b89cf4c744f1c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e931fa5fd5141bd845bacac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 16 21:50:41 2021 -0600 ntdll: Implement NtAlertThreadByThreadId and NtWaitForAlertByThreadId. These will be used to implement RtlWaitOnAddress() and other in-process synchronization primitives, as they are on Windows. These patches went through quite a few revisions in order to ensure that they had sufficient performance and correctness compared to the current implementation. I am particularly grateful to Etienne Juvigny and Dmitry Skvortsov for performing extensive testing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/sync.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/process.c | 11 ++++++ dlls/wow64/sync.c | 12 +++++++ dlls/wow64/syscall.h | 2 ++ include/winternl.h | 2 ++ 7 files changed, 126 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e7c1fa1dcf3..e5a49ba1a1f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -140,6 +140,7 @@ @ stdcall -syscall NtAdjustPrivilegesToken(long long ptr long ptr ptr) @ stdcall -syscall NtAlertResumeThread(long ptr) @ stdcall -syscall NtAlertThread(long) +@ stdcall -syscall NtAlertThreadByThreadId(ptr) @ stdcall -syscall NtAllocateLocallyUniqueId(ptr) # @ stub NtAllocateUserPhysicalPages @ stdcall -syscall NtAllocateUuids(ptr ptr ptr ptr) @@ -424,6 +425,7 @@ @ stdcall -syscall NtUnmapViewOfSection(long ptr) # @ stub NtVdmControl # @ stub NtW32Call +@ stdcall -syscall NtWaitForAlertByThreadId(ptr ptr) @ stdcall -syscall NtWaitForDebugEvent(long long ptr ptr) @ stdcall -syscall NtWaitForKeyedEvent(long ptr long ptr) @ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr) @@ -1161,6 +1163,7 @@ @ stdcall -private -syscall ZwAdjustPrivilegesToken(long long ptr long ptr ptr) NtAdjustPrivilegesToken @ stdcall -private -syscall ZwAlertResumeThread(long ptr) NtAlertResumeThread @ stdcall -private -syscall ZwAlertThread(long) NtAlertThread +@ stdcall -private -syscall ZwAlertThreadByThreadId(ptr) NtAlertThreadByThreadId @ stdcall -private -syscall ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId # @ stub ZwAllocateUserPhysicalPages @ stdcall -private -syscall ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @@ -1443,6 +1446,7 @@ @ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection # @ stub ZwVdmControl # @ stub ZwW32Call +@ stdcall -private -syscall ZwWaitForAlertByThreadId(ptr ptr) NtWaitForAlertByThreadId @ stdcall -private -syscall ZwWaitForDebugEvent(long long ptr ptr) NtWaitForDebugEvent @ stdcall -private -syscall ZwWaitForKeyedEvent(long ptr long ptr) NtWaitForKeyedEvent @ stdcall -private -syscall ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 99226d472da..7f36dc42579 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -132,6 +132,7 @@ static void * const syscalls[] = NtAdjustPrivilegesToken, NtAlertResumeThread, NtAlertThread, + NtAlertThreadByThreadId, NtAllocateLocallyUniqueId, NtAllocateUuids, NtAllocateVirtualMemory, @@ -334,6 +335,7 @@ static void * const syscalls[] = NtUnlockFile, NtUnlockVirtualMemory, NtUnmapViewOfSection, + NtWaitForAlertByThreadId, NtWaitForDebugEvent, NtWaitForKeyedEvent, NtWaitForMultipleObjects, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index daf9f46f43b..33cd1d84dd5 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -33,6 +33,9 @@ #include <limits.h> #include <signal.h> #include <sys/types.h> +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif @@ -74,6 +77,12 @@ static const LARGE_INTEGER zero_timeout; static pthread_mutex_t addr_mutex = PTHREAD_MUTEX_INITIALIZER; +static const char *debugstr_timeout( const LARGE_INTEGER *timeout ) +{ + if (!timeout) return "(infinite)"; + return wine_dbgstr_longlong( timeout->QuadPart ); +} + /* return a monotonic time counter, in Win32 ticks */ static inline ULONGLONG monotonic_counter(void) { @@ -2330,6 +2339,90 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl } +union tid_alert_entry +{ + HANDLE event; +}; + +#define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) +static union tid_alert_entry *tid_alert_blocks[4096]; + +static unsigned int handle_to_index( HANDLE handle, unsigned int *block_idx ) +{ + unsigned int idx = (wine_server_obj_handle(handle) >> 2) - 1; + *block_idx = idx / TID_ALERT_BLOCK_SIZE; + return idx % TID_ALERT_BLOCK_SIZE; +} + +static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) +{ + unsigned int block_idx, idx = handle_to_index( tid, &block_idx ); + union tid_alert_entry *entry; + + if (block_idx > ARRAY_SIZE(tid_alert_blocks)) + { + FIXME( "tid %p is too high\n", tid ); + return NULL; + } + + if (!tid_alert_blocks[block_idx]) + { + static const size_t size = TID_ALERT_BLOCK_SIZE * sizeof(union tid_alert_entry); + void *ptr = anon_mmap_alloc( size, PROT_READ | PROT_WRITE ); + if (ptr == MAP_FAILED) return NULL; + if (InterlockedCompareExchangePointer( (void **)&tid_alert_blocks[block_idx], ptr, NULL )) + munmap( ptr, size ); /* someone beat us to it */ + } + + entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; + + if (!entry->event) + { + HANDLE event; + + if (NtCreateEvent( &event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE )) + return NULL; + if (InterlockedCompareExchangePointer( &entry->event, event, NULL )) + NtClose( event ); + } + + return entry; +} + + +/*********************************************************************** + * NtAlertThreadByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( tid ); + + TRACE( "%p\n", tid ); + + if (!entry) return STATUS_INVALID_CID; + + return NtSetEvent( entry->event, NULL ); +} + + +/*********************************************************************** + * NtWaitForAlertByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); + NTSTATUS status; + + TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); + + if (!entry) return STATUS_INVALID_CID; + + status = NtWaitForSingleObject( entry->event, FALSE, timeout ); + if (!status) return STATUS_ALERTED; + return status; +} + + #ifdef __linux__ NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index d66b973385b..fbe501ed034 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -460,6 +460,17 @@ NTSTATUS WINAPI wow64_NtAlertThread( UINT *args ) } +/********************************************************************** + * wow64_NtAlertThreadByThreadId + */ +NTSTATUS WINAPI wow64_NtAlertThreadByThreadId( UINT *args ) +{ + HANDLE tid = get_handle( &args ); + + return NtAlertThreadByThreadId( tid ); +} + + /********************************************************************** * wow64_NtAssignProcessToJobObject */ diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index e2e9468a727..20776378a7d 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1460,6 +1460,18 @@ NTSTATUS WINAPI wow64_NtTraceControl( UINT *args ) } +/********************************************************************** + * wow64_NtWaitForAlertByThreadId + */ +NTSTATUS WINAPI wow64_NtWaitForAlertByThreadId( UINT *args ) +{ + const void *address = get_ptr( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + return NtWaitForAlertByThreadId( address, timeout ); +} + + /********************************************************************** * wow64_NtWaitForDebugEvent */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index bc403dd6d31..112711875f7 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -30,6 +30,7 @@ SYSCALL_ENTRY( NtAdjustPrivilegesToken ) \ SYSCALL_ENTRY( NtAlertResumeThread ) \ SYSCALL_ENTRY( NtAlertThread ) \ + SYSCALL_ENTRY( NtAlertThreadByThreadId ) \ SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ SYSCALL_ENTRY( NtAllocateUuids ) \ SYSCALL_ENTRY( NtAllocateVirtualMemory ) \ @@ -231,6 +232,7 @@ SYSCALL_ENTRY( NtUnlockFile ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ SYSCALL_ENTRY( NtUnmapViewOfSection ) \ + SYSCALL_ENTRY( NtWaitForAlertByThreadId ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ SYSCALL_ENTRY( NtWaitForMultipleObjects ) \ diff --git a/include/winternl.h b/include/winternl.h index eea97f1238b..cfd83f16337 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3858,6 +3858,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); +NTSYSAPI NTSTATUS WINAPI NtAlertThreadByThreadId(HANDLE); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); @@ -4097,6 +4098,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PL NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID); +NTSYSAPI NTSTATUS WINAPI NtWaitForAlertByThreadId(const void*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*); NTSYSAPI NTSTATUS WINAPI NtWaitForKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*);

1 0

Zebediah Figura : ntdll/tests: Add basic tests for thread-id alert functions.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: 6d19056a8cc3debd08d0a45fbd538c70d896bf11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d19056a8cc3debd08d0a45f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 16 21:50:42 2021 -0600 ntdll/tests: Add basic tests for thread-id alert functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/sync.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/ntdll/tests/sync.c b/dlls/ntdll/tests/sync.c index f2499ea648a..f930767a8b0 100644 --- a/dlls/ntdll/tests/sync.c +++ b/dlls/ntdll/tests/sync.c @@ -26,6 +26,7 @@ #include "winternl.h" #include "wine/test.h" +static NTSTATUS (WINAPI *pNtAlertThreadByThreadId)( HANDLE ); static NTSTATUS (WINAPI *pNtClose)( HANDLE ); static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const OBJECT_ATTRIBUTES *, EVENT_TYPE, BOOLEAN); static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG ); @@ -43,6 +44,7 @@ static NTSTATUS (WINAPI *pNtReleaseMutant)( HANDLE, LONG * ); static NTSTATUS (WINAPI *pNtReleaseSemaphore)( HANDLE, ULONG, ULONG * ); static NTSTATUS (WINAPI *pNtResetEvent)( HANDLE, LONG * ); static NTSTATUS (WINAPI *pNtSetEvent)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtWaitForAlertByThreadId)( void *, const LARGE_INTEGER * ); static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); static BOOLEAN (WINAPI *pRtlAcquireResourceExclusive)( RTL_RWLOCK *, BOOLEAN ); static BOOLEAN (WINAPI *pRtlAcquireResourceShared)( RTL_RWLOCK *, BOOLEAN ); @@ -754,10 +756,98 @@ static void test_resource(void) pRtlDeleteResource(&resource); } +static DWORD WINAPI tid_alert_thread( void *arg ) +{ + NTSTATUS ret; + + ret = pNtAlertThreadByThreadId( arg ); + ok(!ret, "got %#x\n", ret); + + ret = pNtWaitForAlertByThreadId( (void *)0x123, NULL ); + ok(ret == STATUS_ALERTED, "got %#x\n", ret); + + return 0; +} + +static void test_tid_alert( char **argv ) +{ + LARGE_INTEGER timeout = {{0}}; + char cmdline[MAX_PATH]; + STARTUPINFOA si = {0}; + PROCESS_INFORMATION pi; + HANDLE thread; + NTSTATUS ret; + DWORD tid; + + if (!pNtWaitForAlertByThreadId) + { + win_skip("NtWaitForAlertByThreadId is not available\n"); + return; + } + + ret = pNtWaitForAlertByThreadId( (void *)0x123, &timeout ); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + ret = pNtAlertThreadByThreadId( 0 ); + ok(ret == STATUS_INVALID_CID, "got %#x\n", ret); + + ret = pNtAlertThreadByThreadId( (HANDLE)0xdeadbeef ); + ok(ret == STATUS_INVALID_CID, "got %#x\n", ret); + + ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)GetCurrentThreadId() ); + ok(!ret, "got %#x\n", ret); + + ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)GetCurrentThreadId() ); + ok(!ret, "got %#x\n", ret); + + ret = pNtWaitForAlertByThreadId( (void *)0x123, &timeout ); + ok(ret == STATUS_ALERTED, "got %#x\n", ret); + + ret = pNtWaitForAlertByThreadId( (void *)0x123, &timeout ); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + ret = pNtWaitForAlertByThreadId( (void *)0x321, &timeout ); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + thread = CreateThread( NULL, 0, tid_alert_thread, (HANDLE)(DWORD_PTR)GetCurrentThreadId(), 0, &tid ); + timeout.QuadPart = -1000 * 10000; + ret = pNtWaitForAlertByThreadId( (void *)0x123, &timeout ); + ok(ret == STATUS_ALERTED, "got %#x\n", ret); + + ret = WaitForSingleObject( thread, 100 ); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)tid ); + ok(!ret, "got %#x\n", ret); + + ret = WaitForSingleObject( thread, 1000 ); + ok(!ret, "got %d\n", ret); + + ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)tid ); + ok(!ret, "got %#x\n", ret); + + CloseHandle(thread); + + sprintf( cmdline, "%s %s subprocess", argv[0], argv[1] ); + ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ok(ret, "failed to create process, error %u\n", GetLastError()); + ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)pi.dwThreadId ); + todo_wine ok(ret == STATUS_ACCESS_DENIED, "got %#x\n", ret); + ok(!WaitForSingleObject( pi.hProcess, 1000 ), "wait failed\n"); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); +} + START_TEST(sync) { HMODULE module = GetModuleHandleA("ntdll.dll"); + char **argv; + int argc; + + argc = winetest_get_mainargs( &argv ); + + if (argc > 2) return; + pNtAlertThreadByThreadId = (void *)GetProcAddress(module, "NtAlertThreadByThreadId"); pNtClose = (void *)GetProcAddress(module, "NtClose"); pNtCreateEvent = (void *)GetProcAddress(module, "NtCreateEvent"); pNtCreateKeyedEvent = (void *)GetProcAddress(module, "NtCreateKeyedEvent"); @@ -775,6 +865,7 @@ START_TEST(sync) pNtReleaseSemaphore = (void *)GetProcAddress(module, "NtReleaseSemaphore"); pNtResetEvent = (void *)GetProcAddress(module, "NtResetEvent"); pNtSetEvent = (void *)GetProcAddress(module, "NtSetEvent"); + pNtWaitForAlertByThreadId = (void *)GetProcAddress(module, "NtWaitForAlertByThreadId"); pNtWaitForKeyedEvent = (void *)GetProcAddress(module, "NtWaitForKeyedEvent"); pRtlAcquireResourceExclusive = (void *)GetProcAddress(module, "RtlAcquireResourceExclusive"); pRtlAcquireResourceShared = (void *)GetProcAddress(module, "RtlAcquireResourceShared"); @@ -792,4 +883,5 @@ START_TEST(sync) test_semaphore(); test_keyed_events(); test_resource(); + test_tid_alert( argv ); }

1 0

Alexandre Julliard : wow64win: Add missing thunk for NtUserGetKeyboardLayout().
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: 4138ef14fa844e98a876de42c1ca1827b7bb658a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4138ef14fa844e98a876de42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 17:27:40 2021 +0100 wow64win: Add missing thunk for NtUserGetKeyboardLayout(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 9a267025527..2ffe10b733c 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -99,6 +99,7 @@ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ + SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardState ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1c667889252..da94ea02dc0 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -250,6 +250,13 @@ NTSTATUS WINAPI wow64_NtUserGetKeyState( UINT *args ) return NtUserGetKeyState( vkey ); } +NTSTATUS WINAPI wow64_NtUserGetKeyboardLayout( UINT *args ) +{ + DWORD tid = get_ulong( &args ); + + return HandleToUlong( NtUserGetKeyboardLayout( tid )); +} + NTSTATUS WINAPI wow64_NtUserGetKeyboardState( UINT *args ) { BYTE *state = get_ptr( &args );

1 0