ntdll: Reimplement condition variables on top of RtlWaitOnAddress().

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46208Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Reimplement condition variables on top of RtlWaitOnAddress().
954ed395 · Zebediah Figura · Alexandre Julliard · 9bbe5c36 · 954ed395
Commit 954ed395 authored Feb 07, 2019 by Zebediah Figura Committed by Alexandre Julliard Feb 08, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 19 deletions

sync.c dlls/ntdll/sync.c +10 -19

No files found.
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -1909,8 +1909,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable )
 */
 void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable )
 {
-    if (interlocked_dec_if_nonzero( (int *)&variable->Ptr ))
+    interlocked_xchg_add( (int *)&variable->Ptr, 1 );
-        NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL );
+    RtlWakeAddressSingle( variable );
 }
 /***********************************************************************
@@ -1920,9 +1920,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable )
 */
 void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable )
 {
-    int val = interlocked_xchg( (int *)&variable->Ptr, 0 );
+    interlocked_xchg_add( (int *)&variable->Ptr, 1 );
-    while (val-- > 0)
+    RtlWakeAddressAll( variable );
-        NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL );
 }
 /***********************************************************************
@@ -1944,17 +1943,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R
                                             const LARGE_INTEGER *timeout )
 {
    NTSTATUS status;
-    interlocked_xchg_add( (int *)&variable->Ptr, 1 );
+    int val = *(int *)&variable->Ptr;
    RtlLeaveCriticalSection( crit );
-    status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout );
+    status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout );
-    if (status != STATUS_SUCCESS)
-    {
-        if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr ))
-            status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL );
-    }
    RtlEnterCriticalSection( crit );
    return status;
 }
@@ -1981,19 +1977,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, 
                                              const LARGE_INTEGER *timeout, ULONG flags )
 {
    NTSTATUS status;
-    interlocked_xchg_add( (int *)&variable->Ptr, 1 );
+    int val = *(int *)&variable->Ptr;
    if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED)
        RtlReleaseSRWLockShared( lock );
    else
        RtlReleaseSRWLockExclusive( lock );
-    status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout );
+    status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout );
-    if (status != STATUS_SUCCESS)
-    {
-        if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr ))
-            status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL );
-    }
    if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED)
        RtlAcquireSRWLockShared( lock );