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

[PATCH 3/8] msvcrt: Import ceil implementation from musl.
by Piotr Caban May 17, 2021

May 17, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 23 ++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 22 insertions(+), 11 deletions(-)

1 0

[PATCH 2/8] msvcrt: Import cbrt implementation from musl.
by Piotr Caban May 17, 2021

May 17, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 41 insertions(+), 16 deletions(-)

1 0

[PATCH 1/8] msvcrt: Import cbrtf implementation from musl.
by Piotr Caban May 17, 2021

May 17, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 30 +++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 29 insertions(+), 16 deletions(-)

1 0

[PATCH 4/4] webservices/tests: Add an async client test.
by Hans Leidekker May 17, 2021

May 17, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/channel.c | 108 +++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index f27b2a3337d..ed6e9e829bf 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -678,6 +678,107 @@ static void client_duplex_session( const struct listener_info *info ) WsFreeChannel( channel ); } +static void client_duplex_session_async( const struct listener_info *info ) +{ + WS_XML_STRING action = {6, (BYTE *)"action"}, localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; + WS_ELEMENT_DESCRIPTION desc_body; + WS_MESSAGE_DESCRIPTION desc; + WS_ENDPOINT_ADDRESS addr; + WS_ASYNC_CONTEXT ctx; + struct async_test test; + WCHAR buf[64]; + WS_CHANNEL *channel; + WS_MESSAGE *msg, *msg2; + INT32 val = -1; + HRESULT hr; + DWORD err; + + err = WaitForSingleObject( info->ready, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + test.call_count = 0; + test.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + ctx.callback = async_callback; + ctx.callbackState = &test; + + memset( &addr, 0, sizeof(addr) ); + addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); + addr.url.chars = buf; + hr = WsOpenChannel( channel, &addr, &ctx, NULL ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + if (hr == WS_S_ASYNC) + { + WaitForSingleObject( test.wait, INFINITE ); + ok( test.call_count == 1, "got %u\n", test.call_count ); + } + else ok( !test.call_count, "got %u\n", test.call_count ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + desc_body.elementLocalName = &localname; + desc_body.elementNs = &ns; + desc_body.type = WS_INT32_TYPE; + desc_body.typeDescription = NULL; + desc.action = &action; + desc.bodyElementDescription = &desc_body; + + /* asynchronous call */ + test.call_count = 0; + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), &ctx, NULL ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + if (hr == WS_S_ASYNC) + { + WaitForSingleObject( test.wait, INFINITE ); + ok( test.call_count == 1, "got %u\n", test.call_count ); + } + else ok( !test.call_count, "got %u\n", test.call_count ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* synchronous call */ + hr = WsSendMessage( channel, msg2, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + test.call_count = 0; + hr = WsShutdownSessionChannel( channel, &ctx, NULL ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + if (hr == WS_S_ASYNC) + { + WaitForSingleObject( test.wait, INFINITE ); + ok( test.call_count == 1, "got %u\n", test.call_count ); + } + else ok( !test.call_count, "got %u\n", test.call_count ); + + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + test.call_count = 0; + hr = WsCloseChannel( channel, &ctx, NULL ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + if (hr == WS_S_ASYNC) + { + WaitForSingleObject( test.wait, INFINITE ); + ok( test.call_count == 1, "got %u\n", test.call_count ); + } + else ok( !test.call_count, "got %u\n", test.call_count ); + + err = WaitForSingleObject( info->done, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + CloseHandle( test.wait ); + WsFreeMessage( msg ); + WsFreeMessage( msg2 ); + WsFreeChannel( channel ); +} + static void server_accept_channel( WS_CHANNEL *channel ) { WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; @@ -882,6 +983,7 @@ static DWORD CALLBACK listener_proc( void *arg ) const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? L"net.tcp://localhost:%u" : L"soap.udp://localhost:%u"; WS_LISTENER *listener; WS_CHANNEL *channel; + WS_CHANNEL_STATE state; WCHAR buf[64]; WS_STRING url; HRESULT hr; @@ -902,6 +1004,11 @@ static DWORD CALLBACK listener_proc( void *arg ) hr = WsAcceptChannel( listener, channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_OPEN, "got %u\n", state ); + info->server_func( channel ); SetEvent( info->done ); @@ -1065,6 +1172,7 @@ START_TEST(channel) { WS_UDP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX, server_accept_channel, client_accept_channel }, { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_accept_channel, client_accept_channel }, { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_request_reply, client_request_reply }, + { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_duplex_session, client_duplex_session_async }, }; if (firewall_enabled) -- 2.30.2

1 0

[PATCH 3/4] webservices: Create the connection in WsOpenChannel.
by Hans Leidekker May 17, 2021

May 17, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 187 +++++++++++++++++++++++-------------- 1 file changed, 117 insertions(+), 70 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 8e902e5aed7..fb9f5b3162c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -715,55 +715,6 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID return hr; } -static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint ) -{ - if (endpoint->headers || endpoint->extensions || endpoint->identity) - { - FIXME( "headers, extensions or identity not supported\n" ); - return E_NOTIMPL; - } - - TRACE( "endpoint %s\n", debugstr_wn(endpoint->url.chars, endpoint->url.length) ); - - if (!(channel->addr.url.chars = heap_alloc( endpoint->url.length * sizeof(WCHAR) ))) return E_OUTOFMEMORY; - memcpy( channel->addr.url.chars, endpoint->url.chars, endpoint->url.length * sizeof(WCHAR) ); - channel->addr.url.length = endpoint->url.length; - - channel->state = WS_CHANNEL_STATE_OPEN; - return S_OK; -} - -/************************************************************************** - * WsOpenChannel [webservices.@] - */ -HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, - const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) -{ - struct channel *channel = (struct channel *)handle; - HRESULT hr; - - TRACE( "%p %p %p %p\n", handle, endpoint, ctx, error ); - if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); - - if (!channel || !endpoint) return E_INVALIDARG; - - EnterCriticalSection( &channel->cs ); - - if (channel->magic != CHANNEL_MAGIC) - { - LeaveCriticalSection( &channel->cs ); - return E_INVALIDARG; - } - - if (channel->state != WS_CHANNEL_STATE_CREATED) hr = WS_E_INVALID_OPERATION; - else hr = open_channel( channel, endpoint ); - - LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); - return hr; -} - enum frame_record_type { FRAME_RECORD_TYPE_VERSION, @@ -793,8 +744,7 @@ static HRESULT shutdown_session( struct channel *channel ) { HRESULT hr; - if (channel->state != WS_CHANNEL_STATE_OPEN || - (channel->type != WS_CHANNEL_TYPE_OUTPUT_SESSION && + if ((channel->type != WS_CHANNEL_TYPE_OUTPUT_SESSION && channel->type != WS_CHANNEL_TYPE_DUPLEX_SESSION) || channel->session_state >= SESSION_STATE_SHUTDOWN) return WS_E_INVALID_OPERATION; @@ -829,6 +779,11 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } hr = shutdown_session( channel ); @@ -913,7 +868,7 @@ error: return hr; } -static HRESULT connect_channel_http( struct channel *channel ) +static HRESULT open_channel_http( struct channel *channel ) { HINTERNET ses = NULL, con = NULL; URL_COMPONENTS uc; @@ -972,7 +927,7 @@ done: return hr; } -static HRESULT connect_channel_tcp( struct channel *channel ) +static HRESULT open_channel_tcp( struct channel *channel ) { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; @@ -1013,7 +968,7 @@ static HRESULT connect_channel_tcp( struct channel *channel ) return S_OK; } -static HRESULT connect_channel_udp( struct channel *channel ) +static HRESULT open_channel_udp( struct channel *channel ) { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; @@ -1051,23 +1006,78 @@ static HRESULT connect_channel_udp( struct channel *channel ) return S_OK; } -static HRESULT connect_channel( struct channel *channel ) +static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint ) { + HRESULT hr; + + if (endpoint->headers || endpoint->extensions || endpoint->identity) + { + FIXME( "headers, extensions or identity not supported\n" ); + return E_NOTIMPL; + } + + TRACE( "endpoint %s\n", debugstr_wn(endpoint->url.chars, endpoint->url.length) ); + + if (!(channel->addr.url.chars = heap_alloc( endpoint->url.length * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + memcpy( channel->addr.url.chars, endpoint->url.chars, endpoint->url.length * sizeof(WCHAR) ); + channel->addr.url.length = endpoint->url.length; + switch (channel->binding) { case WS_HTTP_CHANNEL_BINDING: - return connect_channel_http( channel ); + hr = open_channel_http( channel ); + break; case WS_TCP_CHANNEL_BINDING: - return connect_channel_tcp( channel ); + hr = open_channel_tcp( channel ); + break; case WS_UDP_CHANNEL_BINDING: - return connect_channel_udp( channel ); + hr = open_channel_udp( channel ); + break; default: ERR( "unhandled binding %u\n", channel->binding ); return E_NOTIMPL; } + + if (hr == S_OK) channel->state = WS_CHANNEL_STATE_OPEN; + return hr; +} + +/************************************************************************** + * WsOpenChannel [webservices.@] + */ +HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + HRESULT hr; + + TRACE( "%p %p %p %p\n", handle, endpoint, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!channel || !endpoint) return E_INVALIDARG; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + if (channel->state != WS_CHANNEL_STATE_CREATED) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } + + hr = open_channel( channel, endpoint ); + + LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT send_message_http( HINTERNET request, BYTE *data, ULONG len ) @@ -1341,8 +1351,13 @@ HRESULT channel_send_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } - if ((hr = connect_channel( channel )) == S_OK) hr = send_message( channel, msg ); + hr = send_message( channel, msg ); LeaveCriticalSection( &channel->cs ); return hr; @@ -1470,12 +1485,16 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + 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 = connect_channel( channel )) != 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 ); @@ -1510,6 +1529,11 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + 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; @@ -1517,7 +1541,6 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS 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 = connect_channel( channel )) != 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 ); @@ -1930,9 +1953,6 @@ static HRESULT receive_message_session( struct channel *channel ) static HRESULT receive_message_bytes( struct channel *channel, WS_MESSAGE *msg ) { - HRESULT hr; - if ((hr = connect_channel( channel )) != S_OK) return hr; - switch (channel->binding) { case WS_HTTP_CHANNEL_BINDING: @@ -1941,6 +1961,7 @@ static HRESULT receive_message_bytes( struct channel *channel, WS_MESSAGE *msg ) case WS_TCP_CHANNEL_BINDING: if (channel->type & WS_CHANNEL_TYPE_SESSION) { + HRESULT hr; switch (channel->session_state) { case SESSION_STATE_UNINITIALIZED: @@ -1979,6 +2000,11 @@ HRESULT channel_receive_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } if ((hr = receive_message_bytes( channel, msg )) == S_OK) hr = init_reader( channel ); @@ -2134,7 +2160,6 @@ static HRESULT request_reply( struct channel *channel, WS_MESSAGE *request, 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 = connect_channel( channel )) != 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; @@ -2215,7 +2240,6 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS TRACE( "%p %p %p %08x %p %u %p %p %08x %p %p %u %p %p\n", handle, request, request_desc, write_option, request_body, request_size, reply, reply_desc, read_option, heap, value, size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !request || !reply) return E_INVALIDARG; @@ -2226,6 +2250,11 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } if (ctx) hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, @@ -2261,6 +2290,11 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } if ((hr = receive_message_bytes( channel, msg )) == S_OK) { @@ -2325,8 +2359,12 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } - if ((hr = connect_channel( channel )) != S_OK) goto done; if ((hr = init_writer( channel )) != S_OK) goto done; if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; hr = WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL ); @@ -2359,9 +2397,13 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } - if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK && (hr = connect_channel( channel )) == S_OK) - hr = send_message( channel, msg ); + if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message( channel, msg ); LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); @@ -2423,6 +2465,7 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE BOOL nodelay = FALSE; prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); + channel->state = WS_CHANNEL_STATE_OPEN; } LeaveCriticalSection( &channel->cs ); @@ -2469,7 +2512,11 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE return E_INVALIDARG; } - if ((hr = sock_wait( socket, wait, cancel )) == S_OK) channel->u.udp.socket = socket; + if ((hr = sock_wait( socket, wait, cancel )) == S_OK) + { + channel->u.udp.socket = socket; + channel->state = WS_CHANNEL_STATE_OPEN; + } LeaveCriticalSection( &channel->cs ); return hr; -- 2.30.2

