December 2019 - Wine-devel - list.winehq.org

[PATCH v2 1/3] ntdll: Handle unaligned condition variables when using futexes.
by Zebediah Figura 31 Dec '19

31 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48389 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/sync.c | 76 ++++++++++++++++----------- dlls/ntdll/sync.c | 105 ++++++++++++++++++++++++++++++------- 2 files changed, 132 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40cad1c4c5..477a35287d 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1718,10 +1718,18 @@ static void test_condvars_consumer_producer(void) /* Sample test for some sequence of events happening, sequenced using "condvar_seq" */ static DWORD condvar_seq = 0; -static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; +static CONDITION_VARIABLE aligned_cv; static CRITICAL_SECTION condvar_crit; static SRWLOCK condvar_srwlock; +#include "pshpack1.h" +static struct +{ + char c; + CONDITION_VARIABLE cv; +} unaligned_cv; +#include "poppack.h" + /* Sequence of wake/sleep to check boundary conditions: * 0: init * 1: producer emits a WakeConditionVariable without consumer waiting. @@ -1741,28 +1749,31 @@ static SRWLOCK condvar_srwlock; * 12: producer (shared) wakes up consumer (shared) * 13: end */ -static DWORD WINAPI condvar_base_producer(LPVOID x) { +static DWORD WINAPI condvar_base_producer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; + while (condvar_seq < 1) Sleep(1); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); condvar_seq = 2; while (condvar_seq < 3) Sleep(1); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); condvar_seq = 4; while (condvar_seq < 5) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 6) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 8) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); Sleep(50); LeaveCriticalSection (&condvar_crit); @@ -1772,36 +1783,38 @@ static DWORD WINAPI condvar_base_producer(LPVOID x) { while (condvar_seq < 9) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 10) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 11) Sleep(1); pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); while (condvar_seq < 12) Sleep(1); Sleep(50); /* ensure that consumer waits for cond variable */ pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); return 0; } -static DWORD WINAPI condvar_base_consumer(LPVOID x) { +static DWORD WINAPI condvar_base_consumer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; BOOL ret; while (condvar_seq < 2) Sleep(1); /* wake was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); @@ -1811,33 +1824,33 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { /* wake all was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 5; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wake\n"); EnterCriticalSection (&condvar_crit); condvar_seq = 6; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wakeall\n"); condvar_seq = 7; EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 8; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 20); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); @@ -1851,25 +1864,25 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 9; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 10; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 11; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 12; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); @@ -1877,12 +1890,12 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { return 0; } -static void test_condvars_base(void) { +static void test_condvars_base(RTL_CONDITION_VARIABLE *cv) +{ HANDLE hp, hc; DWORD dummy; BOOL ret; - if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ win_skip("no condition variable support.\n"); @@ -1895,7 +1908,7 @@ static void test_condvars_base(void) { pInitializeSRWLock(&condvar_srwlock); EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); @@ -1904,23 +1917,23 @@ static void test_condvars_base(void) { if (pInitializeSRWLock) { pAcquireSRWLockExclusive(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); pAcquireSRWLockShared(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); } - - hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); - hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); + condvar_seq = 0; + hp = CreateThread(NULL, 0, condvar_base_producer, cv, 0, &dummy); + hc = CreateThread(NULL, 0, condvar_base_consumer, cv, 0, &dummy); condvar_seq = 1; /* go */ @@ -2728,7 +2741,8 @@ START_TEST(sync) test_WaitForSingleObject(); test_WaitForMultipleObjects(); test_initonce(); - test_condvars_base(); + test_condvars_base(&aligned_cv); + test_condvars_base(&unaligned_cv.cv); test_condvars_consumer_producer(); test_srwlock_base(); test_srwlock_example(); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0dc6fc3390..302b4cc7e0 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -115,6 +115,16 @@ static inline int use_futexes(void) return supported; } +static int *get_futex(void **ptr) +{ + if (sizeof(void *) == 8) + return (int *)((((ULONG_PTR)ptr) + 3) & ~3); + else if (!(((ULONG_PTR)ptr) & 3)) + return (int *)ptr; + else + return NULL; +} + static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2179,32 +2189,83 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) } #ifdef __linux__ -static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +static NTSTATUS fast_wait_cv( int *futex, int val, const LARGE_INTEGER *timeout ) { struct timespec timespec; int ret; - if (!use_futexes()) - return STATUS_NOT_IMPLEMENTED; - if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) { timespec_from_timeout( &timespec, timeout ); - ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + ret = futex_wait( futex, val, &timespec ); } else - ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + ret = futex_wait( futex, val, NULL ); if (ret == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; return STATUS_WAIT_0; } +static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + RtlLeaveCriticalSection( cs ); + status = fast_wait_cv( futex, val, timeout ); + RtlEnterCriticalSection( cs ); + return status; +} + +static NTSTATUS fast_sleep_srw_cv( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = fast_wait_cv( futex, val, timeout ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + return status; +} + static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) { + int *futex; + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - futex_wake( (int *)&variable->Ptr, count ); + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + interlocked_xchg_add( futex, 1 ); + futex_wake( futex, count ); return STATUS_SUCCESS; } #else @@ -2252,9 +2313,11 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressSingle( variable ); + } } /*********************************************************************** @@ -2264,9 +2327,11 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressAll( variable ); + } } /*********************************************************************** @@ -2288,15 +2353,15 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; - - RtlLeaveCriticalSection( crit ); + int val; - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_sleep_cs_cv( variable, crit, timeout )) != STATUS_NOT_IMPLEMENTED) + return status; + val = *(int *)&variable->Ptr; + RtlLeaveCriticalSection( crit ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); - return status; } @@ -2323,15 +2388,19 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; + int val; + + if ((status = fast_sleep_srw_cv( variable, lock, timeout, flags )) != STATUS_NOT_IMPLEMENTED) + return status; + + val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); -- 2.24.1

