ole32: Put the PeekMessage call of CoWaitForMultipleHandles into a separate function.

Put the PeekMessage call of CoWaitForMultipleHandles into a separate function so that the order and type of the messages retrieved can be customised in the future.

ole32: Put the PeekMessage call of CoWaitForMultipleHandles into a separate function.
a1548b45 · Robert Shearman · Alexandre Julliard · 8c551796 · a1548b45
Commit a1548b45 authored Mar 29, 2006 by Robert Shearman Committed by Alexandre Julliard Mar 30, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

No files found.
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2643,6 +2643,11 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pProxy, IUnknown **ppCopy)
 }


+static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg)
+{
+    return PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD);
+}
+
 /***********************************************************************
 *           CoWaitForMultipleHandles [OLE32.@]
 *
@@ -2704,7 +2709,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
            if (res == WAIT_OBJECT_0 + cHandles)  /* messages available */
            {
                MSG msg;
-                while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD))
+                while (COM_PeekMessage(apt, &msg))
                {
                    /* FIXME: filter the messages here */
                    TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message);