Set the owner to 0 while releasing a recursive mutex

I (and dionoea too, I think) encountered an "assertion failed self ==
0" when trying to play a file on win32. I think the following patch
solves this issue. If I understand correcly, the intended behaviour
was to zero the owner field of the mutex when releasing it.

Modified by Courmisch to use InterlockedExchange() directly.

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

diff --git a/src/misc/threads.c b/src/misc/threads.c
index e12bef20119e00d79ccf596352c9c0e00bd52e61..e4eeaf84e70937ef70f38a71cdeefa9a2cba5f2a 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -352,7 +352,7 @@ void vlc_mutex_lock (vlc_mutex_t *p_mutex)
 
         /* We need to lock this recursive mutex */
         EnterCriticalSection (&p_mutex->mutex);
-        self = InterlockedCompareExchange (&p_mutex->owner, self, 0);
+        self = InterlockedExchange (&p_mutex->owner, self);
         assert (self == 0); /* no previous owner */
         return;
     }
@@ -383,9 +383,8 @@ void vlc_mutex_unlock (vlc_mutex_t *p_mutex)
         }
 
         /* We release the mutex */
-        DWORD self = GetCurrentThreadId ();
-        self = InterlockedCompareExchange (&p_mutex->owner, self, 0);
-        assert (self == GetCurrentThreadId ());
+        DWORD self = InterlockedExchange (&p_mutex->owner, 0);
+        assert (self == 0);
         /* fall through */
     }
     LeaveCriticalSection (&p_mutex->mutex);