December 2018 - Wine-devel - list.winehq.org

[PATCH 6/7] webservices: Implement WsFlushBody.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/msg.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ada549c773..31c424b8f0 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -831,6 +831,33 @@ done: return hr; } +/************************************************************************** + * WsFlushBody [webservices.@] + */ +HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = WsFlushWriter( msg->writer_body, size, ctx, error ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *localname ) { const WS_XML_NODE *node; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index bd152b1ac3..c8db3a0375 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -46,7 +46,7 @@ @ stdcall WsFillBody(ptr long ptr ptr) @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) -@ stub WsFlushBody +@ stdcall WsFlushBody(ptr long ptr ptr) @ stdcall WsFlushWriter(ptr long ptr ptr) @ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr) -- 2.11.0

1 0

[PATCH 5/7] webservices: Allow calling WsAcceptChannel again with the same channel handle.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/listener.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index e06b39447f..de1abb557c 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -644,7 +644,10 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, return E_INVALIDARG; } - if (listener->state != WS_LISTENER_STATE_OPEN || listener->channel) hr = WS_E_INVALID_OPERATION; + if (listener->state != WS_LISTENER_STATE_OPEN || (listener->channel && listener->channel != channel_handle)) + { + hr = WS_E_INVALID_OPERATION; + } else { wait = listener->wait; -- 2.11.0

1 0

[PATCH 4/7] webservices: Use stream I/O for UDP and session-less TCP channel bindings.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 167 ++++++++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 72 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5394aa6c28..139e625a36 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1144,33 +1144,9 @@ done: return hr; } -static void set_blocking( SOCKET socket, BOOL blocking ) -{ - ULONG state = !blocking; - ioctlsocket( socket, FIONBIO, &state ); -} - -static int sock_recv( SOCKET socket, char *buf, int len ) -{ - int count, ret; - - if ((ret = recv( socket, buf, len, 0 )) <= 0) return ret; - len -= ret; - - set_blocking( socket, FALSE ); - for (;;) - { - if ((count = recv( socket, buf + ret, len, 0 )) <= 0) break; - ret += count; - len -= count; - } - set_blocking( socket, TRUE ); - return ret; -} - static HRESULT receive_bytes( struct channel *channel, unsigned char *bytes, int len ) { - int count = sock_recv( channel->u.tcp.socket, (char *)bytes, len ); + int count = recv( channel->u.tcp.socket, (char *)bytes, len, 0 ); if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); if (count != len) return WS_E_INVALID_FORMAT; return S_OK; @@ -1214,8 +1190,6 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) HRESULT hr; channel->msg = msg; - if ((hr = connect_channel( channel )) != S_OK) return hr; - WsGetMessageProperty( channel->msg, WS_MESSAGE_PROPERTY_BODY_WRITER, &writer, sizeof(writer), NULL ); WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &buf, sizeof(buf), NULL ); @@ -1232,7 +1206,7 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) return send_message_http( channel->u.http.request, buf.bytes, buf.length ); case WS_TCP_CHANNEL_BINDING: - if (channel->encoding == WS_ENCODING_XML_BINARY_SESSION_1) + if (channel->type & WS_CHANNEL_TYPE_SESSION) { switch (channel->session_state) { @@ -1249,10 +1223,10 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) return WS_E_OTHER; } } - return send_bytes( channel->u.tcp.socket, buf.bytes, buf.length ); + /* fall through */ case WS_UDP_CHANNEL_BINDING: - return send_bytes( channel->u.udp.socket, buf.bytes, buf.length ); + return WsFlushWriter( writer, 0, NULL, NULL ); default: ERR( "unhandled binding %u\n", channel->binding ); @@ -1273,7 +1247,7 @@ HRESULT channel_send_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) return E_INVALIDARG; } - hr = send_message( channel, msg ); + if ((hr = connect_channel( channel )) == S_OK) hr = send_message( channel, msg ); LeaveCriticalSection( &channel->cs ); return hr; @@ -1305,11 +1279,25 @@ 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 ) +{ + SOCKET socket = *(SOCKET *)state; + if (send( socket, (const char *)buf->bytes, buf->length, 0 ) < 0) + { + TRACE( "send failed %u\n", WSAGetLastError() ); + } + return S_OK; +} + static HRESULT init_writer( struct channel *channel ) { WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; + WS_XML_WRITER_STREAM_OUTPUT stream = {{WS_XML_WRITER_OUTPUT_TYPE_STREAM}}; WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; + const WS_XML_WRITER_ENCODING *encoding; + const WS_XML_WRITER_OUTPUT *output; WS_XML_WRITER_PROPERTY prop; ULONG max_size = (1 << 17); HRESULT hr; @@ -1322,19 +1310,33 @@ static HRESULT init_writer( struct channel *channel ) switch (channel->encoding) { case WS_ENCODING_XML_UTF8: - return WsSetOutput( channel->writer, &text.encoding, &buf.output, NULL, 0, NULL ); + encoding = &text.encoding; + if (channel->binding == WS_UDP_CHANNEL_BINDING || + (channel->binding == WS_TCP_CHANNEL_BINDING && !(channel->type & WS_CHANNEL_TYPE_SESSION))) + { + stream.writeCallback = write_callback; + stream.writeCallbackState = (channel->binding == WS_UDP_CHANNEL_BINDING) ? + &channel->u.udp.socket : &channel->u.tcp.socket; + output = &stream.output; + } + else output = &buf.output; + break; case WS_ENCODING_XML_BINARY_SESSION_1: bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; /* fall through */ case WS_ENCODING_XML_BINARY_1: - return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + encoding = &bin.encoding; + output = &buf.output; + break; default: FIXME( "unhandled encoding %u\n", channel->encoding ); return WS_E_NOT_SUPPORTED; } + + return WsSetOutput( channel->writer, encoding, output, NULL, 0, NULL ); } static HRESULT write_message( struct channel *channel, WS_MESSAGE *msg, const WS_ELEMENT_DESCRIPTION *desc, @@ -1378,6 +1380,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS 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 ); @@ -1419,6 +1422,7 @@ 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 ); @@ -1448,12 +1452,29 @@ static HRESULT resize_read_buffer( struct channel *channel, ULONG size ) return S_OK; } +static CALLBACK HRESULT read_callback( void *state, void *buf, ULONG buflen, ULONG *retlen, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + SOCKET socket = *(SOCKET *)state; + int ret; + + if ((ret = recv( socket, buf, buflen, 0 )) >= 0) *retlen = ret; + else + { + TRACE( "recv failed %u\n", WSAGetLastError() ); + *retlen = 0; + } + return S_OK; +} + static HRESULT init_reader( struct channel *channel ) { WS_XML_READER_BUFFER_INPUT buf = {{WS_XML_READER_INPUT_TYPE_BUFFER}}; + WS_XML_READER_STREAM_INPUT stream = {{WS_XML_READER_INPUT_TYPE_STREAM}}; WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}}; WS_XML_READER_BINARY_ENCODING bin = {{WS_XML_READER_ENCODING_TYPE_BINARY}}; - WS_XML_READER_ENCODING *encoding; + const WS_XML_READER_ENCODING *encoding; + const WS_XML_READER_INPUT *input; HRESULT hr; if (!channel->reader && (hr = WsCreateReader( NULL, 0, &channel->reader, NULL )) != S_OK) return hr; @@ -1463,6 +1484,21 @@ static HRESULT init_reader( struct channel *channel ) case WS_ENCODING_XML_UTF8: text.charSet = WS_CHARSET_UTF8; encoding = &text.encoding; + + if (channel->binding == WS_UDP_CHANNEL_BINDING || + (channel->binding == WS_TCP_CHANNEL_BINDING && !(channel->type & WS_CHANNEL_TYPE_SESSION))) + { + stream.readCallback = read_callback; + stream.readCallbackState = (channel->binding == WS_UDP_CHANNEL_BINDING) ? + &channel->u.udp.socket : &channel->u.tcp.socket; + input = &stream.input; + } + else + { + buf.encodedData = channel->read_buf; + buf.encodedDataSize = channel->read_size; + input = &buf.input; + } break; case WS_ENCODING_XML_BINARY_SESSION_1: @@ -1472,6 +1508,10 @@ static HRESULT init_reader( struct channel *channel ) case WS_ENCODING_XML_BINARY_1: encoding = &bin.encoding; + + buf.encodedData = channel->read_buf; + buf.encodedDataSize = channel->read_size; + input = &buf.input; break; default: @@ -1479,9 +1519,7 @@ static HRESULT init_reader( struct channel *channel ) return WS_E_NOT_SUPPORTED; } - buf.encodedData = channel->read_buf; - buf.encodedDataSize = channel->read_size; - return WsSetInput( channel->reader, encoding, &buf.input, NULL, 0, NULL ); + return WsSetInput( channel->reader, encoding, input, NULL, 0, NULL ); } #define INITIAL_READ_BUFFER_SIZE 4096 @@ -1515,26 +1553,6 @@ static HRESULT receive_message_http( struct channel *channel ) offset += bytes_read; } - return init_reader( channel ); -} - -static HRESULT receive_message_unsized( struct channel *channel, SOCKET socket ) -{ - int bytes_read; - ULONG max_len; - HRESULT hr; - - prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, - &max_len, sizeof(max_len) ); - - if ((hr = resize_read_buffer( channel, max_len )) != S_OK) return hr; - - channel->read_size = 0; - if ((bytes_read = sock_recv( socket, channel->read_buf, max_len )) < 0) - { - return HRESULT_FROM_WIN32( WSAGetLastError() ); - } - channel->read_size = bytes_read; return S_OK; } @@ -1549,7 +1567,7 @@ static HRESULT receive_message_sized( struct channel *channel, unsigned int size channel->read_size = 0; while (channel->read_size < size) { - if ((bytes_read = sock_recv( channel->u.tcp.socket, channel->read_buf + offset, to_read )) < 0) + if ((bytes_read = recv( channel->u.tcp.socket, channel->read_buf + offset, to_read, 0 )) < 0) { return HRESULT_FROM_WIN32( WSAGetLastError() ); } @@ -1798,14 +1816,7 @@ static HRESULT receive_message_session( struct channel *channel ) memmove( channel->read_buf, channel->read_buf + size, channel->read_size ); } - return init_reader( channel ); -} - -static HRESULT receive_message_sock( struct channel *channel, SOCKET socket ) -{ - HRESULT hr; - if ((hr = receive_message_unsized( channel, socket )) != S_OK) return hr; - return init_reader( channel ); + return S_OK; } static HRESULT receive_message_bytes( struct channel *channel ) @@ -1819,7 +1830,7 @@ static HRESULT receive_message_bytes( struct channel *channel ) return receive_message_http( channel ); case WS_TCP_CHANNEL_BINDING: - if (channel->encoding == WS_ENCODING_XML_BINARY_SESSION_1) + if (channel->type & WS_CHANNEL_TYPE_SESSION) { switch (channel->session_state) { @@ -1836,10 +1847,10 @@ static HRESULT receive_message_bytes( struct channel *channel ) return WS_E_OTHER; } } - return receive_message_sock( channel, channel->u.tcp.socket ); + return S_OK; /* nothing to do, data is read through stream callback */ case WS_UDP_CHANNEL_BINDING: - return receive_message_sock( channel, channel->u.udp.socket ); + return S_OK; default: ERR( "unhandled binding %u\n", channel->binding ); @@ -1860,7 +1871,7 @@ HRESULT channel_receive_message( WS_CHANNEL *handle ) return E_INVALIDARG; } - hr = receive_message_bytes( channel ); + if ((hr = receive_message_bytes( channel )) == S_OK) hr = init_reader( channel ); LeaveCriticalSection( &channel->cs ); return hr; @@ -1901,6 +1912,8 @@ static HRESULT receive_message( struct channel *channel, WS_MESSAGE *msg, const ULONG i; if ((hr = receive_message_bytes( channel )) != S_OK) return hr; + if ((hr = init_reader( channel )) != S_OK) return hr; + for (i = 0; i < count; i++) { const WS_ELEMENT_DESCRIPTION *body = desc[i]->bodyElementDescription; @@ -2012,6 +2025,7 @@ 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; @@ -2141,7 +2155,8 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS if ((hr = receive_message_bytes( channel )) == S_OK) { - hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); + if ((hr = init_reader( channel )) == S_OK) + hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); } LeaveCriticalSection( &channel->cs ); @@ -2202,6 +2217,7 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W return E_INVALIDARG; } + 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 ); @@ -2235,13 +2251,20 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ return E_INVALIDARG; } - if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message( channel, msg ); + if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK && (hr = connect_channel( channel ) == S_OK)) + hr = send_message( channel, msg ); LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); return hr; } +static void set_blocking( SOCKET socket, BOOL blocking ) +{ + ULONG state = !blocking; + ioctlsocket( socket, FIONBIO, &state ); +} + static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret ) { HANDLE handles[] = { wait, cancel }; -- 2.11.0

