November 2018 - Wine-Devel - list.winehq.org

[PATCH v4] server: Release of related atoms when destroying a, window class
by Ralf Habacker Nov. 27, 2018

Nov. 27, 2018

1 0

[PATCH v2] server: Release related atoms when destroying a window class
by Ralf Habacker Nov. 27, 2018

Nov. 27, 2018

3 6

[PATCH v3] server: Release of related atoms when destroying a, window class
by Ralf Habacker Nov. 27, 2018

Nov. 27, 2018

1 0

[PATCH 6/6] webservices: Add support for stream input.
by Hans Leidekker Nov. 27, 2018

Nov. 27, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 202 ++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 106 +++++++++++++++++++++ 2 files changed, 249 insertions(+), 59 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index cbce1f6afb..ba6a951e9c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -390,10 +390,13 @@ struct reader WS_XML_READER_ENCODING_TYPE input_enc; WS_CHARSET input_charset; WS_XML_READER_INPUT_TYPE input_type; + WS_READ_CALLBACK input_cb; + void *input_cb_state; struct xmlbuf *input_buf; const unsigned char *input_data; ULONG input_size; ULONG text_conv_offset; + unsigned char *stream_buf; const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; ULONG prop_count; @@ -515,6 +518,7 @@ static void free_reader( struct reader *reader ) destroy_nodes( reader->root ); clear_prefixes( reader->prefixes, reader->nb_prefixes ); heap_free( reader->prefixes ); + heap_free( reader->stream_buf ); #ifndef __MINGW32__ reader->cs.DebugInfo->Spare[0] = 0; @@ -615,6 +619,29 @@ void WINAPI WsFreeReader( WS_XML_READER *handle ) free_reader( reader ); } +static HRESULT read_more_data( struct reader *reader, ULONG min_size, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + ULONG size = 0, max_size; + + if (reader->read_size - reader->read_pos >= min_size) return S_OK; + if (reader->input_type != WS_XML_READER_INPUT_TYPE_STREAM) return WS_E_INVALID_FORMAT; + if (min_size > reader->input_size) return WS_E_QUOTA_EXCEEDED; + + if (min_size > reader->input_size - reader->read_pos) + { + memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); + reader->read_size -= reader->read_pos; + reader->read_pos = 0; + } + max_size = reader->input_size - reader->read_size; + + reader->input_cb( reader->input_cb_state, reader->stream_buf + reader->read_size, max_size, &size, ctx, error ); + if (size < min_size) return WS_E_QUOTA_EXCEEDED; + reader->read_size += size; + return S_OK; +} + /************************************************************************** * WsFillReader [webservices.@] */ @@ -622,7 +649,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; - HRESULT hr = S_OK; + HRESULT hr; TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -637,9 +664,16 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY return E_INVALIDARG; } - /* FIXME: add support for stream input */ - reader->read_size = min( min_size, reader->input_size ); - reader->read_pos = 0; + if (reader->input_type == WS_XML_READER_INPUT_TYPE_STREAM) + { + hr = read_more_data( reader, min_size, ctx, error ); + } + else + { + reader->read_size = min( min_size, reader->input_size ); + reader->read_pos = 0; + hr = S_OK; + } LeaveCriticalSection( &reader->cs ); TRACE( "returning %08x\n", hr ); @@ -931,7 +965,7 @@ WS_XML_DATETIME_TEXT *alloc_datetime_text( const WS_DATETIME *value ) static inline BOOL read_end_of_data( struct reader *reader ) { - return reader->read_pos >= reader->read_size; + return (read_more_data( reader, 1, NULL, NULL ) != S_OK); } static inline const unsigned char *read_current_ptr( struct reader *reader ) @@ -939,25 +973,35 @@ static inline const unsigned char *read_current_ptr( struct reader *reader ) return &reader->read_bufptr[reader->read_pos]; } +static inline void read_skip( struct reader *reader, unsigned int count ) +{ + assert( reader->read_pos + count <= reader->read_size ); + reader->read_pos += count; +} + static inline HRESULT read_peek( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; - memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); + HRESULT hr; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + memcpy( bytes, read_current_ptr( reader ), len ); return S_OK; } static inline HRESULT read_byte( struct reader *reader, unsigned char *byte ) { - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - *byte = reader->read_bufptr[reader->read_pos++]; + HRESULT hr; + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + *byte = *read_current_ptr( reader ); + read_skip( reader, 1 ); return S_OK; } static inline HRESULT read_bytes( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; - memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); - reader->read_pos += len; + HRESULT hr; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + memcpy( bytes, read_current_ptr( reader ), len ); + read_skip( reader, len ); return S_OK; } @@ -985,20 +1029,22 @@ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, unsigned int *skip ) { unsigned int len; - unsigned char ch = reader->read_bufptr[reader->read_pos]; + unsigned char ch; const unsigned char *end; + HRESULT hr; - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + ch = *read_current_ptr( reader ); if (ch < 0x80) { *ret = ch; *skip = 1; return S_OK; } + len = utf8_length[ch - 0x80]; - if (reader->read_pos + len >= reader->read_size) return WS_E_INVALID_FORMAT; - end = reader->read_bufptr + reader->read_pos + len + 1; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + end = read_current_ptr( reader ) + len + 1; *ret = ch & utf8_mask[len]; switch (len) @@ -1020,12 +1066,6 @@ static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, return WS_E_INVALID_FORMAT; } -static inline void read_skip( struct reader *reader, unsigned int count ) -{ - if (reader->read_pos + count > reader->read_size) return; - reader->read_pos += count; -} - static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1042,16 +1082,22 @@ static inline BOOL read_isspace( unsigned int ch ) static inline void read_skip_whitespace( struct reader *reader ) { - while (reader->read_pos < reader->read_size && read_isspace( reader->read_bufptr[reader->read_pos] )) - reader->read_pos++; + for (;;) + { + if (read_more_data( reader, 1, NULL, NULL ) != S_OK || !read_isspace( *read_current_ptr( reader ) )) break; + read_skip( reader, 1 ); + } } static inline HRESULT read_cmp( struct reader *reader, const char *str, int len ) { - const unsigned char *ptr = read_current_ptr( reader ); + const unsigned char *ptr; + HRESULT hr; if (len < 0) len = strlen( str ); - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + + ptr = read_current_ptr( reader ); while (len--) { if (*str != *ptr) return WS_E_INVALID_FORMAT; @@ -1064,9 +1110,8 @@ static HRESULT read_xmldecl( struct reader *reader ) { HRESULT hr; - if (!reader->read_size) return WS_E_INVALID_FORMAT; - - if (read_cmp( reader, "<", 1 ) != S_OK || read_cmp( reader, "<?", 2 ) != S_OK) + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + if (*read_current_ptr( reader ) != '<' || (hr = read_cmp( reader, "<?", 2 ) != S_OK)) { reader->state = READER_STATE_BOF; return S_OK; @@ -1075,8 +1120,11 @@ static HRESULT read_xmldecl( struct reader *reader ) read_skip( reader, 6 ); /* FIXME: parse attributes */ - while (reader->read_pos < reader->read_size && reader->read_bufptr[reader->read_pos] != '?') - reader->read_pos++; + for (;;) + { + if (read_more_data( reader, 1, NULL, NULL ) != S_OK || *read_current_ptr( reader ) == '?' ) break; + read_skip( reader, 1 ); + } if ((hr = read_cmp( reader, "?>", 2 )) != S_OK) return hr; read_skip( reader, 2 ); @@ -6829,19 +6877,15 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI static inline BOOL is_utf8( const unsigned char *data, ULONG size, ULONG *offset ) { static const char bom[] = {0xef,0xbb,0xbf}; - const unsigned char *p = data; - - return (size >= sizeof(bom) && !memcmp( p, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || + return (size >= sizeof(bom) && !memcmp( data, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || (size > 2 && !(*offset = 0)); } static inline BOOL is_utf16le( const unsigned char *data, ULONG size, ULONG *offset ) { static const char bom[] = {0xff,0xfe}; - const unsigned char *p = data; - - return (size >= sizeof(bom) && !memcmp( p, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || - (size >= 4 && p[0] == '<' && !p[1] && !(*offset = 0)); + return (size >= sizeof(bom) && !memcmp( data, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || + (size >= 4 && data[0] == '<' && !data[1] && !(*offset = 0)); } static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG *offset ) @@ -6862,10 +6906,10 @@ static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG * return ret; } -static void set_input_buffer( struct reader *reader, struct xmlbuf *buf, const unsigned char *data, ULONG size ) +static void set_input_buffer( struct reader *reader, const unsigned char *data, ULONG size ) { reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; - reader->input_buf = buf; + reader->input_buf = NULL; reader->input_data = data; reader->input_size = size; @@ -6876,6 +6920,28 @@ static void set_input_buffer( struct reader *reader, struct xmlbuf *buf, const u 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; + reader->input_cb = callback; + reader->input_cb_state = state; + reader->input_buf = NULL; + reader->input_data = reader->stream_buf; + reader->input_size = STREAM_BUFSIZE; + + if (reader->read_pos >= reader->read_size) reader->read_size = 0; + else + { + memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); + reader->read_size -= reader->read_pos; + } + reader->read_pos = 0; + reader->read_bufptr = reader->input_data; + + reader->text_conv_offset = 0; +} + /************************************************************************** * WsSetInput [webservices.@] */ @@ -6914,19 +6980,14 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { case WS_XML_READER_ENCODING_TYPE_TEXT: { - WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; - - if (input->inputType != WS_XML_READER_INPUT_TYPE_BUFFER) + if (input->inputType == WS_XML_READER_INPUT_TYPE_BUFFER) { - FIXME( "charset detection on input type %u not supported\n", input->inputType ); - hr = E_NOTIMPL; - goto done; + WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; + WS_XML_READER_BUFFER_INPUT *buf = (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 ); } - if (text->charSet != WS_CHARSET_AUTO) reader->input_charset = text->charSet; - else reader->input_charset = detect_charset( buf->encodedData, buf->encodedDataSize, &offset ); - reader->input_enc = WS_XML_READER_ENCODING_TYPE_TEXT; break; } @@ -6950,8 +7011,18 @@ 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; - set_input_buffer( reader, NULL, (const unsigned char *)buf->encodedData + offset, - buf->encodedDataSize - offset ); + 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; + if (!reader->stream_buf && !(reader->stream_buf = heap_alloc( STREAM_BUFSIZE ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + set_input_stream( reader, stream->readCallback, stream->readCallbackState ); break; } default: @@ -6969,6 +7040,24 @@ done: return hr; } +static void set_input_xml_buffer( struct reader *reader, struct xmlbuf *buf ) +{ + reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; + reader->input_buf = buf; + reader->input_enc = buf->encoding; + reader->input_charset = buf->charset; + reader->input_data = buf->bytes.bytes; + reader->input_size = buf->bytes.length; + reader->dict_static = buf->dict_static; + reader->dict = buf->dict; + + reader->read_size = reader->input_size; + reader->read_pos = 0; + reader->read_bufptr = reader->input_data; + + reader->text_conv_offset = 0; +} + /************************************************************************** * WsSetInputToBuffer [webservices.@] */ @@ -7003,12 +7092,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, } if ((hr = init_reader( reader )) != S_OK) goto done; - - reader->input_enc = xmlbuf->encoding; - reader->input_charset = xmlbuf->charset; - reader->dict_static = xmlbuf->dict_static; - reader->dict = xmlbuf->dict; - set_input_buffer( reader, xmlbuf, xmlbuf->bytes.bytes, xmlbuf->bytes.length ); + set_input_xml_buffer( reader, xmlbuf ); if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; else read_insert_bof( reader, node ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index b21e8396be..2b0475fddf 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -6689,6 +6689,111 @@ static void test_empty_text_field(void) WsFreeHeap( heap ); } +static const char stream_utf8[] = {0xef,0xbb,0xbf,'<','t','/','>',0}; +static const struct stream_test +{ + const char *xml; + HRESULT hr; + int todo; +} +stream_tests[] = +{ + { "", WS_E_QUOTA_EXCEEDED }, + { "<?xml version=\"1.0\" encoding=\"utf-8\"?><t/>", S_OK }, + { "<t/>", S_OK }, + { stream_utf8, S_OK, 1 }, +}; + +static CALLBACK HRESULT read_callback( void *state, void *buf, ULONG buflen, ULONG *retlen, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct stream_test *test = state; + ULONG len = strlen( test->xml ); + + ok( state != NULL, "NULL state\n" ); + ok( buf != NULL, "NULL buf\n" ); + ok( buflen > 0, "zero buflen\n" ); + ok( retlen != NULL, "NULL retlen\n" ); + if (buflen < len) return WS_E_QUOTA_EXCEEDED; + memcpy( buf, test->xml, len ); + *retlen = len; + return S_OK; +} + +static void test_stream_input(void) +{ + static WS_XML_STRING str_ns = {0, NULL}, str_t = {1, (BYTE *)"t"}; + WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}}; + WS_XML_READER_STREAM_INPUT stream; + WS_XML_READER *reader; + const WS_XML_NODE *node; + WS_CHARSET charset; + HRESULT hr; + BOOL found; + ULONG i, size; + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + stream.input.inputType = WS_XML_READER_INPUT_TYPE_STREAM; + stream.readCallback = read_callback; + stream.readCallbackState = (void *)&stream_tests[2]; + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + size = sizeof(charset); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); + todo_wine ok( hr == WS_E_QUOTA_EXCEEDED, "got %08x\n", hr ); + + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, strlen(stream_tests[2].xml), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + charset = 0xdeadbeef; + size = sizeof(charset); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); + + found = -1; + hr = WsReadToStartElement( reader, &str_t, &str_ns, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (i = 0; i < ARRAY_SIZE(stream_tests); i++) + { + stream.readCallbackState = (void *)&stream_tests[i]; + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsFillReader( reader, strlen( stream_tests[i].xml ), NULL, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + found = -1; + hr = WsReadToStartElement( reader, &str_t, &str_ns, &found, NULL ); + todo_wine_if(stream_tests[i].todo) ok( hr == stream_tests[i].hr, "%u: got %08x\n", i, hr ); + if (hr == S_OK) + { + ok( found == TRUE, "%u: got %d\n", i, found ); + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "%u: got %u\n", i, node->nodeType ); + } + } + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -6738,4 +6843,5 @@ START_TEST(reader) test_float(); test_repeating_element_choice(); test_empty_text_field(); + test_stream_input(); } -- 2.11.0

