Maarten Lankhorst : ole32: Handle alertable wait in CoWaitForMultipleHandles.
Alexandre Julliard
julliard at winehq.org
Thu Apr 7 07:36:48 CDT 2011
Module: wine
Branch: stable
Commit: 05ddd428e499a2d7fcedfa27cd48272a6ec2eb5e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ddd428e499a2d7fcedfa27cd48272a6ec2eb5e
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date: Fri Jan 21 14:17:22 2011 +0100
ole32: Handle alertable wait in CoWaitForMultipleHandles.
(cherry picked from commit 75801f095db38c5c1dfecbd8d70ad14994484b56)
---
dlls/ole32/compobj.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 937f3d8..40726d1 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -3655,6 +3655,11 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
hr = RPC_S_CALLPENDING;
break;
}
+ else if (res == WAIT_IO_COMPLETION)
+ {
+ *lpdwindex = WAIT_IO_COMPLETION;
+ break;
+ }
else
{
ERR("Unexpected wait termination: %d, %d\n", res, GetLastError());
More information about the wine-cvs
mailing list