1 2

[PATCH 1/2] ntdll: Handle unaligned condition variables when using futexes.
by Zebediah Figura 31 Dec '19

31 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48389 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/sync.c | 76 ++++++++++++++++----------- dlls/ntdll/sync.c | 105 ++++++++++++++++++++++++++++++------- 2 files changed, 132 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40cad1c4c5..477a35287d 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1718,10 +1718,18 @@ static void test_condvars_consumer_producer(void) /* Sample test for some sequence of events happening, sequenced using "condvar_seq" */ static DWORD condvar_seq = 0; -static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; +static CONDITION_VARIABLE aligned_cv; static CRITICAL_SECTION condvar_crit; static SRWLOCK condvar_srwlock; +#include "pshpack1.h" +static struct +{ + char c; + CONDITION_VARIABLE cv; +} unaligned_cv; +#include "poppack.h" + /* Sequence of wake/sleep to check boundary conditions: * 0: init * 1: producer emits a WakeConditionVariable without consumer waiting. @@ -1741,28 +1749,31 @@ static SRWLOCK condvar_srwlock; * 12: producer (shared) wakes up consumer (shared) * 13: end */ -static DWORD WINAPI condvar_base_producer(LPVOID x) { +static DWORD WINAPI condvar_base_producer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; + while (condvar_seq < 1) Sleep(1); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); condvar_seq = 2; while (condvar_seq < 3) Sleep(1); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); condvar_seq = 4; while (condvar_seq < 5) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 6) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 8) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); Sleep(50); LeaveCriticalSection (&condvar_crit); @@ -1772,36 +1783,38 @@ static DWORD WINAPI condvar_base_producer(LPVOID x) { while (condvar_seq < 9) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 10) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 11) Sleep(1); pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); while (condvar_seq < 12) Sleep(1); Sleep(50); /* ensure that consumer waits for cond variable */ pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); return 0; } -static DWORD WINAPI condvar_base_consumer(LPVOID x) { +static DWORD WINAPI condvar_base_consumer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; BOOL ret; while (condvar_seq < 2) Sleep(1); /* wake was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); @@ -1811,33 +1824,33 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { /* wake all was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 5; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wake\n"); EnterCriticalSection (&condvar_crit); condvar_seq = 6; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wakeall\n"); condvar_seq = 7; EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 8; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 20); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); @@ -1851,25 +1864,25 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 9; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 10; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 11; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 12; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); @@ -1877,12 +1890,12 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { return 0; } -static void test_condvars_base(void) { +static void test_condvars_base(RTL_CONDITION_VARIABLE *cv) +{ HANDLE hp, hc; DWORD dummy; BOOL ret; - if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ win_skip("no condition variable support.\n"); @@ -1895,7 +1908,7 @@ static void test_condvars_base(void) { pInitializeSRWLock(&condvar_srwlock); EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); @@ -1904,23 +1917,23 @@ static void test_condvars_base(void) { if (pInitializeSRWLock) { pAcquireSRWLockExclusive(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); pAcquireSRWLockShared(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); } - - hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); - hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); + condvar_seq = 0; + hp = CreateThread(NULL, 0, condvar_base_producer, cv, 0, &dummy); + hc = CreateThread(NULL, 0, condvar_base_consumer, cv, 0, &dummy); condvar_seq = 1; /* go */ @@ -2728,7 +2741,8 @@ START_TEST(sync) test_WaitForSingleObject(); test_WaitForMultipleObjects(); test_initonce(); - test_condvars_base(); + test_condvars_base(&aligned_cv); + test_condvars_base(&unaligned_cv.cv); test_condvars_consumer_producer(); test_srwlock_base(); test_srwlock_example(); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0dc6fc3390..302b4cc7e0 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -115,6 +115,16 @@ static inline int use_futexes(void) return supported; } +static int *get_futex(void **ptr) +{ + if (sizeof(void *) == 8) + return (int *)((((ULONG_PTR)ptr) + 3) & ~3); + else if (!(((ULONG_PTR)ptr) & 3)) + return (int *)ptr; + else + return NULL; +} + static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2179,32 +2189,83 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) } #ifdef __linux__ -static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +static NTSTATUS fast_wait_cv( int *futex, int val, const LARGE_INTEGER *timeout ) { struct timespec timespec; int ret; - if (!use_futexes()) - return STATUS_NOT_IMPLEMENTED; - if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) { timespec_from_timeout( &timespec, timeout ); - ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + ret = futex_wait( futex, val, &timespec ); } else - ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + ret = futex_wait( futex, val, NULL ); if (ret == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; return STATUS_WAIT_0; } +static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + RtlLeaveCriticalSection( cs ); + status = fast_wait_cv( futex, val, timeout ); + RtlEnterCriticalSection( cs ); + return status; +} + +static NTSTATUS fast_sleep_srw_cv( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = fast_wait_cv( futex, val, timeout ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + return status; +} + static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) { + int *futex; + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - futex_wake( (int *)&variable->Ptr, count ); + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + interlocked_xchg_add( futex, 1 ); + futex_wake( futex, count ); return STATUS_SUCCESS; } #else @@ -2252,9 +2313,11 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressSingle( variable ); + } } /*********************************************************************** @@ -2264,9 +2327,11 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressAll( variable ); + } } /*********************************************************************** @@ -2288,15 +2353,15 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; - - RtlLeaveCriticalSection( crit ); + int val; - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_sleep_cs_cv( variable, crit, timeout )) != STATUS_NOT_IMPLEMENTED) + return status; + val = *(int *)&variable->Ptr; + RtlLeaveCriticalSection( crit ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); - return status; } @@ -2323,15 +2388,19 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; + int val; + + if ((status = fast_sleep_srw_cv( variable, lock, timeout, flags )) != STATUS_NOT_IMPLEMENTED) + return status; + + val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); -- 2.24.1