1 0

[PATCH 5/6] webservices: Return HRESULT from read_utf8_char.
by Hans Leidekker Nov. 27, 2018

Nov. 27, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 57 +++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ff19254640..cbce1f6afb 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -982,41 +982,42 @@ static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; /* minimum Unicode value depending on UTF-8 sequence length */ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; -static inline unsigned int read_utf8_char( struct reader *reader, unsigned int *skip ) +static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, unsigned int *skip ) { - unsigned int len, res; + unsigned int len; unsigned char ch = reader->read_bufptr[reader->read_pos]; const unsigned char *end; - if (reader->read_pos >= reader->read_size) return 0; + if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; if (ch < 0x80) { + *ret = ch; *skip = 1; - return ch; + return S_OK; } len = utf8_length[ch - 0x80]; - if (reader->read_pos + len >= reader->read_size) return 0; + if (reader->read_pos + len >= reader->read_size) return WS_E_INVALID_FORMAT; end = reader->read_bufptr + reader->read_pos + len + 1; - res = ch & utf8_mask[len]; + *ret = ch & utf8_mask[len]; switch (len) { case 3: if ((ch = end[-3] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 2: if ((ch = end[-2] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 1: if ((ch = end[-1] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; - if (res < utf8_minval[len]) break; + *ret = (*ret << 6) | ch; + if (*ret < utf8_minval[len]) break; *skip = len + 1; - return res; + return S_OK; } - return 0; + return WS_E_INVALID_FORMAT; } static inline void read_skip( struct reader *reader, unsigned int count ) @@ -1303,14 +1304,14 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT read_skip_whitespace( reader ); if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; - quote = read_utf8_char( reader, &skip ); + if ((hr = read_utf8_char( reader, &quote, &skip )) != S_OK) return hr; read_skip( reader, 1 ); len = 0; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == quote) break; read_skip( reader, skip ); len += skip; @@ -1651,19 +1652,23 @@ static HRESULT read_attribute_text( struct reader *reader, WS_XML_ATTRIBUTE **re unsigned int len = 0, ch, skip; const unsigned char *start; WS_XML_STRING *prefix, *localname; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if ((hr = parse_qname( start, len, &prefix, &localname )) != S_OK) goto error; if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) @@ -1953,16 +1958,19 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; - hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if (!(parent = find_parent( reader ))) goto error; if ((hr = parse_qname( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; @@ -2107,7 +2115,7 @@ static HRESULT read_text_text( struct reader *reader ) for (;;) { if (read_end_of_data( reader )) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '<') break; read_skip( reader, skip ); len += skip; @@ -2741,7 +2749,7 @@ static HRESULT read_endelement_text( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '>') { read_skip( reader, 1 ); @@ -2821,7 +2829,7 @@ static HRESULT read_comment_text( struct reader *reader ) read_skip( reader, 3 ); break; } - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; } @@ -2907,12 +2915,13 @@ static HRESULT read_cdata( struct reader *reader ) struct node *node; WS_XML_TEXT_NODE *text; WS_XML_UTF8_TEXT *utf8; + HRESULT hr; start = read_current_ptr( reader ); for (;;) { if (read_cmp( reader, "]]>", 3 ) == S_OK) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; } -- 2.11.0

1 0

[PATCH 4/6] webservices: Get rid of read_rewind.
by Hans Leidekker Nov. 27, 2018

Nov. 27, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b573153c97..ff19254640 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -939,10 +939,10 @@ static inline const unsigned char *read_current_ptr( struct reader *reader ) return &reader->read_bufptr[reader->read_pos]; } -static inline HRESULT read_peek( struct reader *reader, unsigned char *byte ) +static inline HRESULT read_peek( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - *byte = reader->read_bufptr[reader->read_pos]; + if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; + memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); return S_OK; } @@ -1025,11 +1025,6 @@ static inline void read_skip( struct reader *reader, unsigned int count ) reader->read_pos += count; } -static inline void read_rewind( struct reader *reader, unsigned int count ) -{ - reader->read_pos -= count; -} - static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1938,6 +1933,7 @@ static HRESULT read_element_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; + unsigned char buf[2]; struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; HRESULT hr; @@ -1950,13 +1946,9 @@ static HRESULT read_element_text( struct reader *reader ) return S_OK; } - if ((hr = read_cmp( reader, "<", 1 )) != S_OK) return hr; + if ((hr = read_peek( reader, buf, 2 )) != S_OK) return hr; + if (buf[0] != '<' || !read_isnamechar( buf[1] )) return WS_E_INVALID_FORMAT; read_skip( reader, 1 ); - if (!read_isnamechar( read_utf8_char( reader, &skip ))) - { - read_rewind( reader, 1 ); - return WS_E_INVALID_FORMAT; - } if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2000,7 +1992,7 @@ static HRESULT read_attributes_bin( struct reader *reader, WS_XML_ELEMENT_NODE * reader->current_attr = 0; for (;;) { - if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) break; if ((hr = read_attribute_bin( reader, &attr )) != S_OK) return hr; if ((hr = append_attribute( elem, attr )) != S_OK) @@ -2405,7 +2397,7 @@ static HRESULT read_text_bytes( struct reader *reader, unsigned char type ) node->flags |= NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT; break; } - if ((hr = read_peek( reader, &type )) != S_OK) goto error; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) goto error; if (type < RECORD_BYTES8_TEXT || type > RECORD_BYTES32_TEXT_WITH_ENDELEMENT) break; read_skip( reader, 1 ); } @@ -3008,7 +3000,7 @@ static HRESULT read_node_bin( struct reader *reader ) return S_OK; } - if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type == RECORD_ENDELEMENT) { return read_endelement_bin( reader ); -- 2.11.0

1 0

[PATCH 3/6] webservices: Return HRESULT from read_cmp.
by Hans Leidekker Nov. 27, 2018

Nov. 27, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 87 +++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8cf3f24d29..b573153c97 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1050,37 +1050,39 @@ static inline void read_skip_whitespace( struct reader *reader ) reader->read_pos++; } -static inline int read_cmp( struct reader *reader, const char *str, int len ) +static inline HRESULT read_cmp( struct reader *reader, const char *str, int len ) { const unsigned char *ptr = read_current_ptr( reader ); if (len < 0) len = strlen( str ); - if (reader->read_pos + len > reader->read_size) return -1; + if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; while (len--) { - if (*str != *ptr) return *ptr - *str; + if (*str != *ptr) return WS_E_INVALID_FORMAT; str++; ptr++; } - return 0; + return S_OK; } static HRESULT read_xmldecl( struct reader *reader ) { + HRESULT hr; + if (!reader->read_size) return WS_E_INVALID_FORMAT; - if (read_cmp( reader, "<", 1 ) || read_cmp( reader, "<?", 2 )) + if (read_cmp( reader, "<", 1 ) != S_OK || read_cmp( reader, "<?", 2 ) != S_OK) { reader->state = READER_STATE_BOF; return S_OK; } - if (read_cmp( reader, "<?xml ", 6 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<?xml ", 6 )) != S_OK) return hr; read_skip( reader, 6 ); /* FIXME: parse attributes */ while (reader->read_pos < reader->read_size && reader->read_bufptr[reader->read_pos] != '?') reader->read_pos++; - if (read_cmp( reader, "?>", 2 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "?>", 2 )) != S_OK) return hr; read_skip( reader, 2 ); reader->state = READER_STATE_BOF; @@ -1295,17 +1297,17 @@ static HRESULT decode_text( const unsigned char *str, ULONG len, unsigned char * static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUTE *attr ) { - WS_XML_UTF8_TEXT *utf8 = NULL; + WS_XML_UTF8_TEXT *utf8; unsigned int len, ch, skip, quote; const unsigned char *start; - HRESULT hr = E_OUTOFMEMORY; + HRESULT hr; read_skip_whitespace( reader ); - if (read_cmp( reader, "=", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "=", 1 )) != S_OK) return hr; read_skip( reader, 1 ); read_skip_whitespace( reader ); - if (read_cmp( reader, "\"", 1 ) && read_cmp( reader, "'", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; quote = read_utf8_char( reader, &skip ); read_skip( reader, 1 ); @@ -1322,27 +1324,23 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT if (attr->isXmlNs) { - if (!(attr->ns = alloc_xml_string( start, len ))) goto error; - if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; - if (!(utf8 = alloc_utf8_text( NULL, 0 ))) - { - hr = E_OUTOFMEMORY; - goto error; - } + if (!(attr->ns = alloc_xml_string( start, len ))) return E_OUTOFMEMORY; + if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) return hr; + if (!(utf8 = alloc_utf8_text( NULL, 0 ))) return E_OUTOFMEMORY; } else { - if (!(utf8 = alloc_utf8_text( NULL, len ))) goto error; - if ((hr = decode_text( start, len, utf8->value.bytes, &utf8->value.length )) != S_OK) goto error; + if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; + if ((hr = decode_text( start, len, utf8->value.bytes, &utf8->value.length )) != S_OK) + { + heap_free( utf8 ); + return hr; + } } attr->value = &utf8->text; attr->singleQuote = (quote == '\''); return S_OK; - -error: - heap_free( utf8 ); - return hr; } static inline BOOL is_text_type( unsigned char type ) @@ -1924,7 +1922,7 @@ static HRESULT read_attributes_text( struct reader *reader, WS_XML_ELEMENT_NODE for (;;) { read_skip_whitespace( reader ); - if (!read_cmp( reader, ">", 1 ) || !read_cmp( reader, "/>", 2 )) break; + if (read_cmp( reader, ">", 1 ) == S_OK || read_cmp( reader, "/>", 2 ) == S_OK) break; if ((hr = read_attribute_text( reader, &attr )) != S_OK) return hr; if ((hr = append_attribute( elem, attr )) != S_OK) { @@ -1942,7 +1940,7 @@ static HRESULT read_element_text( struct reader *reader ) const unsigned char *start; struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (read_end_of_data( reader )) { @@ -1952,7 +1950,7 @@ static HRESULT read_element_text( struct reader *reader ) return S_OK; } - if (read_cmp( reader, "<", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<", 1 )) != S_OK) return hr; read_skip( reader, 1 ); if (!read_isnamechar( read_utf8_char( reader, &skip ))) { @@ -1963,6 +1961,7 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; + hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { @@ -2609,7 +2608,7 @@ static HRESULT read_node_text( struct reader * ); static HRESULT read_startelement_text( struct reader *reader ) { read_skip_whitespace( reader ); - if (!read_cmp( reader, "/>", 2 )) + if (read_cmp( reader, "/>", 2 ) == S_OK) { read_skip( reader, 2 ); reader->current = LIST_ENTRY( list_tail( &reader->current->children ), struct node, entry ); @@ -2617,7 +2616,7 @@ static HRESULT read_startelement_text( struct reader *reader ) reader->state = READER_STATE_ENDELEMENT; return S_OK; } - else if (!read_cmp( reader, ">", 1 )) + else if (read_cmp( reader, ">", 1 ) == S_OK) { read_skip( reader, 1 ); return read_node_text( reader ); @@ -2744,7 +2743,7 @@ static HRESULT read_endelement_text( struct reader *reader ) WS_XML_STRING prefix, localname; HRESULT hr; - if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "</", 2 )) != S_OK) return hr; read_skip( reader, 2 ); start = read_current_ptr( reader ); @@ -2817,14 +2816,15 @@ static HRESULT read_comment_text( struct reader *reader ) const unsigned char *start; struct node *node, *parent; WS_XML_COMMENT_NODE *comment; + HRESULT hr; - if (read_cmp( reader, "", 3 )) + if (read_cmp( reader, "-->", 3 ) == S_OK) { read_skip( reader, 3 ); break; @@ -2887,8 +2887,9 @@ static HRESULT read_comment_bin( struct reader *reader ) static HRESULT read_startcdata( struct reader *reader ) { struct node *node, *endnode, *parent; + HRESULT hr; - if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<![CDATA[", 9 )) != S_OK) return hr; read_skip( reader, 9 ); if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2918,7 +2919,7 @@ static HRESULT read_cdata( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!read_cmp( reader, "]]>", 3 )) break; + if (read_cmp( reader, "]]>", 3 ) == S_OK) break; if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; read_skip( reader, skip ); len += skip; @@ -2941,8 +2942,9 @@ static HRESULT read_cdata( struct reader *reader ) static HRESULT read_endcdata( struct reader *reader ) { struct node *parent; + HRESULT hr; - if (read_cmp( reader, "]]>", 3 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "]]>", 3 )) != S_OK) return hr; read_skip( reader, 3 ); if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT) parent = reader->current->parent; @@ -2969,16 +2971,19 @@ static HRESULT read_node_text( struct reader *reader ) } if (reader->state == READER_STATE_STARTCDATA) return read_cdata( reader ); else if (reader->state == READER_STATE_CDATA) return read_endcdata( reader ); - else if (!read_cmp( reader, "<?", 2 )) + else if (read_cmp( reader, "<?", 2 ) == S_OK) { hr = read_xmldecl( reader ); if (FAILED( hr )) return hr; } - else if (!read_cmp( reader, "</", 2 )) return read_endelement_text( reader ); - else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); - else if (!read_cmp( reader, "<!--", 4 )) return read_comment_text( reader ); - else if (!read_cmp( reader, "<", 1 )) return read_element_text( reader ); - else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement_text( reader ); + else if (read_cmp( reader, "</", 2 ) == S_OK) return read_endelement_text( reader ); + else if (read_cmp( reader, "<![CDATA[", 9 ) == S_OK) return read_startcdata( reader ); + else if (read_cmp( reader, "<!--", 4 ) == S_OK) return read_comment_text( reader ); + else if (read_cmp( reader, "<", 1 ) == S_OK) return read_element_text( reader ); + else if (read_cmp( reader, "/>", 2 ) == S_OK || read_cmp( reader, ">", 1 ) == S_OK) + { + return read_startelement_text( reader ); + } else return read_text_text( reader ); } } -- 2.11.0

