May 2021 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Add async support in WsSendMessage.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 927273159169cb97a866099fc00055b099b833f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=927273159169cb97a866099f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 19 09:32:08 2021 +0200 webservices: Add async support in WsSendMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 85 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index bc65f0943bf..7e576544205 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1460,7 +1460,7 @@ static HRESULT open_http_request( struct channel *channel, HINTERNET *req ) return HRESULT_FROM_WIN32( GetLastError() ); } -static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) +static HRESULT send_message_bytes( struct channel *channel, WS_MESSAGE *msg ) { WS_XML_WRITER *writer; WS_BYTES buf; @@ -1529,7 +1529,7 @@ HRESULT channel_send_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) return WS_E_INVALID_OPERATION; } - hr = send_message( channel, msg ); + hr = send_message_bytes( channel, msg ); LeaveCriticalSection( &channel->cs ); return hr; @@ -1561,8 +1561,8 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo return hr; } -static CALLBACK HRESULT write_callback( void *state, const WS_BYTES *buf, ULONG count, - const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +static CALLBACK HRESULT write_callback( void *state, const WS_BYTES *buf, ULONG count, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) { SOCKET socket = *(SOCKET *)state; if (send( socket, (const char *)buf->bytes, buf->length, 0 ) < 0) @@ -1634,6 +1634,59 @@ static HRESULT write_message( struct channel *channel, WS_MESSAGE *msg, const WS return WsWriteEnvelopeEnd( msg, NULL ); } +static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg, const WS_MESSAGE_DESCRIPTION *desc, + WS_WRITE_OPTION option, const void *body, ULONG size ) +{ + HRESULT hr; + WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) return hr; + if ((hr = message_set_action( msg, desc->action )) != S_OK) return hr; + if ((hr = init_writer( channel )) != S_OK) return hr; + if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) return hr; + return send_message_bytes( channel, msg ); +} + +struct send_message +{ + struct task task; + struct channel *channel; + WS_MESSAGE *msg; + const WS_MESSAGE_DESCRIPTION *desc; + WS_WRITE_OPTION option; + const void *body; + ULONG size; + WS_ASYNC_CONTEXT ctx; +}; + +static void send_message_proc( struct task *task ) +{ + struct send_message *s = (struct send_message *)task; + HRESULT hr; + + hr = send_message( s->channel, s->msg, s->desc, s->option, s->body, s->size ); + + TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); + s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); + TRACE( "%p returned\n", s->ctx.callback ); +} + +static HRESULT queue_send_message( struct channel *channel, WS_MESSAGE *msg, const WS_MESSAGE_DESCRIPTION *desc, + WS_WRITE_OPTION option, const void *body, ULONG size, const WS_ASYNC_CONTEXT *ctx ) +{ + struct send_message *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return E_OUTOFMEMORY; + s->task.proc = send_message_proc; + s->channel = channel; + s->msg = msg; + s->desc = desc; + s->option = option; + s->body = body; + s->size = size; + s->ctx = *ctx; + return queue_task( &channel->send_q, &s->task ); +} + /************************************************************************** * WsSendMessage [webservices.@] */ @@ -1642,11 +1695,12 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %08x %p %u %p %p\n", handle, msg, desc, option, body, size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !msg || !desc) return E_INVALIDARG; @@ -1663,15 +1717,14 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS return WS_E_INVALID_OPERATION; } - if ((hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL )) != S_OK) goto done; - if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; - if ((hr = message_set_action( msg, desc->action )) != S_OK) goto done; - - if ((hr = init_writer( channel )) != S_OK) goto done; - if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; - hr = send_message( channel, msg ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_send_message( channel, msg, desc, option, body, size, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } -done: LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); return hr; @@ -1715,7 +1768,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS if ((hr = init_writer( channel )) != S_OK) goto done; if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; - hr = send_message( channel, msg ); + hr = send_message_bytes( channel, msg ); done: LeaveCriticalSection( &channel->cs ); @@ -2341,7 +2394,7 @@ static HRESULT request_reply( struct channel *channel, WS_MESSAGE *request, if ((hr = init_writer( channel )) != S_OK) return hr; if ((hr = write_message( channel, request, request_desc->bodyElementDescription, write_option, request_body, request_size )) != S_OK) return hr; - if ((hr = send_message( channel, request )) != S_OK) return hr; + if ((hr = send_message_bytes( channel, request )) != S_OK) return hr; return receive_message( channel, reply, &reply_desc, 1, WS_RECEIVE_OPTIONAL_MESSAGE, read_option, heap, value, size, NULL ); @@ -2585,7 +2638,7 @@ 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( channel, msg ); + if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message_bytes( channel, msg ); LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0

