Jacek Caban : server: Allow async_handoff users to set result themselves.
Alexandre Julliard
julliard at winehq.org
Wed Jun 28 15:10:25 CDT 2017
Module: wine
Branch: master
Commit: 74364ed0172ad91f0516cc95a4a5c1062a561e21
URL: http://source.winehq.org/git/wine.git/?a=commit;h=74364ed0172ad91f0516cc95a4a5c1062a561e21
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Jun 26 12:19:40 2017 +0200
server: Allow async_handoff users to set result themselves.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/async.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/server/async.c b/server/async.c
index 409c9b5..3a83a63 100644
--- a/server/async.c
+++ b/server/async.c
@@ -338,13 +338,23 @@ obj_handle_t async_handoff( struct async *async, int success, data_size_t *resul
return 0;
}
- if (async->iosb->status != STATUS_PENDING)
+ if (get_error() != STATUS_PENDING)
+ {
+ /* status and data are already set and returned */
+ async_terminate( async, get_error() );
+ }
+ else if (async->iosb->status != STATUS_PENDING)
{
+ /* result is already available in iosb, return it */
if (async->iosb->out_data)
{
set_reply_data_ptr( async->iosb->out_data, async->iosb->out_size );
async->iosb->out_data = NULL;
}
+ }
+
+ if (async->iosb->status != STATUS_PENDING)
+ {
if (result) *result = async->iosb->result;
async->signaled = 1;
}
More information about the wine-cvs
mailing list