commit dbf2bf00bc6603b04b899c219d0247c3647c5aa4
author Alexandre Julliard <julliard@winehq.org> Fri Jan 01 17:05:53 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jan 01 17:05:53 1999 +0000
tree be60cb47b1ffa24ff7969a7b9e2483d1215d02a1
parent 502055ffc179a143b952947a16611dbf2d4557a2

Moved MsgWaitForMultipleObject implementation to USER routines, using
a normal Win32 event.

windows/message.c

diff --git a/windows/message.c b/windows/message.c
index 300ae1b..84e9151 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -11,6 +11,7 @@
 #include <sys/types.h>
 
 #include "message.h"
+#include "winerror.h"
 #include "win.h"
 #include "gdi.h"
 #include "sysmetrics.h"
@@ -1475,19 +1476,27 @@
                                         BOOL32 fWaitAll, DWORD dwMilliseconds,
                                         DWORD dwWakeMask )
 {
-    DWORD retv;
+    DWORD i;
+    HANDLE32 handles[MAXIMUM_WAIT_OBJECTS];
 
     TDB *currTask = (TDB *)GlobalLock16( GetCurrentTask() );
     HQUEUE16 hQueue = currTask? currTask->hQueue : 0;
     MESSAGEQUEUE *msgQueue = (MESSAGEQUEUE *)GlobalLock16( hQueue );
-    if (!msgQueue) return 0xFFFFFFFF;
+    if (!msgQueue) return WAIT_FAILED;
+
+    if (nCount > MAXIMUM_WAIT_OBJECTS-1)
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return WAIT_FAILED;
+    }
 
     msgQueue->changeBits = 0;
     msgQueue->wakeMask = dwWakeMask;
 
-    retv = SYNC_DoWait( nCount, pHandles, fWaitAll, dwMilliseconds, FALSE, TRUE );
-
-    return retv;
+    /* Add the thread event to the handle list */
+    for (i = 0; i < nCount; i++) handles[i] = pHandles[i];
+    handles[nCount] = currTask->thdb->event;
+    return WaitForMultipleObjects( nCount+1, handles, fWaitAll, dwMilliseconds );
 }