1 0

[PATCH 2/4] webservices/tests: Wait for the listener to be ready.
by Hans Leidekker May 17, 2021

May 17, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/channel.c | 36 ++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 4f56b864271..f27b2a3337d 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -436,7 +436,8 @@ static void test_WsResetListener(void) struct listener_info { int port; - HANDLE wait; + HANDLE ready; + HANDLE done; WS_CHANNEL_BINDING binding; WS_CHANNEL_TYPE type; void (*server_func)( WS_CHANNEL * ); @@ -485,6 +486,9 @@ static void client_message_read_write( const struct listener_info *info ) HRESULT hr; DWORD err; + err = WaitForSingleObject( info->ready, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -527,7 +531,7 @@ static void client_message_read_write( const struct listener_info *info ) hr = WsWriteMessageEnd( channel, msg, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - err = WaitForSingleObject( info->wait, 3000 ); + err = WaitForSingleObject( info->done, 3000 ); ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); hr = WsCloseChannel( channel, NULL, NULL ); @@ -623,6 +627,9 @@ static void client_duplex_session( const struct listener_info *info ) HRESULT hr; DWORD err; + err = WaitForSingleObject( info->ready, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -654,7 +661,7 @@ static void client_duplex_session( const struct listener_info *info ) hr = WsSendMessage( channel, msg2, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - err = WaitForSingleObject( info->wait, 3000 ); + err = WaitForSingleObject( info->done, 3000 ); ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); @@ -715,6 +722,9 @@ static void client_accept_channel( const struct listener_info *info ) HRESULT hr; DWORD err; + err = WaitForSingleObject( info->ready, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + hr = WsAcceptChannel( NULL, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -755,7 +765,7 @@ static void client_accept_channel( const struct listener_info *info ) hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - err = WaitForSingleObject( info->wait, 3000 ); + err = WaitForSingleObject( info->done, 3000 ); ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); hr = WsCloseChannel( channel, NULL, NULL ); @@ -817,6 +827,10 @@ static void client_request_reply( const struct listener_info *info ) WS_MESSAGE_DESCRIPTION req_desc, reply_desc; INT32 val_in = -1, val_out = 0; HRESULT hr; + DWORD err; + + err = WaitForSingleObject( info->ready, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -851,6 +865,9 @@ static void client_request_reply( const struct listener_info *info ) &reply_desc, WS_READ_REQUIRED_VALUE, NULL, &val_out, sizeof(val_out), NULL, NULL ); ok( val_out == -1, "got %d\n", val_out ); + err = WaitForSingleObject( info->done, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -880,14 +897,14 @@ static DWORD CALLBACK listener_proc( void *arg ) hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - SetEvent( info->wait ); + SetEvent( info->ready ); hr = WsAcceptChannel( listener, channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); info->server_func( channel ); - SetEvent( info->wait ); + SetEvent( info->done ); hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -902,12 +919,8 @@ static DWORD CALLBACK listener_proc( void *arg ) static HANDLE start_listener( struct listener_info *info ) { - DWORD err; HANDLE thread = CreateThread( NULL, 0, listener_proc, info, 0, NULL ); ok( thread != NULL, "failed to create listener thread %u\n", GetLastError() ); - - err = WaitForSingleObject( info->wait, 3000 ); - ok( err == WAIT_OBJECT_0, "failed to start listener %u\n", err ); return thread; } @@ -1077,7 +1090,8 @@ START_TEST(channel) test_WsResetListener(); info.port = 7533; - info.wait = CreateEventW( NULL, 0, 0, NULL ); + info.ready = CreateEventW( NULL, 0, 0, NULL ); + info.done = CreateEventW( NULL, 0, 0, NULL ); for (i = 0; i < ARRAY_SIZE(tests); i++) { -- 2.30.2

1 0

[PATCH 1/4] webservices: Implement WsGetChannelProperty(WS_CHANNEL_PROPERTY_STATE).
by Hans Leidekker May 17, 2021

May 17, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 5 +++++ dlls/webservices/tests/channel.c | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index fd7c8d6029d..8e902e5aed7 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -672,6 +672,11 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID else *(WS_ENCODING *)buf = channel->encoding; break; + case WS_CHANNEL_PROPERTY_STATE: + if (!buf || size != sizeof(channel->state)) hr = E_INVALIDARG; + else *(WS_CHANNEL_STATE *)buf = channel->state; + break; + default: hr = prop_get( channel->prop, channel->prop_count, id, buf, size ); } diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index d80f1f64cde..4f56b864271 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -117,6 +117,7 @@ static void test_WsOpenChannel(void) { HRESULT hr; WS_CHANNEL *channel; + WS_CHANNEL_STATE state; WS_ENDPOINT_ADDRESS addr; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); @@ -141,12 +142,22 @@ static void test_WsOpenChannel(void) hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_OPEN, "got %u\n", state ); + hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_CLOSED, "got %u\n", state ); + hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.30.2

1 0

[PATCH] vbscript: Support VT_BSTR|VT_ARRAY Iterator
by Alistair Leslie-Hughes May 17, 2021

May 17, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vbscript/interp.c | 1 + dlls/vbscript/utils.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 11d95e57758..35a6165a819 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1422,6 +1422,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) V_UNKNOWN(r) = (IUnknown*)iter; break; } + case VT_BSTR|VT_ARRAY: case VT_VARIANT|VT_ARRAY: case VT_VARIANT|VT_ARRAY|VT_BYREF: { IEnumVARIANT *iter; diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c index d30842c52eb..c0b8b749038 100644 --- a/dlls/vbscript/utils.c +++ b/dlls/vbscript/utils.c @@ -106,11 +106,20 @@ static HRESULT WINAPI safearray_iter_IEnumVARIANT_Next(IEnumVARIANT *iface, if(!This->sa->cLocks) ERR("SAFEARRAY not locked\n"); - v = (VARIANT*)(((BYTE*)This->sa->pvData) + This->i * This->sa->cbElements); - V_VT(rgVar) = VT_EMPTY; - hres = VariantCopy(rgVar, v); - if(FAILED(hres)) - return hres; + if (This->sa->fFeatures & FADF_VARIANT) + { + v = (VARIANT*)(((BYTE*)This->sa->pvData) + This->i * This->sa->cbElements); + V_VT(rgVar) = VT_EMPTY; + hres = VariantCopy(rgVar, v); + if(FAILED(hres)) + return hres; + } + else if (This->sa->fFeatures & FADF_BSTR) + { + BSTR bstr = *(BSTR*)(((BYTE*)This->sa->pvData) + This->i * This->sa->cbElements); + V_VT(rgVar) = VT_BSTR; + V_BSTR(rgVar) = SysAllocString(bstr); + } This->i++; if(pCeltFetched) @@ -165,11 +174,6 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) safearray_iter *iter; HRESULT hres; - if(sa && !(sa->fFeatures & FADF_VARIANT)) { - FIXME("enumeration not supported: %x\n", sa->fFeatures); - return E_NOTIMPL; - } - iter = heap_alloc(sizeof(*iter)); if(!iter) return E_OUTOFMEMORY; -- 2.30.2

2 1

[PATCH] include: Print context information after the failure/todo messages.
by Zebediah Figura May 17, 2021

May 17, 2021

The TestBot expects the failure text to directly follow the line number. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/test.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index f2aacaff592..67774b1746a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -303,11 +303,8 @@ const char *winetest_elapsed(void) static void winetest_vprintf( const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); - unsigned int i; printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); - for (i = 0; i < data->context_count; ++i) - printf( "%s: ", data->context[i] ); vprintf( msg, args ); } @@ -366,12 +363,15 @@ static LONG winetest_add_line( void ) int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); + unsigned int i; if (data->todo_level) { if (condition) { winetest_printf( "Test succeeded inside todo block: " ); + for (i = 0; i < data->context_count; ++i) + printf( "%s: ", data->context[i] ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -384,6 +384,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (winetest_debug > 0) { winetest_printf( "Test marked todo: " ); + for (i = 0; i < data->context_count; ++i) + printf( "%s: ", data->context[i] ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -398,6 +400,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (!condition) { winetest_printf( "Test failed: " ); + for (i = 0; i < data->context_count; ++i) + printf( "%s: ", data->context[i] ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; -- 2.30.2

2 1

[PATCH v3 1/4] server: Add extra data bytes to be added after hardware_msg_data.
by Rémi Bernon May 17, 2021

May 17, 2021

The RIM_TYPEHID messages will have to carry the variable length HID report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Split / reorder / small rewrite of patches, plus: * Add a VARARG parameter to send_rawinput_buffer to hold the HID reports. Its length is rawinput.hid.count * rawinput.hid.length, checked against request data size on reception. * Add count field to rawinput union, as it needs to have the length for get_rawinput_buffer implementation, and so needs to be padded to have a consistent size anyway. * Support HID reports count > 1. server/queue.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/server/queue.c b/server/queue.c index 5d65e030112..c43386ee317 100644 --- a/server/queue.c +++ b/server/queue.c @@ -348,13 +348,13 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ /* allocate a hardware message and its data */ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_source source, - unsigned int time ) + unsigned int time, data_size_t extra_len ) { struct hardware_msg_data *msg_data; struct message *msg; if (!(msg = mem_alloc( sizeof(*msg) ))) return NULL; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) + if (!(msg_data = mem_alloc( sizeof(*msg_data) + extra_len ))) { free( msg ); return NULL; @@ -363,9 +363,9 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour msg->type = MSG_HARDWARE; msg->time = time; msg->data = msg_data; - msg->data_size = sizeof(*msg_data); + msg->data_size = sizeof(*msg_data) + extra_len; - memset( msg_data, 0, sizeof(*msg_data) ); + memset( msg_data, 0, sizeof(*msg_data) + extra_len ); msg_data->info = info; msg_data->source = source; return msg; @@ -398,7 +398,7 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) return; } - if (!(msg = alloc_hardware_message( 0, source, get_tick_count() ))) return; + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; msg->msg = WM_MOUSEMOVE; msg->x = x; @@ -1664,6 +1664,8 @@ struct rawinput_message unsigned int time; unsigned int message; struct hardware_msg_data data; + const void *extra; + data_size_t extra_len; }; /* check if process is supposed to receive a WM_INPUT message and eventually queue it */ @@ -1702,7 +1704,7 @@ static int queue_rawinput_message( struct process* process, void *arg ) wparam = RIM_INPUTSINK; } - if (!(msg = alloc_hardware_message( raw_msg->data.info, raw_msg->source, raw_msg->time ))) + if (!(msg = alloc_hardware_message( raw_msg->data.info, raw_msg->source, raw_msg->time, raw_msg->extra_len ))) goto done; msg->win = device->target; @@ -1710,6 +1712,7 @@ static int queue_rawinput_message( struct process* process, void *arg ) msg->wparam = wparam; msg->lparam = 0; memcpy( msg->data, &raw_msg->data, sizeof(raw_msg->data) ); + if (raw_msg->extra) memcpy( (struct hardware_msg_data *)msg->data + 1, raw_msg->extra, raw_msg->extra_len ); if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && raw_msg->data.rawinput.type == RIM_TYPEHID) { @@ -1791,6 +1794,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; + raw_msg.extra = NULL; + raw_msg.extra_len = 0; msg_data = &raw_msg.data; msg_data->info = input->mouse.info; @@ -1816,7 +1821,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if (!(flags & (1 << i))) continue; flags &= ~(1 << i); - if (!(msg = alloc_hardware_message( input->mouse.info, source, time ))) return 0; + if (!(msg = alloc_hardware_message( input->mouse.info, source, time, 0 ))) return 0; msg_data = msg->data; msg->win = get_user_full_handle( win ); @@ -1926,6 +1931,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; + raw_msg.extra = NULL; + raw_msg.extra_len = 0; msg_data = &raw_msg.data; msg_data->info = input->kbd.info; @@ -1945,7 +1952,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c return 0; } - if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; + if (!(msg = alloc_hardware_message( input->kbd.info, source, time, 0 ))) return 0; msg_data = msg->data; msg->win = get_user_full_handle( win ); @@ -1993,6 +2000,8 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ raw_msg.source = source; raw_msg.time = get_tick_count(); raw_msg.message = input->hw.msg; + raw_msg.extra = NULL; + raw_msg.extra_len = 0; msg_data = &raw_msg.data; msg_data->info = 0; @@ -2005,7 +2014,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ return; } - if (!(msg = alloc_hardware_message( 0, source, get_tick_count() ))) return; + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; msg->win = get_user_full_handle( win ); msg->msg = input->hw.msg; -- 2.31.0

2 4