1 0

[PATCH 3/7] webservices: Add support for stream output.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 1 - dlls/webservices/tests/writer.c | 71 ++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 + dlls/webservices/writer.c | 98 ++++++++++++++++++++++++++++++---- include/webservices.h | 14 +++-- 6 files changed, 172 insertions(+), 16 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9a9d491730..270aecc220 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6921,7 +6921,6 @@ static void set_input_buffer( struct reader *reader, const unsigned char *data, reader->text_conv_offset = 0; } -#define STREAM_BUFSIZE 4096 static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, void *state ) { reader->input_type = WS_XML_READER_INPUT_TYPE_STREAM; diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index a55da605e8..8d189fd9e4 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -4685,6 +4685,76 @@ static void test_repeating_element_choice(void) WsFreeWriter( writer ); } +static const struct stream_test +{ + ULONG min_size; + ULONG ret_size; +} +stream_tests[] = +{ + { 0, 4 }, + { 1, 4 }, + { 4, 4 }, + { 5, 4 }, +}; + +static CALLBACK HRESULT write_callback( void *state, const WS_BYTES *buf, ULONG count, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + ULONG i = *(ULONG *)state; + ok( buf->length == stream_tests[i].ret_size, "%u: got %u\n", i, buf->length ); + ok( !memcmp( buf->bytes, "<t/>", stream_tests[i].ret_size ), "%u: wrong data\n", i ); + ok( count == 1, "%u: got %u\n", i, count ); + return S_OK; +} + +static void test_stream_output(void) +{ + static WS_XML_STRING str_ns = {0, NULL}, str_t = {1, (BYTE *)"t"}; + WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; + WS_XML_WRITER_STREAM_OUTPUT stream; + WS_XML_WRITER *writer; + HRESULT hr; + ULONG i = 0; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFlushWriter( writer, 0, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + stream.output.outputType = WS_XML_WRITER_OUTPUT_TYPE_STREAM; + stream.writeCallback = write_callback; + stream.writeCallbackState = &i; + hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsFlushWriter( writer, 0, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (i = 0; i < ARRAY_SIZE(stream_tests); i++) + { + stream.writeCallbackState = &i; + hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + hr = WsFlushWriter( writer, stream_tests[i].min_size, NULL, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + } + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -4728,4 +4798,5 @@ START_TEST(writer) test_union_type(); test_text_types_binary(); test_repeating_element_choice(); + test_stream_output(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index adad68dbdd..bd152b1ac3 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -47,7 +47,7 @@ @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody -@ stub WsFlushWriter +@ stdcall WsFlushWriter(ptr long ptr ptr) @ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr) @ stdcall WsFreeHeap(ptr) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b482b5ba20..6a6f65dbec 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,6 +18,8 @@ #include "winhttp.h" +#define STREAM_BUFSIZE 4096 + struct xmlbuf { WS_HEAP *heap; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0a28d9dc84..4f6cb60195 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -84,9 +84,12 @@ struct writer WS_XML_WRITER_ENCODING_TYPE output_enc; WS_CHARSET output_charset; WS_XML_WRITER_OUTPUT_TYPE output_type; + WS_WRITE_CALLBACK output_cb; + void *output_cb_state; struct xmlbuf *output_buf; BOOL output_buf_user; WS_HEAP *output_heap; + unsigned char *stream_buf; const WS_XML_DICTIONARY *dict; BOOL dict_do_lookup; WS_DYNAMIC_STRING_CALLBACK dict_cb; @@ -121,6 +124,7 @@ static void free_writer( struct writer *writer ) destroy_nodes( writer->root ); free_xml_string( writer->current_ns ); WsFreeHeap( writer->output_heap ); + heap_free( writer->stream_buf ); #ifndef __MINGW32__ writer->cs.DebugInfo->Spare[0] = 0; @@ -294,7 +298,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT return E_INVALIDARG; } - if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + if (writer->output_type != WS_XML_WRITER_OUTPUT_TYPE_BUFFER) hr = WS_E_INVALID_OPERATION; else { switch (id) @@ -346,6 +350,15 @@ static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf ) writer->write_pos = 0; } +static void set_output_stream( struct writer *writer, WS_WRITE_CALLBACK callback, void *state ) +{ + writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_STREAM; + writer->output_cb = callback; + writer->output_cb_state = state; + writer->write_bufptr = writer->stream_buf; + writer->write_pos = 0; +} + /************************************************************************** * WsSetOutput [webservices.@] */ @@ -384,7 +397,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING { case WS_XML_WRITER_ENCODING_TYPE_TEXT: { - WS_XML_WRITER_TEXT_ENCODING *text = (WS_XML_WRITER_TEXT_ENCODING *)encoding; + const WS_XML_WRITER_TEXT_ENCODING *text = (const WS_XML_WRITER_TEXT_ENCODING *)encoding; if (text->charSet != WS_CHARSET_UTF8) { FIXME( "charset %u not supported\n", text->charSet ); @@ -397,7 +410,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING } case WS_XML_WRITER_ENCODING_TYPE_BINARY: { - WS_XML_WRITER_BINARY_ENCODING *bin = (WS_XML_WRITER_BINARY_ENCODING *)encoding; + const WS_XML_WRITER_BINARY_ENCODING *bin = (const WS_XML_WRITER_BINARY_ENCODING *)encoding; writer->output_enc = WS_XML_WRITER_ENCODING_TYPE_BINARY; writer->output_charset = 0; writer->dict = bin->staticDictionary; @@ -426,6 +439,18 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING writer->output_buf_user = FALSE; break; } + case WS_XML_WRITER_OUTPUT_TYPE_STREAM: + { + const WS_XML_WRITER_STREAM_OUTPUT *stream = (const WS_XML_WRITER_STREAM_OUTPUT *)output; + if (!writer->stream_buf && !(writer->stream_buf = heap_alloc( STREAM_BUFSIZE ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + set_output_stream( writer, stream->writeCallback, stream->writeCallbackState ); + break; + + } default: FIXME( "output type %u not supported\n", output->outputType ); hr = E_NOTIMPL; @@ -489,12 +514,63 @@ done: return hr; } +static HRESULT flush_writer( struct writer *writer, ULONG min_size, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + WS_BYTES buf; + + if (writer->write_pos < min_size) return S_OK; + + buf.bytes = writer->write_bufptr; + buf.length = writer->write_pos; + writer->output_cb( writer->output_cb_state, &buf, 1, ctx, error ); + writer->write_pos = 0; + return S_OK; +} + +/************************************************************************** + * WsFlushWriter [webservices.@] + */ +HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (writer->output_type != WS_XML_WRITER_OUTPUT_TYPE_STREAM) hr = WS_E_INVALID_OPERATION; + else hr = flush_writer( writer, min_size, ctx, error ); + + LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + static HRESULT write_grow_buffer( struct writer *writer, ULONG size ) { struct xmlbuf *buf = writer->output_buf; SIZE_T new_size; void *tmp; + if (writer->output_type == WS_XML_WRITER_OUTPUT_TYPE_STREAM) + { + if (size > STREAM_BUFSIZE) return WS_E_QUOTA_EXCEEDED; + return flush_writer( writer, STREAM_BUFSIZE - size, NULL, NULL ); + } + if (buf->size >= writer->write_pos + size) { buf->bytes.length = writer->write_pos + size; @@ -2047,7 +2123,7 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING } /* flush current start element if necessary */ -static HRESULT write_flush( struct writer *writer ) +static HRESULT write_commit( struct writer *writer ) { if (writer->state == WRITER_STATE_STARTELEMENT) { @@ -2089,7 +2165,7 @@ static HRESULT write_cdata( struct writer *writer ) static HRESULT write_cdata_node( struct writer *writer ) { HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if ((hr = write_add_cdata_node( writer )) != S_OK) return hr; if ((hr = write_add_endcdata_node( writer )) != S_OK) return hr; if ((hr = write_cdata( writer )) != S_OK) return hr; @@ -2220,7 +2296,7 @@ static HRESULT write_element_node( struct writer *writer, const WS_XML_STRING *p const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if ((hr = write_add_element_node( writer, prefix, localname, ns )) != S_OK) return hr; if ((hr = write_add_endelement_node( writer, writer->current )) != S_OK) return hr; writer->state = WRITER_STATE_STARTELEMENT; @@ -2826,7 +2902,7 @@ static HRESULT write_text_node( struct writer *writer, const WS_XML_TEXT *text ) ULONG offset = 0; HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if (node_type( writer->current ) != WS_XML_NODE_TYPE_TEXT) { if ((hr = write_add_text_node( writer, text )) != S_OK) return hr; @@ -4158,7 +4234,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W goto done; } - if ((hr = write_flush( writer )) != S_OK) goto done; + if ((hr = write_commit( writer )) != S_OK) goto done; if ((hr = write_grow_buffer( writer, xmlbuf->bytes.length )) != S_OK) goto done; write_bytes( writer, xmlbuf->bytes.bytes, xmlbuf->bytes.length ); @@ -4261,7 +4337,7 @@ static HRESULT write_qualified_name( struct writer *writer, const WS_XML_STRING WS_XML_QNAME_TEXT qname = {{WS_XML_TEXT_TYPE_QNAME}}; HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if (!prefix && ((hr = find_prefix( writer, ns, &prefix )) != S_OK)) return hr; qname.prefix = (WS_XML_STRING *)prefix; @@ -4398,7 +4474,7 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found return E_INVALIDARG; } - if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + if (writer->output_type != WS_XML_WRITER_OUTPUT_TYPE_BUFFER) hr = WS_E_INVALID_OPERATION; else hr = write_move_to( writer, move, found ); LeaveCriticalSection( &writer->cs ); @@ -4526,7 +4602,7 @@ static HRESULT write_comment( struct writer *writer ) static HRESULT write_comment_node( struct writer *writer, const WS_XML_STRING *value ) { HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if ((hr = write_add_comment_node( writer, value )) != S_OK) return hr; if ((hr = write_comment( writer )) != S_OK) return hr; writer->state = WRITER_STATE_COMMENT; diff --git a/include/webservices.h b/include/webservices.h index 69e3c8a276..a6018d5d25 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -296,15 +296,21 @@ typedef struct _WS_ASYNC_CONTEXT { typedef HRESULT (CALLBACK *WS_READ_CALLBACK) (void*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); -typedef HRESULT (CALLBACK *WS_WRITE_CALLBACK) - (void*, const WS_BYTES*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); - typedef struct _WS_XML_READER_STREAM_INPUT { WS_XML_READER_INPUT input; WS_READ_CALLBACK readCallback; void *readCallbackState; } WS_XML_READER_STREAM_INPUT; +typedef HRESULT (CALLBACK *WS_WRITE_CALLBACK) + (void*, const WS_BYTES*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef struct _WS_XML_WRITER_STREAM_OUTPUT { + WS_XML_WRITER_OUTPUT output; + WS_WRITE_CALLBACK writeCallback; + void *writeCallbackState; +} WS_XML_WRITER_STREAM_OUTPUT; + typedef enum { WS_ELEMENT_TYPE_MAPPING = 1, WS_ATTRIBUTE_TYPE_MAPPING = 2, @@ -1626,6 +1632,8 @@ HRESULT WINAPI WsFillBody(WS_MESSAGE*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR* HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*); +HRESULT WINAPI WsFlushBody(WS_MESSAGE*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsFlushWriter(WS_XML_WRITER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); void WINAPI WsFreeChannel(WS_CHANNEL*); void WINAPI WsFreeError(WS_ERROR*); void WINAPI WsFreeHeap(WS_HEAP*); -- 2.11.0

