[PATCH v24 4/4] ntdll: wake up SRWLOCK waiters by thread id

[Yuxuan Shui]

From: Yuxuan Shui

---
 dlls/ntdll/sync.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 17ad51ef7dd..4409b35cd5e 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -673,9 +673,10 @@ retry:
         /* waking up the waiter will invalidate the waiter's entry in
          * the list. */
         struct srwlock_waiter *next = head->next;
+        ULONG_PTR thread_id = head->thread_id;
         InterlockedOr((LONG *)&head->state, waiter_state);
         TRACE("waking %p\n", head);
-        RtlWakeAddressSingle(&head->state);
+        NtAlertThreadByThreadId((HANDLE)thread_id);
         head = next;
     }
 }
@@ -705,6 +706,7 @@ static BOOLEAN srwlock_wait(RTL_SRWLOCK *lock, DWORD waiter_state,
         return FALSE;
     }

+    waiter.thread_id = GetCurrentThreadId();
     waiter.state = waiter_state;
     if (tag & SRWLOCK_TAG_HAS_WAITERS)
     {
@@ -762,7 +764,7 @@ static BOOLEAN srwlock_wait(RTL_SRWLOCK *lock, DWORD waiter_state,
         waiter_state = ReadAcquire((LONG *)&waiter.state);
         if (waiter_state & SRWLOCK_WAITER_STATE_NOTIFIED)
             break;
-        RtlWaitOnAddress(&waiter.state, &waiter_state, sizeof(DWORD), NULL);
+        NtWaitForAlertByThreadId(NULL, NULL);
     };

TRACE("woken: %p %#lx\n", lock, waiter_state);