1 0

[PATCH 2/6] webservices: Call WsReadEndElement just once in WsReadEnvelopeEnd.
by Hans Leidekker Nov. 27, 2018

Nov. 27, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/msg.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index a53fd92e2e..e28baa2693 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -938,13 +938,6 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W return hr; } -static HRESULT read_envelope_end( WS_XML_READER *reader ) -{ - HRESULT hr; - if ((hr = WsReadEndElement( reader, NULL )) != S_OK) return hr; /* </s:Body> */ - return WsReadEndElement( reader, NULL ); /* </s:Envelope> */ -} - /************************************************************************** * WsReadEnvelopeEnd [webservices.@] */ @@ -967,7 +960,7 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) } if (msg->state != WS_MESSAGE_STATE_READING) hr = WS_E_INVALID_OPERATION; - else if ((hr = read_envelope_end( msg->reader_body )) == S_OK) + else if ((hr = WsReadEndElement( msg->reader_body, NULL )) == S_OK) msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs ); -- 2.11.0

1 0

[PATCH 1/6] webservices: Use set_blocking in more places.
by Hans Leidekker Nov. 27, 2018

Nov. 27, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b945c7f55a..5394aa6c28 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2245,7 +2245,6 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr = S_OK; if (WSAEventSelect( socket, handles[0], FD_ACCEPT )) return HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2256,7 +2255,7 @@ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *r if ((*ret = accept( socket, NULL, NULL )) != -1) { WSAEventSelect( *ret, NULL, 0 ); - ioctlsocket( *ret, FIONBIO, &nonblocking ); + set_blocking( *ret, TRUE ); break; } hr = HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2296,7 +2295,6 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr; if (WSAEventSelect( socket, handles[0], FD_READ )) return HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2317,7 +2315,7 @@ static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) } WSAEventSelect( socket, NULL, 0 ); - ioctlsocket( socket, FIONBIO, &nonblocking ); + set_blocking( socket, TRUE ); return hr; } -- 2.11.0