1 0

[PATCH 2/7] webservices: Properly check the input buffer type in WsMoveReader.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ba6a951e9c..9a9d491730 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -653,6 +653,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!reader) return E_INVALIDARG; @@ -3582,7 +3583,7 @@ HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found return E_INVALIDARG; } - if (!reader->input_type) hr = WS_E_INVALID_OPERATION; + if (reader->input_type != WS_XML_READER_INPUT_TYPE_BUFFER) hr = WS_E_INVALID_OPERATION; else hr = read_move_to( reader, move, found ); LeaveCriticalSection( &reader->cs ); @@ -6982,8 +6983,8 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { if (input->inputType == WS_XML_READER_INPUT_TYPE_BUFFER) { - WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + const WS_XML_READER_TEXT_ENCODING *text = (const WS_XML_READER_TEXT_ENCODING *)encoding; + const WS_XML_READER_BUFFER_INPUT *buf = (const WS_XML_READER_BUFFER_INPUT *)input; if (text->charSet != WS_CHARSET_AUTO) reader->input_charset = text->charSet; else reader->input_charset = detect_charset( buf->encodedData, buf->encodedDataSize, &offset ); } @@ -6993,7 +6994,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * } case WS_XML_READER_ENCODING_TYPE_BINARY: { - WS_XML_READER_BINARY_ENCODING *bin = (WS_XML_READER_BINARY_ENCODING *)encoding; + const WS_XML_READER_BINARY_ENCODING *bin = (const WS_XML_READER_BINARY_ENCODING *)encoding; reader->input_enc = WS_XML_READER_ENCODING_TYPE_BINARY; reader->input_charset = 0; reader->dict_static = bin->staticDictionary ? bin->staticDictionary : &dict_builtin_static.dict; @@ -7010,13 +7011,13 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { case WS_XML_READER_INPUT_TYPE_BUFFER: { - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + const WS_XML_READER_BUFFER_INPUT *buf = (const WS_XML_READER_BUFFER_INPUT *)input; set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); break; } case WS_XML_READER_INPUT_TYPE_STREAM: { - WS_XML_READER_STREAM_INPUT *stream = (WS_XML_READER_STREAM_INPUT *)input; + const WS_XML_READER_STREAM_INPUT *stream = (const WS_XML_READER_STREAM_INPUT *)input; if (!reader->stream_buf && !(reader->stream_buf = heap_alloc( STREAM_BUFSIZE ))) { hr = E_OUTOFMEMORY; -- 2.11.0

1 0

[PATCH 1/7] webservices: Implement WsFillBody.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/msg.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e28baa2693..ada549c773 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -999,6 +999,33 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des } /************************************************************************** + * WsFillBody [webservices.@] + */ +HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = WsFillReader( msg->reader_body, size, ctx, error ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + +/************************************************************************** * WsInitializeMessage [webservices.@] */ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 30c97e3473..adad68dbdd 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -43,7 +43,7 @@ @ stub WsEndReaderCanonicalization @ stub WsEndWriterCanonicalization @ stdcall WsFileTimeToDateTime(ptr ptr ptr) -@ stub WsFillBody +@ stdcall WsFillBody(ptr long ptr ptr) @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody diff --git a/include/webservices.h b/include/webservices.h index 6cafcc63d6..69e3c8a276 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1622,6 +1622,7 @@ HRESULT WINAPI WsDateTimeToFileTime(const WS_DATETIME*, FILETIME*, WS_ERROR*); HRESULT WINAPI WsDecodeUrl(const WS_STRING*, ULONG, WS_HEAP*, WS_URL**, WS_ERROR*); HRESULT WINAPI WsEncodeUrl(const WS_URL*, ULONG, WS_HEAP*, WS_STRING*, WS_ERROR*); HRESULT WINAPI WsFileTimeToDateTime(const FILETIME*, WS_DATETIME*, WS_ERROR*); +HRESULT WINAPI WsFillBody(WS_MESSAGE*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*); -- 2.11.0

1 0

[PATCH] wineserver: fix debug registers on NetBSD
by Frédéric Fauberteau 04 Dec '18

04 Dec '18

Add a #ifdef to deal with NetBSD specific debug register structure. Debug register structure on NetBSD for x86 (/usr/include/<arch>/reg.h) is: struct dbreg { int dr[<nb>]; } with nb=8 on i386 and nb=16 on amd64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46229 Signed-off-by: Frédéric Fauberteau <triaxx(a)NetBSD.org> --- server/ptrace.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/ptrace.c b/server/ptrace.c index 4eda8ebec3..808328ecbc 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -720,6 +720,13 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int context->debug.i386_regs.dr3 = DBREG_DRX((&dbregs), 3); context->debug.i386_regs.dr6 = DBREG_DRX((&dbregs), 6); context->debug.i386_regs.dr7 = DBREG_DRX((&dbregs), 7); +#elif defined(__NetBSD__) + context->debug.i386_regs.dr0 = dbregs.dr[0]; + context->debug.i386_regs.dr1 = dbregs.dr[1]; + context->debug.i386_regs.dr2 = dbregs.dr[2]; + context->debug.i386_regs.dr3 = dbregs.dr[3]; + context->debug.i386_regs.dr6 = dbregs.dr[6]; + context->debug.i386_regs.dr7 = dbregs.dr[7]; #else context->debug.i386_regs.dr0 = dbregs.dr0; context->debug.i386_regs.dr1 = dbregs.dr1; @@ -754,6 +761,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign DBREG_DRX((&dbregs), 5) = 0; DBREG_DRX((&dbregs), 6) = context->debug.i386_regs.dr6; DBREG_DRX((&dbregs), 7) = context->debug.i386_regs.dr7; +#elif defined(__NetBSD__) + dbregs.dr[0] = context->debug.i386_regs.dr0; + dbregs.dr[1] = context->debug.i386_regs.dr1; + dbregs.dr[2] = context->debug.i386_regs.dr2; + dbregs.dr[3] = context->debug.i386_regs.dr3; + dbregs.dr[4] = 0; + dbregs.dr[5] = 0; + dbregs.dr[6] = context->debug.i386_regs.dr6; + dbregs.dr[7] = context->debug.i386_regs.dr7; #else dbregs.dr0 = context->debug.i386_regs.dr0; dbregs.dr1 = context->debug.i386_regs.dr1; -- 2.19.2

1 0

[PATCH v6 1/7] comctl32/listbox: Check for out of bounds index using an unsigned index
by Gabriel Ivăncescu 04 Dec '18

04 Dec '18

Needed for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..71f1c05 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -489,7 +489,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) * Paint an item. */ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, - INT index, UINT action, BOOL ignoreFocus ) + UINT index, UINT action, BOOL ignoreFocus ) { BOOL selected = FALSE, focused; LB_ITEMDATA *item = NULL; @@ -508,7 +508,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); -- 2.19.1

