Robert Shearman : ole32: Whether the message loop is entered in CoWaitForMultipleHandles,

[Alexandre Julliard]

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

Author: Robert Shearman <rob(a)codeweavers.com>
Date:   Wed Mar 29 18:38:42 2006 +0100

ole32: Whether the message loop is entered in CoWaitForMultipleHandles,
should depend on whether the current apartment is a single threaded one.

---

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

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 2528b61..32d7a73 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2673,7 +2673,8 @@ HRESULT WINAPI CoWaitForMultipleHandles(
 {
     HRESULT hr = S_OK;
     DWORD start_time = GetTickCount();
-    BOOL message_loop = TRUE;
+    APARTMENT *apt = COM_CurrentApt();
+    BOOL message_loop = apt && !apt->multi_threaded;
 
     TRACE("(0x%08lx, 0x%08lx, %ld, %p, %p)\n", dwFlags, dwTimeout, cHandles,
         pHandles, lpdwindex);