2 2

[PATCH] msvcp140/tests: Don't trace the current time.
by Francois Gouget 30 Dec '19

30 Dec '19

This causes the failure to always look new and the last_write_time value does not really seem useful. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This also only fails on my box, but it does not change the fact that a failure will always look new. dlls/msvcp140/tests/msvcp140.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 751b1beed86..35a650ddbae 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1239,8 +1239,7 @@ static void test_Last_write_time(void) newtime = last_write_time + 222222; p_Set_last_write_time(f1W, newtime); ok(last_write_time != p_Last_write_time(f1W), - "last_write_time should have changed: %s\n", - wine_dbgstr_longlong(last_write_time)); + "last_write_time should have changed\n"); /* test the formula */ file = CreateFileW(f1W, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, -- 2.20.1

2 2

[PATCH] user32/tests: Don't trace the test_topmost() window handles.
by Francois Gouget 30 Dec '19

30 Dec '19

They change from one run to the next, causing the failures to always look new. Also for the topmost failures the window handle is irrelevant: all that matters is which window got the wrong results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See the Windows XP failures: https://test.winehq.org/data/fa97cbdf14883fb301dcc0a5264369f8ed184182/xp_fg… For instance: win.c:10896: Test failed: hwnd 02B4007C topmost state is wrong win.c:10899: Test failed: 02B4007C: expected NOT topmost win.c:11126: Test failed: hwnd 00180266 topmost state is wrong dlls/user32/tests/win.c | 278 ++++++++++++++++++++-------------------- 1 file changed, 139 insertions(+), 139 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index bb4eebfd0fa..46784cec43f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10809,99 +10809,99 @@ static void test_topmost(void) state[1] = hwnd; state[2] = hwnd2; - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, 0, hwnd2, owner, FALSE); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd2, hwnd); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, hwnd2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd2, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(owner, HWND_TOPMOST); todo_wine - ok(is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(owner), "owner should be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(is_topmost(hwnd2), "hwnd2 should be topmost\n"); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd2 should NOT be topmost\n"); if (0) /*win7 64-bit is broken*/ check_z_order(hwnd, hwnd2, 0, owner, FALSE); swp_after(hwnd2, HWND_NOTOPMOST); - ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_BOTTOM); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, hwnd2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); /* FIXME: compensate todo_wine above */ swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); @@ -10921,161 +10921,161 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ state[4] = hwnd_child; state[5] = hwnd_grandchild; - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_grandchild, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_grandchild, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); swp_after(hwnd_child2, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ @@ -11083,23 +11083,23 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_BOTTOM); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ @@ -11107,23 +11107,23 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, hwnd_child2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ -- 2.20.1

2 1

[PATCH] msvcrt: Improve strtod precision.
by Piotr Caban 30 Dec '19

30 Dec '19

This patch fixes strtod precision regression. It also removes floating points operations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 157 ++++++++++++++++++++++++----------- dlls/ucrtbase/tests/string.c | 20 +++-- 3 files changed, 123 insertions(+), 55 deletions(-)

1 0

[PATCH] msvcrt: Improve strtod precision.
by Piotr Caban 30 Dec '19

30 Dec '19

This patch fixes strtod precision regression. It also removes floating points operations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 157 ++++++++++++++++++++++++----------- dlls/ucrtbase/tests/string.c | 20 +++-- 3 files changed, 123 insertions(+), 55 deletions(-)

1 0

[PATCH] testbot/LobUtils: Update the ParseTaskLog() Perl documentation.
by Francois Gouget 30 Dec '19

30 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ac0eae63e..9de11d1a5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -78,6 +78,10 @@ Returns a hashtable containing a summary of the task log: =item Task Either 'ok' if the task was successful or a code indicating why it failed. +=item TestLauncher.exe... +Entries named after the binaries and files of interest to the TestBot that +have been updated. + =item NoLog Contains an error message if the task log could not be read. -- 2.20.1

1 0

[PATCH] testbot/LogUtils: Ignore the pid when comparing exception messages.
by Francois Gouget 30 Dec '19

30 Dec '19

When the test framework detects and exception it includes the process id in the failure message to help diagnose if the failure happened in the main test process or one of its subprocesses. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c57742691..a3fa12b58 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -868,6 +868,8 @@ sub _GetLineKey($) # Remove the crash code address: it changes whenever the test is recompiled $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; + # and the process id + $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/; # The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; -- 2.20.1

1 0

[PATCH 1/2] testbot/LogUtils: Ignore the variable parts of failure messages.
by Francois Gouget 30 Dec '19

30 Dec '19

Some failure messages have to include elements that change with every run in order to allow diagnosing. But this makes the failure message look different with every run, thus breaking the detection of new failures. So such 'variable' parts can now be enclosed in double parentheses, for instance "((0x2d))", to let the TestBot know it should ignore this part when comparing failure messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48209 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I'm open to other ways to identify the variable parts. testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c57742691..0489f3e5b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -863,6 +863,10 @@ sub _GetLineKey($) my ($Line) = @_; return undef if (!defined $Line); + # Remove variable parts. + # Use a non-greedy match to ensure the ignored part does not contain '))'. + $Line =~ s/$\(.+?$\)/(())/g; + # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; -- 2.20.1

1 1

[PATCH] testbot/WineRun*: Trace the disconnection in all WineRun* scripts.
by Francois Gouget 30 Dec '19

30 Dec '19

It was already present in WineRunWineTest. There is no reason for it to be the exception. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 ++ testbot/bin/WineRunReconfig.pl | 1 + testbot/bin/WineRunTask.pl | 2 ++ 3 files changed, 5 insertions(+) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ccbba3bbf..f33b7bde6 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -491,6 +491,8 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) } } } + +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 985d9312e..9b0b479ee 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -507,6 +507,7 @@ if ($NewStatus eq "completed") } } +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index a324265eb..6a30de3d3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -582,6 +582,8 @@ elsif (!defined $TAError) { $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); } + +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); -- 2.20.1

1 0