2 8

[PATCH] ntdll: Add stub for RtlGetUnloadEventTraceEx.
by Alex Henrie 04 Dec '18

04 Dec '18

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44897 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Patch from Wine Staging with minor changes. https://raw.githubusercontent.com/wine-staging/wine-staging/master/patches/… --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3741eb9397..c2e2fb1c66 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -681,6 +681,7 @@ # @ stub RtlGetSetBootStatusData @ stdcall RtlGetThreadErrorMode() @ stdcall RtlGetUnloadEventTrace() +@ stdcall RtlGetUnloadEventTraceEx(ptr ptr ptr) @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index e80aa5e324..393bd27b1a 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1679,6 +1679,20 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) return NULL; } +/********************************************************************* + * RtlGetUnloadEventTraceEx [NTDLL.@] + */ +void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) +{ + static ULONG dummy_size, dummy_count; + + FIXME("(%p, %p, %p): stub!\n", size, count, trace); + + if (size) *size = &dummy_size; + if (count) *count = &dummy_count; + if (trace) *trace = NULL; +} + /********************************************************************* * RtlQueryPackageIdentity [NTDLL.@] */ -- 2.19.2

1 0

[PATCH v2] ieframe: Turn several variables into static constants
by Alex Henrie 04 Dec '18

04 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Keep using lstrlenW for the URL itself --- dlls/ieframe/intshcut.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 4331bb9b0a..8bf8ae8702 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -456,11 +456,11 @@ static HRESULT get_profile_string(LPCWSTR lpAppName, LPCWSTR lpKeyName, static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileName, DWORD dwMode) { + static const WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; + static const WCHAR str_URL[] = {'U','R','L',0}; + static const WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; + static const WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; InternetShortcut *This = impl_from_IPersistFile(pFile); - static WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; - static WCHAR str_URL[] = {'U','R','L',0}; - static WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; - static WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; WCHAR *filename = NULL; WCHAR *url; HRESULT hr; @@ -573,12 +573,12 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam file = CreateFileW(pszFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { + static const char str_header[] = "[InternetShortcut]"; + static const char str_URL[] = "URL="; + static const char str_ICONFILE[] = "ICONFILE="; + static const char str_eol[] = "\r\n"; DWORD bytesWritten; char *iconfile; - char str_header[] = "[InternetShortcut]"; - char str_URL[] = "URL="; - char str_ICONFILE[] = "ICONFILE="; - char str_eol[] = "\r\n"; IPropertyStorage *pPropStgRead; PROPSPEC ps[2]; PROPVARIANT pvread[2]; @@ -587,11 +587,11 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam ps[1].ulKind = PRSPEC_PROPID; ps[1].u.propid = PID_IS_ICONINDEX; - WriteFile(file, str_header, lstrlenA(str_header), &bytesWritten, NULL); - WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); - WriteFile(file, str_URL, lstrlenA(str_URL), &bytesWritten, NULL); + WriteFile(file, str_header, ARRAY_SIZE(str_header) - 1, &bytesWritten, NULL); + WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); + WriteFile(file, str_URL, ARRAY_SIZE(str_URL) - 1, &bytesWritten, NULL); WriteFile(file, url, lstrlenA(url), &bytesWritten, NULL); - WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, STGM_READ|STGM_SHARE_EXCLUSIVE, &pPropStgRead); if (SUCCEEDED(hr)) -- 2.19.2

1 0