Changeset 8960 for trunk/src

Timestamp:

Aug 5, 2002, 11:45:49 AM (23 years ago)

Author:

sandervl

Message:

MsgWaitForMultipleObjects changes; check objects before message queue status

File:

• trunk/src/user32/windowmsg.cpp (modified) (4 diffs)

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.37 2002-08-01 16:10:51 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.38 2002-08-05 09:45:49 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -884 +884 @@
     }
     if(dwMilliseconds == 0) { //case 2
-        //TODO: what has a higher priority; message presence or signalled object?
+        if(nCount) {
+            ret = WaitForMultipleObjects(nCount, pHandles, fWaitAll, dwMilliseconds);
+            if(ret < WAIT_OBJECT_0 + nCount) {
+                return ret;
+            }
+        }
         if(GetQueueStatus(dwWakeMask) == 0) {
-            if(nCount) {
-                return WaitForMultipleObjects(nCount, pHandles, fWaitAll, dwMilliseconds);
-            }
             return WAIT_TIMEOUT;
         }
@@ -934 +936 @@
        return WAIT_ABANDONED;
     }
+    //check if any object is already signalled
+    ret = WaitForMultipleObjects(nCount, pHandles, fWaitAll, 0);
+    if(ret < WAIT_OBJECT_0 + nCount) {
+        return ret;
+    }
     //if the msg queue already contains the messages defined by dwWakeMask,
     //then return immediately
@@ -947 +954 @@
         memcpy(pHandlesTmp, pHandles, nCount*sizeof(HANDLE));
         pHandlesTmp[nCount] = teb->o.odin.hPostMsgEvent;
+
+        //mark this thread as waiting for window messages
         teb->o.odin.dwWakeMask = dwWakeMask;
 
         ResetEvent(teb->o.odin.hPostMsgEvent);
         ret = HMMsgWaitForMultipleObjects(nCount+1,pHandlesTmp,fWaitAll,dwMilliseconds,dwWakeMask);
+
+        //unmark thread
+        teb->o.odin.dwWakeMask = 0;
+
         //nCount + 2 -> message event -> return nCount + 1
-        teb->o.odin.dwWakeMask = 0;
         return (ret == nCount + 2) ? (nCount + 1) : ret;
     }