Fixed some deadlock(s) in message sending.

8c38f45a · Eric Pouech · Alexandre Julliard · b068320a · 8c38f45a
Commit 8c38f45a authored May 03, 1999 by Eric Pouech Committed by Alexandre Julliard May 03, 1999
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 3 deletions

queue.c windows/queue.c +14 -3

No files found.
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -701,8 +701,19 @@ int QUEUE_WaitBits( WORD bits, DWORD timeout )

        if ( !THREAD_IsWin16( THREAD_Current() ) )
        {
-            /* win32 thread, use WaitForMultipleObjects */
-            MsgWaitForMultipleObjects( 0, NULL, FALSE, timeout, queue->wakeMask );
+	    BOOL		bHasWin16Lock;
+	    DWORD		dwlc;
+
+	    if ( (bHasWin16Lock = _ConfirmWin16Lock()) )
+	    {
+	        TRACE_(msg)("bHasWin16Lock=TRUE\n");
+	        ReleaseThunkLock( &dwlc );
+	    }
+	    WaitForSingleObject( queue->hEvent, timeout );
+	    if ( bHasWin16Lock ) 
+	    {
+	        RestoreThunkLock( dwlc );
+	    }
        }
        else
        {
@@ -720,7 +731,7 @@ int QUEUE_WaitBits( WORD bits, DWORD timeout )
                Yield16();
            }
 	}
-}
+    }
 }