Hans Leidekker : webservices: Add async support in WsWriteMessageEnd.

Alexandre Julliard julliard at winehq.org
Wed May 19 14:55:13 CDT 2021


Module: wine
Branch: master
Commit: bfefd0d2a309aa93c321dc60def164be5e2c4eca
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=bfefd0d2a309aa93c321dc60def164be5e2c4eca

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed May 19 09:32:13 2021 +0200

webservices: Add async support in WsWriteMessageEnd.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/webservices/channel.c | 53 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c
index 9957592f9f7..b920f972de3 100644
--- a/dlls/webservices/channel.c
+++ b/dlls/webservices/channel.c
@@ -2733,18 +2733,57 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W
     return hr;
 }
 
+static HRESULT write_message_end( struct channel *channel, WS_MESSAGE *msg )
+{
+    HRESULT hr;
+    if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message_bytes( channel, msg );
+    return hr;
+}
+
+struct write_message_end
+{
+    struct task      task;
+    struct channel  *channel;
+    WS_MESSAGE      *msg;
+    WS_ASYNC_CONTEXT ctx;
+};
+
+static void write_message_end_proc( struct task *task )
+{
+    struct write_message_end *w = (struct write_message_end *)task;
+    HRESULT hr;
+
+    hr = write_message_end( w->channel, w->msg );
+
+    TRACE( "calling %p(%08x)\n", w->ctx.callback, hr );
+    w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState );
+    TRACE( "%p returned\n", w->ctx.callback );
+}
+
+static HRESULT queue_write_message_end( struct channel *channel, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx )
+{
+    struct write_message_start *w;
+
+    if (!(w = heap_alloc( sizeof(*w) ))) return E_OUTOFMEMORY;
+    w->task.proc = write_message_end_proc;
+    w->channel   = channel;
+    w->msg       = msg;
+    w->ctx       = *ctx;
+    return queue_task( &channel->send_q, &w->task );
+}
+
 /**************************************************************************
  *          WsWriteMessageEnd		[webservices.@]
  */
-HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx,
-                                  WS_ERROR *error )
+HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error )
 {
     struct channel *channel = (struct channel *)handle;
+    WS_ASYNC_CONTEXT ctx_local;
+    struct async async;
     HRESULT hr;
 
     TRACE( "%p %p %p %p\n", handle, msg, ctx, error );
     if (error) FIXME( "ignoring error parameter\n" );
-    if (ctx) FIXME( "ignoring ctx parameter\n" );
 
     if (!channel || !msg) return E_INVALIDARG;
 
@@ -2761,7 +2800,13 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_
         return WS_E_INVALID_OPERATION;
     }
 
-    if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message_bytes( channel, msg );
+    if (!ctx) async_init( &async, &ctx_local );
+    hr = queue_write_message_end( channel, msg, ctx ? ctx : &ctx_local );
+    if (!ctx)
+    {
+        if (hr == WS_S_ASYNC) hr = async_wait( &async );
+        CloseHandle( async.done );
+    }
 
     LeaveCriticalSection( &channel->cs );
     TRACE( "returning %08x\n", hr );




More information about the wine-cvs mailing list