1 0

[PATCH 3/3] user32: Add support for navigating a group of radio buttons using a keyboard.
by Dmitry Timoshkov Nov. 27, 2018

Nov. 27, 2018

The patch approximates the behaviour observed in the message tests but still doesn't make the message tests pass without failures. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/dialog.c | 12 ++++++++++-- dlls/user32/tests/msg.c | 7 ------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c5c646e0b1..c47bd571ae 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1237,8 +1237,16 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) if (!(dlgCode & DLGC_WANTARROWS)) { BOOL fPrevious = (msg->wParam == VK_LEFT || msg->wParam == VK_UP); - HWND hwndNext = GetNextDlgGroupItem (hwndDlg, GetFocus(), fPrevious ); - SendMessageW( hwndDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); + HWND hwndNext = GetNextDlgGroupItem( hwndDlg, msg->hwnd, fPrevious ); + if (hwndNext && SendMessageW( hwndNext, WM_GETDLGCODE, msg->wParam, (LPARAM)msg ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + { + SetFocus( hwndNext ); + if ((GetWindowLongW( hwndNext, GWL_STYLE ) & BS_TYPEMASK) == BS_AUTORADIOBUTTON && + SendMessageW( hwndNext, BM_GETCHECK, 0, 0 ) != BST_CHECKED) + SendMessageW( hwndNext, BM_CLICK, 1, 0 ); + } + else + SendMessageW( hwndDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); return TRUE; } break; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6e62873023..f78858f4d4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7057,11 +7057,9 @@ if (0) /* actual message sequence is different on every run in some Windows setu while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_DOWN_dialog, "IsDialogMessage(VK_DOWN)", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); GetWindowRect(radio1, &rc); @@ -7076,11 +7074,9 @@ todo_wine while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_DOWN_radio3, "down to radio3", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); flush_events(); @@ -7097,11 +7093,9 @@ todo_wine while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_UP_radio1, "up to radio1", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); flush_events(); @@ -7119,7 +7113,6 @@ todo_wine if (0) /* actual message sequence is different on every run in some Windows setups */ ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #3", FALSE); /* what really matters is that nothing has changed */ -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); log_all_parent_messages--; -- 2.17.1

2 1