Sebastian Lackner : ntdll: Throw STATUS_RESOURCE_NOT_OWNED when it' s impossible to acquire/release the SRWLock.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8ca96a9de0686431294030a7607de916d8ace9f4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8ca96a9de0686431294030a760...

Author: Sebastian Lackner <sebastian(a)fds-team.de>
Date:   Tue Jan 21 22:04:20 2014 +0100

ntdll: Throw STATUS_RESOURCE_NOT_OWNED when it's impossible to acquire/release the SRWLock.

---

 dlls/ntdll/sync.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 9e0395d..7d18d20 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -1435,6 +1435,14 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu
 #define srwlock_key_shared(lock)      (&lock->Ptr)
 #endif
 
+static inline void srwlock_check_invalid( unsigned int val )
+{
+    /* Throw exception if it's impossible to acquire/release this lock. */
+    if ((val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) == SRWLOCK_MASK_EXCLUSIVE_QUEUE ||
+            (val & SRWLOCK_MASK_SHARED_QUEUE) == SRWLOCK_MASK_SHARED_QUEUE)
+        RtlRaiseStatus(STATUS_RESOURCE_NOT_OWNED);
+}
+
 static inline unsigned int srwlock_lock_exclusive( unsigned int *dest, int incr )
 {
     unsigned int val, tmp;
@@ -1445,6 +1453,7 @@ static inline unsigned int srwlock_lock_exclusive( unsigned int *dest, int incr
     for (val = *dest;; val = tmp)
     {
         tmp = val + incr;
+        srwlock_check_invalid( tmp );
         if ((tmp & SRWLOCK_MASK_EXCLUSIVE_QUEUE) && !(tmp & SRWLOCK_MASK_SHARED_QUEUE))
             tmp |= SRWLOCK_MASK_IN_EXCLUSIVE;
         if ((tmp = interlocked_cmpxchg( (int *)dest, tmp, val )) == val)
@@ -1463,6 +1472,7 @@ static inline unsigned int srwlock_unlock_exclusive( unsigned int *dest, int inc
     for (val = *dest;; val = tmp)
     {
         tmp = val + incr;
+        srwlock_check_invalid( tmp );
         if (!(tmp & SRWLOCK_MASK_EXCLUSIVE_QUEUE))
             tmp &= SRWLOCK_MASK_SHARED_QUEUE;
         if ((tmp = interlocked_cmpxchg( (int *)dest, tmp, val )) == val)