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

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: a1548b45d8c3d19fad5632f997da65e5deb4ce0d
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=a1548b45d8c3d19fad5632f997da65e5deb4ce0d

Author: Robert Shearman <rob at codeweavers.com>
Date:   Wed Mar 29 18:39:03 2006 +0100

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.

---

 dlls/ole32/compobj.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 32d7a73..9ab9478 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2643,6 +2643,11 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pPr
 }
 
 
+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(
             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);