Hans Leidekker : webservices: Return WS_S_END when we receive an end frame.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: a17c5a0bb1d3e4d1e8ebcf0f979873ecb67a9a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17c5a0bb1d3e4d1e8ebcf0f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 19 09:32:14 2021 +0200 webservices: Return WS_S_END when we receive an end frame. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b920f972de3..b894b0f61ba 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2050,6 +2050,7 @@ static HRESULT receive_sized_envelope( struct channel *channel ) HRESULT hr; if ((hr = receive_bytes( channel, &type, 1 )) != S_OK) return hr; + if (type == FRAME_RECORD_TYPE_END) return WS_S_END; if (type != FRAME_RECORD_TYPE_SIZED_ENVELOPE) return WS_E_INVALID_FORMAT; if ((hr = receive_size( channel, &size )) != S_OK) return hr; if ((hr = receive_message_sized( channel, size )) != S_OK) return hr;

1 0

Paul Gofman : server: Send completions for existing job processes when adding completion port.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: de0dc0e8ac664549c64124fa02011b8f096217b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de0dc0e8ac664549c64124fa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 18 14:36:34 2021 +0300 server: Send completions for existing job processes when adding completion port. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 64 +++++++++++++++++++++++++++++++++++++++++-- server/process.c | 21 ++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f170043b5b9..52c3036fe59 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2786,13 +2786,17 @@ static void test_QueryInformationJobObject(void) static void test_CompletionPort(void) { JOBOBJECT_ASSOCIATE_COMPLETION_PORT port_info; - PROCESS_INFORMATION pi; + PROCESS_INFORMATION pi, pi2; HANDLE job, port; BOOL ret; job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + create_process("wait", &pi2); + ret = pAssignProcessToJobObject(job, pi2.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + port = pCreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); ok(port != NULL, "CreateIoCompletionPort error %u\n", GetLastError()); @@ -2806,12 +2810,19 @@ static void test_CompletionPort(void) ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + test_completion(port, JOB_OBJECT_MSG_NEW_PROCESS, (DWORD_PTR)job, pi2.dwProcessId, 0); test_completion(port, JOB_OBJECT_MSG_NEW_PROCESS, (DWORD_PTR)job, pi.dwProcessId, 0); TerminateProcess(pi.hProcess, 0); wait_child_process(pi.hProcess); test_completion(port, JOB_OBJECT_MSG_EXIT_PROCESS, (DWORD_PTR)job, pi.dwProcessId, 0); + TerminateProcess(pi2.hProcess, 0); + wait_child_process(pi2.hProcess); + CloseHandle(pi2.hProcess); + CloseHandle(pi2.hThread); + + test_completion(port, JOB_OBJECT_MSG_EXIT_PROCESS, (DWORD_PTR)job, pi2.dwProcessId, 0); test_completion(port, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, (DWORD_PTR)job, 0, 100); CloseHandle(pi.hProcess); @@ -4350,10 +4361,15 @@ static void test_dead_process(void) static void test_nested_jobs_child(unsigned int index) { - HANDLE job, job_parent, job_other; + JOBOBJECT_ASSOCIATE_COMPLETION_PORT port_info; + HANDLE job, job_parent, job_other, port; PROCESS_INFORMATION pi; + OVERLAPPED *overlapped; char job_name[32]; + ULONG_PTR value; + DWORD dead_pid; BOOL ret, out; + DWORD key; sprintf(job_name, "test_nested_jobs_%u", index); job = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY @@ -4412,6 +4428,20 @@ static void test_nested_jobs_child(unsigned int index) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); + dead_pid = pi.dwProcessId; + + port = pCreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); + ok(!!port, "CreateIoCompletionPort error %u\n", GetLastError()); + + port_info.CompletionPort = port; + port_info.CompletionKey = job; + ret = pSetInformationJobObject(job, JobObjectAssociateCompletionPortInformation, &port_info, sizeof(port_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + port_info.CompletionKey = job_parent; + ret = pSetInformationJobObject(job_parent, JobObjectAssociateCompletionPortInformation, + &port_info, sizeof(port_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + create_process("wait", &pi); out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); @@ -4423,12 +4453,42 @@ static void test_nested_jobs_child(unsigned int index) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(out, "IsProcessInJob returned out=%u\n", out); + /* The first already dead child process still shows up randomly. */ + do + { + ret = GetQueuedCompletionStatus(port, &key, &value, &overlapped, 0); + } while (ret && (ULONG_PTR)overlapped == dead_pid); + + ok(ret, "GetQueuedCompletionStatus: %x\n", GetLastError()); + ok(key == JOB_OBJECT_MSG_NEW_PROCESS, "unexpected key %x\n", key); + ok((HANDLE)value == job, "unexpected value %p\n", (void *)value); + ok((ULONG_PTR)overlapped == GetCurrentProcessId(), "unexpected pid %#x\n", (DWORD)(DWORD_PTR)overlapped); + + do + { + ret = GetQueuedCompletionStatus(port, &key, &value, &overlapped, 0); + } while (ret && (ULONG_PTR)overlapped == dead_pid); + + ok(ret, "GetQueuedCompletionStatus: %x\n", GetLastError()); + ok(key == JOB_OBJECT_MSG_NEW_PROCESS, "unexpected key %x\n", key); + ok((HANDLE)value == job_parent, "unexpected value %p\n", (void *)value); + ok((ULONG_PTR)overlapped == GetCurrentProcessId(), "unexpected pid %#x\n", (DWORD)(DWORD_PTR)overlapped); + + test_completion(port, JOB_OBJECT_MSG_NEW_PROCESS, (DWORD_PTR)job, pi.dwProcessId, 0); + test_completion(port, JOB_OBJECT_MSG_NEW_PROCESS, (DWORD_PTR)job_parent, pi.dwProcessId, 0); + + ret = GetQueuedCompletionStatus(port, &key, &value, &overlapped, 0); + ok(!ret, "GetQueuedCompletionStatus succeeded.\n"); + if (index) { ret = pAssignProcessToJobObject(job_other, GetCurrentProcess()); ok(!ret, "AssignProcessToJobObject succeded\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); } + + CloseHandle(port); + done: TerminateProcess(pi.hProcess, 0); wait_child_process(pi.hProcess); diff --git a/server/process.c b/server/process.c index 8baccdbad94..32c6fdd269b 100644 --- a/server/process.c +++ b/server/process.c @@ -255,6 +255,25 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi add_completion( job->completion_port, job->completion_key, pid, STATUS_SUCCESS, msg ); } +static void add_job_completion_existing_processes( struct job *job, struct job *completion_job ) +{ + struct process *process; + struct job *j; + + assert( completion_job->obj.ops == &job_ops ); + + LIST_FOR_EACH_ENTRY( j, &job->child_job_list, struct job, parent_job_entry ) + { + add_job_completion_existing_processes( j, completion_job ); + } + + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (process->running_threads) + add_job_completion( completion_job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id( process )); + } +} + static int process_in_job( struct job *job, struct process *process ) { struct job *j; @@ -1715,6 +1734,8 @@ DECL_HANDLER(set_job_completion_port) { job->completion_port = get_completion_obj( current->process, req->port, IO_COMPLETION_MODIFY_STATE ); job->completion_key = req->key; + + add_job_completion_existing_processes( job, job ); } else set_error( STATUS_INVALID_PARAMETER );

1 0

Piotr Caban : msvcrt: Import remainder implementation from musl.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: fd22e3b61be20545e2e51b3c70e0346f03f3e04b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd22e3b61be20545e2e51b3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 15:26:17 2021 +0200 msvcrt: Import remainder implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 11 +++++++---- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- include/msvcrt/math.h | 2 ++ 7 files changed, 9 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 0ec898ca762..827d17d7500 100755 --- a/configure +++ b/configure @@ -19638,7 +19638,6 @@ for ac_func in \ log1pf \ log2 \ log2f \ - remainder \ remainderf \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index 72db35563e7..8b319923816 100644 --- a/configure.ac +++ b/configure.ac @@ -2678,7 +2678,6 @@ AC_CHECK_FUNCS(\ log1pf \ log2 \ log2f \ - remainder \ remainderf \ tgamma \ tgammaf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ae3b9aa76e6..6c856700f94 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5474,13 +5474,16 @@ float CDECL _scalbf(float num, __msvcrt_long power) /********************************************************************* * remainder (MSVCR120.@) + * + * Copied from musl: src/math/remainder.c */ double CDECL remainder(double x, double y) { - /* this matches 64-bit Windows. 32-bit Windows is slightly different */ - if(!isfinite(x)) *_errno() = EDOM; - if(isnan(y) || y==0.0) *_errno() = EDOM; - return unix_funcs->remainder( x, y ); + int q; +#if _MSVCR_VER == 120 && defined(__x86_64__) + if (isnan(x) || isnan(y)) *_errno() = EDOM; +#endif + return remquo(x, y, &q); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index cd22d36acb4..b1f824f4c72 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -475,19 +475,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * remainder - */ -static double CDECL unix_remainder(double x, double y) -{ -#ifdef HAVE_REMAINDER - return remainder(x, y); -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - /********************************************************************* * remainderf */ @@ -634,7 +621,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_pow, unix_powf, - unix_remainder, unix_remainderf, unix_sin, unix_sinf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index f71ceea1cab..d301a9716cf 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -64,7 +64,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - double (CDECL *remainder)(double x, double y); float (CDECL *remainderf)(float x, float y); double (CDECL *sin)(double x); float (CDECL *sinf)(float x); diff --git a/include/config.h.in b/include/config.h.in index 1d54a041ce2..58325f3df92 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -630,9 +630,6 @@ /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK -/* Define to 1 if you have the `remainder' function. */ -#undef HAVE_REMAINDER - /* Define to 1 if you have the `remainderf' function. */ #undef HAVE_REMAINDERF diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index d2977b67c34..d4db618f542 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -73,6 +73,8 @@ _ACRTIMP double __cdecl fmod(double, double); _ACRTIMP double __cdecl fmin(double, double); _ACRTIMP double __cdecl fmax(double, double); _ACRTIMP double __cdecl erf(double); +_ACRTIMP double __cdecl remquo(double, double, int*); +_ACRTIMP float __cdecl remquof(float, float, int*); _ACRTIMP double __cdecl _hypot(double, double); _ACRTIMP double __cdecl _j0(double);

1 0

Piotr Caban : msvcrt: Import remainderf implementation from musl.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: b48e80a520af5720adc46a39cfa724a7f3ae45f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b48e80a520af5720adc46a39… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 15:26:21 2021 +0200 msvcrt: Import remainderf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 11 +++++++---- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 7 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 827d17d7500..44077d727fe 100755 --- a/configure +++ b/configure @@ -19638,7 +19638,6 @@ for ac_func in \ log1pf \ log2 \ log2f \ - remainderf \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index 8b319923816..56a4a75ac08 100644 --- a/configure.ac +++ b/configure.ac @@ -2678,7 +2678,6 @@ AC_CHECK_FUNCS(\ log1pf \ log2 \ log2f \ - remainderf \ tgamma \ tgammaf ) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6c856700f94..8ac545ae758 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5488,13 +5488,16 @@ double CDECL remainder(double x, double y) /********************************************************************* * remainderf (MSVCR120.@) + * + * Copied from musl: src/math/remainderf.c */ float CDECL remainderf(float x, float y) { - /* this matches 64-bit Windows. 32-bit Windows is slightly different */ - if(!isfinite(x)) *_errno() = EDOM; - if(isnan(y) || y==0.0f) *_errno() = EDOM; - return unix_funcs->remainderf( x, y ); + int q; +#if _MSVCR_VER == 120 && defined(__x86_64__) + if (isnan(x) || isnan(y)) *_errno() = EDOM; +#endif + return remquof(x, y, &q); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index b1f824f4c72..da253d9b55c 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -475,19 +475,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * remainderf - */ -static float CDECL unix_remainderf(float x, float y) -{ -#ifdef HAVE_REMAINDERF - return remainderf(x, y); -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - /********************************************************************* * sin */ @@ -621,7 +608,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_pow, unix_powf, - unix_remainderf, unix_sin, unix_sinf, unix_sinh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index d301a9716cf..84e62fd133a 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -64,7 +64,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - float (CDECL *remainderf)(float x, float y); double (CDECL *sin)(double x); float (CDECL *sinf)(float x); double (CDECL *sinh)(double x); diff --git a/include/config.h.in b/include/config.h.in index 58325f3df92..72e981821da 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -630,9 +630,6 @@ /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK -/* Define to 1 if you have the `remainderf' function. */ -#undef HAVE_REMAINDERF - /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE

1 0

Piotr Caban : msvcrt: Import erfcf implementation from musl.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: de11fe6dcd7a816d6a2dd98310345227a7c08141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de11fe6dcd7a816d6a2dd983… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 15:26:23 2021 +0200 msvcrt: Import erfcf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------ dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 -- 6 files changed, 124 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 44077d727fe..00c8378b4c6 100755 --- a/configure +++ b/configure @@ -19624,7 +19624,6 @@ for ac_func in \ atanhf \ erf \ erfc \ - erfcf \ erff \ exp2 \ exp2f \ diff --git a/configure.ac b/configure.ac index 56a4a75ac08..e8b3d175fc9 100644 --- a/configure.ac +++ b/configure.ac @@ -2664,7 +2664,6 @@ AC_CHECK_FUNCS(\ atanhf \ erf \ erfc \ - erfcf \ erff \ exp2 \ exp2f \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8ac545ae758..bd4df691e58 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5223,6 +5223,87 @@ double CDECL erf(double x) return unix_funcs->erf( x ); } +static float erfc1f(float x) +{ + static const float erx = 8.4506291151e-01, + pa0 = -2.3621185683e-03, + pa1 = 4.1485610604e-01, + pa2 = -3.7220788002e-01, + pa3 = 3.1834661961e-01, + pa4 = -1.1089469492e-01, + pa5 = 3.5478305072e-02, + pa6 = -2.1663755178e-03, + qa1 = 1.0642088205e-01, + qa2 = 5.4039794207e-01, + qa3 = 7.1828655899e-02, + qa4 = 1.2617121637e-01, + qa5 = 1.3637083583e-02, + qa6 = 1.1984500103e-02; + + float s, P, Q; + + s = fabsf(x) - 1; + P = pa0 + s * (pa1 + s * (pa2 + s * (pa3 + s * (pa4 + s * (pa5 + s * pa6))))); + Q = 1 + s * (qa1 + s * (qa2 + s * (qa3 + s * (qa4 + s * (qa5 + s * qa6))))); + return 1 - erx - P / Q; +} + +static float erfc2f(UINT32 ix, float x) +{ + static const float ra0 = -9.8649440333e-03, + ra1 = -6.9385856390e-01, + ra2 = -1.0558626175e+01, + ra3 = -6.2375331879e+01, + ra4 = -1.6239666748e+02, + ra5 = -1.8460508728e+02, + ra6 = -8.1287437439e+01, + ra7 = -9.8143291473e+00, + sa1 = 1.9651271820e+01, + sa2 = 1.3765776062e+02, + sa3 = 4.3456588745e+02, + sa4 = 6.4538726807e+02, + sa5 = 4.2900814819e+02, + sa6 = 1.0863500214e+02, + sa7 = 6.5702495575e+00, + sa8 = -6.0424413532e-02, + rb0 = -9.8649431020e-03, + rb1 = -7.9928326607e-01, + rb2 = -1.7757955551e+01, + rb3 = -1.6063638306e+02, + rb4 = -6.3756646729e+02, + rb5 = -1.0250950928e+03, + rb6 = -4.8351919556e+02, + sb1 = 3.0338060379e+01, + sb2 = 3.2579251099e+02, + sb3 = 1.5367296143e+03, + sb4 = 3.1998581543e+03, + sb5 = 2.5530502930e+03, + sb6 = 4.7452853394e+02, + sb7 = -2.2440952301e+01; + + float s, R, S, z; + + if (ix < 0x3fa00000) /* |x| < 1.25 */ + return erfc1f(x); + + x = fabsf(x); + s = 1 / (x * x); + if (ix < 0x4036db6d) { /* |x| < 1/0.35 */ + R = ra0 + s * (ra1 + s * (ra2 + s * (ra3 + s * (ra4 + s * + (ra5 + s * (ra6 + s * ra7)))))); + S = 1.0f + s * (sa1 + s * (sa2 + s * (sa3 + s * (sa4 + s * + (sa5 + s * (sa6 + s * (sa7 + s * sa8))))))); + } else { /* |x| >= 1/0.35 */ + R = rb0 + s * (rb1 + s * (rb2 + s * (rb3 + s * (rb4 + s * (rb5 + s * rb6))))); + S = 1.0f + s * (sb1 + s * (sb2 + s * (sb3 + s * (sb4 + s * + (sb5 + s * (sb6 + s * sb7)))))); + } + + ix = *(UINT32*)&x & 0xffffe000; + z = *(float*)&ix; + return expf(-z * z - 0.5625f) * expf((z - x) * (z + x) + R / S) / x; +} + /********************************************************************* * erff (MSVCR120.@) */ @@ -5241,10 +5322,52 @@ double CDECL erfc(double x) /********************************************************************* * erfcf (MSVCR120.@) + * + * Copied from musl: src/math/erff.c */ float CDECL erfcf(float x) { - return unix_funcs->erfcf( x ); + static const float pp0 = 1.2837916613e-01, + pp1 = -3.2504209876e-01, + pp2 = -2.8481749818e-02, + pp3 = -5.7702702470e-03, + pp4 = -2.3763017452e-05, + qq1 = 3.9791721106e-01, + qq2 = 6.5022252500e-02, + qq3 = 5.0813062117e-03, + qq4 = 1.3249473704e-04, + qq5 = -3.9602282413e-06; + + float r, s, z, y; + UINT32 ix; + int sign; + + ix = *(UINT32*)&x; + sign = ix >> 31; + ix &= 0x7fffffff; + if (ix >= 0x7f800000) { + /* erfc(nan)=nan, erfc(+-inf)=0,2 */ + return 2 * sign + 1 / x; + } + + if (ix < 0x3f580000) { /* |x| < 0.84375 */ + if (ix < 0x23800000) /* |x| < 2**-56 */ + return 1.0f - x; + z = x * x; + r = pp0 + z * (pp1 + z * (pp2 + z * (pp3 + z * pp4))); + s = 1.0f + z * (qq1 + z * (qq2 + z * (qq3 + z * (qq4 + z * qq5)))); + y = r / s; + if (sign || ix < 0x3e800000) /* x < 1/4 */ + return 1.0f - (x + x * y); + return 0.5f - (x - 0.5f + x * y); + } + if (ix < 0x41e00000) { /* |x| < 28 */ + return sign ? 2 - erfc2f(ix, x) : erfc2f(ix, x); + } + if (sign) + return 2 - FLT_MIN; + *_errno() = ERANGE; + return FLT_MIN * FLT_MIN; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index da253d9b55c..77de4602918 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -197,18 +197,6 @@ static double CDECL unix_erfc(double x) #endif } -/********************************************************************* - * erfcf - */ -static float CDECL unix_erfcf(float x) -{ -#ifdef HAVE_ERFCF - return erfcf(x); -#else - return unix_erfc(x); -#endif -} - /********************************************************************* * exp */ @@ -579,7 +567,6 @@ static const struct unix_funcs funcs = unix_coshf, unix_erf, unix_erfc, - unix_erfcf, unix_erff, unix_exp, unix_expf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 84e62fd133a..13912c68c99 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -35,7 +35,6 @@ struct unix_funcs float (CDECL *coshf)(float x); double (CDECL *erf)(double x); double (CDECL *erfc)(double x); - float (CDECL *erfcf)(float x); float (CDECL *erff)(float x); double (CDECL *exp)(double x); float (CDECL *expf)(float x); diff --git a/include/config.h.in b/include/config.h.in index 72e981821da..d7738888e27 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -116,9 +116,6 @@ /* Define to 1 if you have the `erfc' function. */ #undef HAVE_ERFC -/* Define to 1 if you have the `erfcf' function. */ -#undef HAVE_ERFCF - /* Define to 1 if you have the `erff' function. */ #undef HAVE_ERFF

1 0

Piotr Caban : msvcrt: Import erff implementation from musl.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 98525b04bc1de4c136d4fb0d70bdecaf0641f0e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98525b04bc1de4c136d4fb0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 15:26:29 2021 +0200 msvcrt: Import erff implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 41 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 00c8378b4c6..9eb6cb7fd61 100755 --- a/configure +++ b/configure @@ -19624,7 +19624,6 @@ for ac_func in \ atanhf \ erf \ erfc \ - erff \ exp2 \ exp2f \ expm1 \ diff --git a/configure.ac b/configure.ac index e8b3d175fc9..d21882c7813 100644 --- a/configure.ac +++ b/configure.ac @@ -2664,7 +2664,6 @@ AC_CHECK_FUNCS(\ atanhf \ erf \ erfc \ - erff \ exp2 \ exp2f \ expm1 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index bd4df691e58..e0c28e25638 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5306,10 +5306,50 @@ static float erfc2f(UINT32 ix, float x) /********************************************************************* * erff (MSVCR120.@) + * + * Copied from musl: src/math/erff.c */ float CDECL erff(float x) { - return unix_funcs->erff( x ); + static const float efx8 = 1.0270333290e+00, + pp0 = 1.2837916613e-01, + pp1 = -3.2504209876e-01, + pp2 = -2.8481749818e-02, + pp3 = -5.7702702470e-03, + pp4 = -2.3763017452e-05, + qq1 = 3.9791721106e-01, + qq2 = 6.5022252500e-02, + qq3 = 5.0813062117e-03, + qq4 = 1.3249473704e-04, + qq5 = -3.9602282413e-06; + + float r, s, z, y; + UINT32 ix; + int sign; + + ix = *(UINT32*)&x; + sign = ix >> 31; + ix &= 0x7fffffff; + if (ix >= 0x7f800000) { + /* erf(nan)=nan, erf(+-inf)=+-1 */ + return 1 - 2 * sign + 1 / x; + } + if (ix < 0x3f580000) { /* |x| < 0.84375 */ + if (ix < 0x31800000) { /* |x| < 2**-28 */ + /*avoid underflow */ + return 0.125f * (8 * x + efx8 * x); + } + z = x * x; + r = pp0 + z * (pp1 + z * (pp2 + z * (pp3 + z * pp4))); + s = 1 + z * (qq1 + z * (qq2 + z * (qq3 + z * (qq4 + z * qq5)))); + y = r / s; + return x + x * y; + } + if (ix < 0x40c00000) /* |x| < 6 */ + y = 1 - erfc2f(ix, x); + else + y = 1 - FLT_MIN; + return sign ? -y : y; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 77de4602918..9607ca94e7c 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -173,18 +173,6 @@ static double CDECL unix_erf(double x) #endif } -/********************************************************************* - * erff - */ -static float CDECL unix_erff(float x) -{ -#ifdef HAVE_ERFF - return erff(x); -#else - return unix_erf(x); -#endif -} - /********************************************************************* * erfc */ @@ -567,7 +555,6 @@ static const struct unix_funcs funcs = unix_coshf, unix_erf, unix_erfc, - unix_erff, unix_exp, unix_expf, unix_exp2, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 13912c68c99..58ec53d285c 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -35,7 +35,6 @@ struct unix_funcs float (CDECL *coshf)(float x); double (CDECL *erf)(double x); double (CDECL *erfc)(double x); - float (CDECL *erff)(float x); double (CDECL *exp)(double x); float (CDECL *expf)(float x); double (CDECL *exp2)(double x); diff --git a/include/config.h.in b/include/config.h.in index d7738888e27..b0e1fb55332 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -116,9 +116,6 @@ /* Define to 1 if you have the `erfc' function. */ #undef HAVE_ERFC -/* Define to 1 if you have the `erff' function. */ -#undef HAVE_ERFF - /* Define to 1 if you have the `exp2' function. */ #undef HAVE_EXP2

1 0

Piotr Caban : msvcrt: Import erf implementation from musl.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 9bc856dfaf80f9f69eb5b19f1c7f0159de58a630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc856dfaf80f9f69eb5b19f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 15:26:39 2021 +0200 msvcrt: Import erf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 21 --------------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 39 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 8e15b71d74e..ecfe7745900 100755 --- a/configure +++ b/configure @@ -19622,7 +19622,6 @@ for ac_func in \ asinhf \ atanh \ atanhf \ - erf \ exp2 \ exp2f \ expm1 \ diff --git a/configure.ac b/configure.ac index 90522c22867..c144fa1bbdd 100644 --- a/configure.ac +++ b/configure.ac @@ -2662,7 +2662,6 @@ AC_CHECK_FUNCS(\ asinhf \ atanh \ atanhf \ - erf \ exp2 \ exp2f \ expm1 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 787bb18ddad..2e2161e91c4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5304,7 +5304,45 @@ static double erfc2(uint32_t ix, double x) */ double CDECL erf(double x) { - return unix_funcs->erf( x ); + static const double efx8 = 1.02703333676410069053e+00, + pp0 = 1.28379167095512558561e-01, + pp1 = -3.25042107247001499370e-01, + pp2 = -2.84817495755985104766e-02, + pp3 = -5.77027029648944159157e-03, + pp4 = -2.37630166566501626084e-05, + qq1 = 3.97917223959155352819e-01, + qq2 = 6.50222499887672944485e-02, + qq3 = 5.08130628187576562776e-03, + qq4 = 1.32494738004321644526e-04, + qq5 = -3.96022827877536812320e-06; + + double r, s, z, y; + UINT32 ix; + int sign; + + ix = *(UINT64*)&x >> 32; + sign = ix >> 31; + ix &= 0x7fffffff; + if (ix >= 0x7ff00000) { + /* erf(nan)=nan, erf(+-inf)=+-1 */ + return 1 - 2 * sign + 1 / x; + } + if (ix < 0x3feb0000) { /* |x| < 0.84375 */ + if (ix < 0x3e300000) { /* |x| < 2**-28 */ + /* avoid underflow */ + return 0.125 * (8 * x + efx8 * x); + } + z = x * x; + r = pp0 + z * (pp1 + z * (pp2 + z * (pp3 + z * pp4))); + s = 1.0 + z * (qq1 + z * (qq2 + z * (qq3 + z * (qq4 + z * qq5)))); + y = r / s; + return x + x * y; + } + if (ix < 0x40180000) /* 0.84375 <= |x| < 6 */ + y = 1 - erfc2(ix, x); + else + y = 1 - DBL_MIN; + return sign ? -y : y; } static float erfc1f(float x) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 59f8ce4cee7..fd82c5afb94 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -153,26 +153,6 @@ static float CDECL unix_coshf( float x ) return coshf( x ); } -/********************************************************************* - * erf - */ -static double CDECL unix_erf(double x) -{ -#ifdef HAVE_ERF - return erf(x); -#else - /* Abramowitz and Stegun approximation, maximum error: 1.5*10^-7 */ - double t, y; - int sign = signbit(x); - - if (sign) x = -x; - t = 1 / (1 + 0.3275911 * x); - y = ((((1.061405429*t - 1.453152027)*t + 1.421413741)*t - 0.284496736)*t + 0.254829592)*t; - y = 1.0 - y*exp(-x*x); - return sign ? -y : y; -#endif -} - /********************************************************************* * exp */ @@ -541,7 +521,6 @@ static const struct unix_funcs funcs = unix_cosf, unix_cosh, unix_coshf, - unix_erf, unix_exp, unix_expf, unix_exp2, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 9793fca93bd..95b4a6488de 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -33,7 +33,6 @@ struct unix_funcs float (CDECL *cosf)(float x); double (CDECL *cosh)(double x); float (CDECL *coshf)(float x); - double (CDECL *erf)(double x); double (CDECL *exp)(double x); float (CDECL *expf)(float x); double (CDECL *exp2)(double x); diff --git a/include/config.h.in b/include/config.h.in index befb0af9f7e..74d54a942a6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -110,9 +110,6 @@ /* Define to 1 if you have the `epoll_create' function. */ #undef HAVE_EPOLL_CREATE -/* Define to 1 if you have the `erf' function. */ -#undef HAVE_ERF - /* Define to 1 if you have the `exp2' function. */ #undef HAVE_EXP2

1 0

Hans Leidekker : webservices: Add async support in WsReadMessageEnd.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 6f1e12e891791f49dc1fea09d2620b01bab61a9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1e12e891791f49dc1fea09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 19 09:32:11 2021 +0200 webservices: Add async support in WsReadMessageEnd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 49 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 4df761cd5ea..c97a0d49a66 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2581,18 +2581,53 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS return hr; } +static HRESULT read_message_end( WS_MESSAGE *msg ) +{ + return WsReadEnvelopeEnd( msg, NULL ); +} + +struct read_message_end +{ + struct task task; + WS_MESSAGE *msg; + WS_ASYNC_CONTEXT ctx; +}; + +static void read_message_end_proc( struct task *task ) +{ + struct read_message_end *r = (struct read_message_end *)task; + HRESULT hr; + + hr = read_message_end( r->msg ); + + TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); + r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); + TRACE( "%p returned\n", r->ctx.callback ); +} + +static HRESULT queue_read_message_end( struct channel *channel, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx ) +{ + struct read_message_end *r; + + if (!(r = heap_alloc( sizeof(*r) ))) return E_OUTOFMEMORY; + r->task.proc = read_message_end_proc; + r->msg = msg; + r->ctx = *ctx; + return queue_task( &channel->recv_q, &r->task ); +} + /************************************************************************** * WsReadMessageEnd [webservices.@] */ -HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, - WS_ERROR *error ) +HRESULT WINAPI WsReadMessageEnd( 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; @@ -2604,7 +2639,13 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A return E_INVALIDARG; } - hr = WsReadEnvelopeEnd( msg, NULL ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_read_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 );

1 0

Hans Leidekker : webservices: Add async support in WsSendReplyMessage.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: bebffaf9e7a83964af4c63c606e35f86cedbc025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bebffaf9e7a83964af4c63c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 19 09:32:09 2021 +0200 webservices: Add async support in WsSendReplyMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 7e576544205..430453443d0 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1738,12 +1738,13 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - GUID req_id; + WS_ASYNC_CONTEXT ctx_local; + struct async async; + GUID id; HRESULT hr; TRACE( "%p %p %p %08x %p %u %p %p %p\n", handle, msg, desc, option, body, size, request, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !msg || !desc || !request) return E_INVALIDARG; @@ -1760,15 +1761,16 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS return WS_E_INVALID_OPERATION; } - if ((hr = WsInitializeMessage( msg, WS_REPLY_MESSAGE, NULL, NULL )) != S_OK) goto done; - if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; - if ((hr = message_set_action( msg, desc->action )) != S_OK) goto done; - if ((hr = message_get_id( request, &req_id )) != S_OK) goto done; - if ((hr = message_set_request_id( msg, &req_id )) != S_OK) goto done; + if ((hr = message_get_id( request, &id )) != S_OK) goto done; + if ((hr = message_set_request_id( msg, &id )) != S_OK) goto done; - if ((hr = init_writer( channel )) != S_OK) goto done; - if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; - hr = send_message_bytes( channel, msg ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_send_message( channel, msg, desc, option, body, size, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } done: LeaveCriticalSection( &channel->cs ); @@ -2387,14 +2389,9 @@ static HRESULT request_reply( struct channel *channel, WS_MESSAGE *request, WS_HEAP *heap, void *value, ULONG size ) { HRESULT hr; - WsInitializeMessage( request, WS_REQUEST_MESSAGE, NULL, NULL ); - if ((hr = WsAddressMessage( request, &channel->addr, NULL )) != S_OK) return hr; - if ((hr = message_set_action( request, request_desc->action )) != S_OK) return hr; - if ((hr = init_writer( channel )) != S_OK) return hr; - if ((hr = write_message( channel, request, request_desc->bodyElementDescription, write_option, request_body, - request_size )) != S_OK) return hr; - if ((hr = send_message_bytes( channel, request )) != S_OK) return hr; + if ((hr = send_message( channel, request, request_desc, write_option, request_body, request_size )) != S_OK) + return hr; return receive_message( channel, reply, &reply_desc, 1, WS_RECEIVE_OPTIONAL_MESSAGE, read_option, heap, value, size, NULL );

1 0