Changeset 31942 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 24, 2010 9:53:00 PM (14 years ago)

Author:

vboxsync

Message:

Runtime/poll: Fix retrieving events after WaitForMultipleObjects

File:

• trunk/src/VBox/Runtime/r3/win/poll-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/poll-win.cpp

@@ -209 +209 @@
      * Get event (if pending) and do wait cleanup.
      */
+    /** @todo r=aeichner: The loop below overwrites events if
+     *  more than one source has events pending.
+     */
     i = cHandles;
     while (i-- > 0)
@@ -216 +219 @@
         {
             case RTHANDLETYPE_PIPE:
-                rtPipePollDone(pThis->aHandles[i].u.hPipe, pThis->aHandles[i].fEvents,
-                               pThis->aHandles[i].fFinalEntry);
+                fEvents = rtPipePollDone(pThis->aHandles[i].u.hPipe, pThis->aHandles[i].fEvents,
+                                         pThis->aHandles[i].fFinalEntry);
                 break;
 
             case RTHANDLETYPE_SOCKET:
-                rtSocketPollDone(pThis->aHandles[i].u.hSocket, pThis->aHandles[i].fEvents,
-                                 pThis->aHandles[i].fFinalEntry);
+                fEvents = rtSocketPollDone(pThis->aHandles[i].u.hSocket, pThis->aHandles[i].fEvents,
+                                           pThis->aHandles[i].fFinalEntry);
                 break;