ole32: Don't loop while peeking messages in CoWaitForMultipleHandles.

It increases the latency on completing the COM call and could result in the COM call never completing in some circumstances.

ole32: Don't loop while peeking messages in CoWaitForMultipleHandles.
11c1bcf6 · Robert Shearman · Alexandre Julliard · f9c9a2bf · 11c1bcf6
Commit 11c1bcf6 authored Jul 13, 2006 by Robert Shearman Committed by Alexandre Julliard Jul 13, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

compobj.c dlls/ole32/compobj.c +6 -2

No files found.
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2875,7 +2875,12 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
            if (res == WAIT_OBJECT_0 + cHandles)  /* messages available */
            {
                MSG msg;
-                while (COM_PeekMessage(apt, &msg))
+
+                /* note: using "if" here instead of "while" might seem less
+                 * efficient, but only if we are optimising for quick delivery
+                 * of pending messages, rather than quick completion of the
+                 * COM call */
+                if (COM_PeekMessage(apt, &msg))
                {
                    /* FIXME: filter the messages here */
                    TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message);
@@ -2887,7 +2892,6 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
                        PostQuitMessage(msg.wParam);
                        /* no longer need to process messages */
                        message_loop = FALSE;
-                        break;
                    }
                }
                continue;