May 2016 - Wine-commits - list.winehq.org

Hans Leidekker : webservices: Flush the writer in WsWriteText.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: f4b336379063399b08d5b56d8aa18dacc914e589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b336379063399b08d5b56d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:51:56 2016 +0200 webservices: Flush the writer in WsWriteText. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 35be982..a6ecf24 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -861,6 +861,13 @@ HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) return S_OK; } +/* flush current start element if necessary */ +static HRESULT write_flush( struct writer *writer ) +{ + if (writer->state == WRITER_STATE_STARTELEMENT) return write_endstartelement( writer ); + return S_OK; +} + static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { @@ -868,9 +875,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN WS_XML_ELEMENT_NODE *elem; HRESULT hr; - /* flush current start element if necessary */ - if (writer->state == WRITER_STATE_STARTELEMENT && ((hr = write_endstartelement( writer )) != S_OK)) - return hr; + if ((hr = write_flush( writer )) != S_OK) return hr; if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) prefix = writer->current->hdr.prefix; @@ -950,6 +955,7 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E } else { + if ((hr = write_flush( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, src->value.length )) != S_OK) return hr; write_bytes( writer, src->value.bytes, src->value.length ); }

1 0

Hans Leidekker : webservices: Validate parent nodes.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 7fb361d763e4876a0353cfeb6d0ac431e26100e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb361d763e4876a0353cfeb6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:51:57 2016 +0200 webservices: Validate parent nodes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 89 ++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4f2262e..7b59eb2 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1076,39 +1076,22 @@ error: return hr; } -static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) +static inline BOOL is_valid_parent( const struct node *node ) { - ULONG i; - if (len1 != len2) return 1; - for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } - return 0; + if (!node) return FALSE; + return node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF; } -static struct node *read_find_parent( struct reader *reader, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname ) +static struct node *read_find_parent( struct reader *reader ) { - struct node *parent; - const WS_XML_STRING *str; - - for (parent = reader->current; parent; parent = parent->parent) + struct node *node = reader->current; + if (node_type( node ) == WS_XML_NODE_TYPE_END_ELEMENT) { - if (node_type( parent ) == WS_XML_NODE_TYPE_BOF) - { - if (!localname) return parent; - return NULL; - } - else if (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) - { - if (!localname) return parent; - - str = parent->hdr.prefix; - if (cmp_name( str->bytes, str->length, prefix->bytes, prefix->length )) continue; - str = parent->hdr.localName; - if (cmp_name( str->bytes, str->length, localname->bytes, localname->length )) continue; - return parent; - } + if (!node->parent || !is_valid_parent( node->parent->parent )) return NULL; + return node->parent->parent; } - + else if (is_valid_parent( node )) return node; + else if (is_valid_parent( node->parent )) return node->parent; return NULL; } @@ -1167,7 +1150,7 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; - if (!(parent = read_find_parent( reader, NULL, NULL ))) goto error; + if (!(parent = read_find_parent( reader ))) goto error; hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; @@ -1202,7 +1185,7 @@ static HRESULT read_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; - struct node *node; + struct node *node, *parent; WS_XML_TEXT_NODE *text; WS_XML_UTF8_TEXT *utf8; @@ -1216,6 +1199,8 @@ static HRESULT read_text( struct reader *reader ) len += skip; } + if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; if (!(utf8 = alloc_utf8_text( start, len ))) @@ -1225,7 +1210,7 @@ static HRESULT read_text( struct reader *reader ) } text->text = &utf8->text; - read_insert_node( reader, reader->current, node ); + read_insert_node( reader, parent, node ); reader->state = READER_STATE_TEXT; return S_OK; } @@ -1283,6 +1268,36 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } +static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) +{ + ULONG i; + if (len1 != len2) return 1; + for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } + return 0; +} + +static struct node *read_find_start_element( struct reader *reader, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) +{ + struct node *parent; + const WS_XML_STRING *str; + + for (parent = reader->current; parent; parent = parent->parent) + { + if (node_type( parent ) == WS_XML_NODE_TYPE_BOF) return NULL; + if (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) + { + str = parent->hdr.prefix; + if (cmp_name( str->bytes, str->length, prefix->bytes, prefix->length )) continue; + str = parent->hdr.localName; + if (cmp_name( str->bytes, str->length, localname->bytes, localname->length )) continue; + return parent; + } + } + + return NULL; +} + static HRESULT read_endelement( struct reader *reader ) { struct node *node, *parent; @@ -1319,7 +1334,7 @@ static HRESULT read_endelement( struct reader *reader ) } if ((hr = parse_name( start, len, &prefix, &localname )) != S_OK) return hr; - parent = read_find_parent( reader, prefix, localname ); + parent = read_find_start_element( reader, prefix, localname ); heap_free( prefix ); heap_free( localname ); if (!parent) return WS_E_INVALID_FORMAT; @@ -1334,7 +1349,7 @@ static HRESULT read_comment( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; - struct node *node; + struct node *node, *parent; WS_XML_COMMENT_NODE *comment; if (read_cmp( reader, "<!--", 4 )) return WS_E_INVALID_FORMAT; @@ -1353,6 +1368,8 @@ static HRESULT read_comment( struct reader *reader ) len += skip; } + if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; comment = (WS_XML_COMMENT_NODE *)node; if (!(comment->value.bytes = heap_alloc( len ))) @@ -1363,20 +1380,22 @@ static HRESULT read_comment( struct reader *reader ) memcpy( comment->value.bytes, start, len ); comment->value.length = len; - read_insert_node( reader, reader->current, node ); + read_insert_node( reader, parent, node ); reader->state = READER_STATE_COMMENT; return S_OK; } static HRESULT read_startcdata( struct reader *reader ) { - struct node *node; + struct node *node, *parent; if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; read_skip( reader, 9 ); + if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; - read_insert_node( reader, reader->current, node ); + read_insert_node( reader, parent, node ); reader->state = READER_STATE_STARTCDATA; return S_OK; }

1 0

Hans Leidekker : webservices: Reset the reader position if the next node doesn' t match the type to read.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 297dd85ca534abbb5ced69b13ac4600b2470c8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=297dd85ca534abbb5ced69b13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:51:58 2016 +0200 webservices: Reset the reader position if the next node doesn't match the type to read. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 142 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 105 insertions(+), 37 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7b59eb2..41755fe 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -410,6 +410,7 @@ struct reader struct node *root; struct node *current; ULONG current_attr; + struct node *last; struct prefix *prefixes; ULONG nb_prefixes; ULONG nb_prefixes_allocated; @@ -524,14 +525,14 @@ static void read_insert_eof( struct reader *reader, struct node *eof ) eof->parent = reader->root; list_add_tail( &reader->root->children, &eof->entry ); } - reader->current = eof; + reader->current = reader->last = eof; } static void read_insert_bof( struct reader *reader, struct node *bof ) { reader->root->parent = bof; list_add_tail( &bof->children, &reader->root->entry ); - reader->current = reader->root = bof; + reader->current = reader->last = reader->root = bof; } static void read_insert_node( struct reader *reader, struct node *parent, struct node *node ) @@ -543,7 +544,7 @@ static void read_insert_node( struct reader *reader, struct node *parent, struct list_add_before( eof, &node->entry ); } else list_add_tail( &parent->children, &node->entry ); - reader->current = node; + reader->current = reader->last = node; } static HRESULT read_init_state( struct reader *reader ) @@ -1650,6 +1651,58 @@ static BOOL move_to_parent_element( struct reader *reader ) return FALSE; } +static BOOL move_to_first_node( struct reader *reader ) +{ + struct list *ptr; + if ((ptr = list_head( &reader->current->parent->children ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + return TRUE; + } + return FALSE; +} + +static BOOL move_to_next_node( struct reader *reader ) +{ + struct list *ptr; + if ((ptr = list_next( &reader->current->parent->children, &reader->current->entry ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + return TRUE; + } + return FALSE; +} + +static BOOL move_to_prev_node( struct reader *reader ) +{ + struct list *ptr; + if ((ptr = list_prev( &reader->current->parent->children, &reader->current->entry ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + return TRUE; + } + return FALSE; +} + +static BOOL move_to_child_node( struct reader *reader ) +{ + struct list *ptr; + if ((ptr = list_head( &reader->current->children ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + return TRUE; + } + return FALSE; +} + +static BOOL move_to_parent_node( struct reader *reader ) +{ + struct node *parent = reader->current->parent; + if (!parent) return FALSE; + reader->current = parent; + return TRUE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1688,35 +1741,19 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found break; case WS_MOVE_TO_FIRST_NODE: - if ((ptr = list_head( &reader->current->parent->children ))) - { - reader->current = LIST_ENTRY( ptr, struct node, entry ); - success = TRUE; - } + success = move_to_first_node( reader ); break; case WS_MOVE_TO_NEXT_NODE: - if ((ptr = list_next( &reader->current->parent->children, &reader->current->entry ))) - { - reader->current = LIST_ENTRY( ptr, struct node, entry ); - success = TRUE; - } + success = move_to_next_node( reader ); break; case WS_MOVE_TO_PREVIOUS_NODE: - if ((ptr = list_prev( &reader->current->parent->children, &reader->current->entry ))) - { - reader->current = LIST_ENTRY( ptr, struct node, entry ); - success = TRUE; - } + success = move_to_prev_node( reader ); break; case WS_MOVE_TO_CHILD_NODE: - if ((ptr = list_head( &reader->current->children ))) - { - reader->current = LIST_ENTRY( ptr, struct node, entry ); - success = TRUE; - } + success = move_to_child_node( reader ); break; case WS_MOVE_TO_BOF: @@ -2836,6 +2873,16 @@ static BOOL is_empty_text_node( const struct node *node ) return TRUE; } +static HRESULT read_next_node( struct reader *reader ) +{ + if (reader->current == reader->last) return read_node( reader ); + if (move_to_child_node( reader )) return S_OK; + if (move_to_next_node( reader )) return S_OK; + if (!move_to_parent_node( reader )) return WS_E_INVALID_FORMAT; + if (move_to_next_node( reader )) return S_OK; + return WS_E_INVALID_FORMAT; +} + /* skips comment and empty text nodes */ static HRESULT read_type_next_node( struct reader *reader ) { @@ -2844,7 +2891,7 @@ static HRESULT read_type_next_node( struct reader *reader ) HRESULT hr; WS_XML_NODE_TYPE type; - if ((hr = read_node( reader )) != S_OK) return hr; + if ((hr = read_next_node( reader )) != S_OK) return hr; type = node_type( reader->current ); if (type == WS_XML_NODE_TYPE_COMMENT || (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue; @@ -2852,22 +2899,41 @@ static HRESULT read_type_next_node( struct reader *reader ) } } +static BOOL match_current_element( struct reader *reader, const WS_XML_STRING *localname, + const WS_XML_STRING *ns ) +{ + const WS_XML_ELEMENT_NODE *elem = &reader->current->hdr; + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + return WsXmlStringEquals( localname, elem->localName, NULL ) == S_OK && + WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK; +} + static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - const WS_XML_ELEMENT_NODE *elem; + struct node *node; + ULONG attr; HRESULT hr; - BOOL found; if (!localname) return S_OK; /* assume reader is already correctly positioned */ - if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; - if (!found) return WS_E_INVALID_FORMAT; + if (reader->current == reader->last) + { + BOOL found; + if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; + if (!found) return WS_E_INVALID_FORMAT; + } + if (match_current_element( reader, localname, ns )) return S_OK; - elem = &reader->current->hdr; - if (WsXmlStringEquals( localname, elem->localName, NULL ) == S_OK && - WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) return S_OK; + node = reader->current; + attr = reader->current_attr; - return read_type_next_node( reader ); + if ((hr = read_type_next_node( reader )) != S_OK) return hr; + if (match_current_element( reader, localname, ns )) return S_OK; + + reader->current = node; + reader->current_attr = attr; + + return WS_E_INVALID_FORMAT; } static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) @@ -2967,11 +3033,13 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { HRESULT hr; - BOOL found; - - if ((hr = read_to_startelement( reader, &found )) != S_OK) return S_OK; - if (!found) return WS_E_INVALID_FORMAT; - if ((hr = read_node( reader )) != S_OK) return hr; + if (reader->current == reader->last) + { + BOOL found; + if ((hr = read_to_startelement( reader, &found )) != S_OK) return S_OK; + if (!found) return WS_E_INVALID_FORMAT; + } + if ((hr = read_next_node( reader )) != S_OK) return hr; if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; return read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL,

1 0

Hans Leidekker : webservices: Add support for reading arrays of pointers.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: dfc47061bd08a210b034cea7f5b0c6c51332f2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc47061bd08a210b034cea7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:51:59 2016 +0200 webservices: Add support for reading arrays of pointers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 60 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 41755fe..41c76ee 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2973,25 +2973,57 @@ static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) } } +static WS_READ_OPTION get_array_read_option( WS_TYPE type ) +{ + switch (type) + { + case WS_BOOL_TYPE: + case WS_INT8_TYPE: + case WS_INT16_TYPE: + case WS_INT32_TYPE: + case WS_INT64_TYPE: + case WS_UINT8_TYPE: + case WS_UINT16_TYPE: + case WS_UINT32_TYPE: + case WS_UINT64_TYPE: + case WS_DOUBLE_TYPE: + case WS_ENUM_TYPE: + case WS_STRUCT_TYPE: + case WS_DATETIME_TYPE: + return WS_READ_REQUIRED_VALUE; + + case WS_WSZ_TYPE: + return WS_READ_REQUIRED_POINTER; + + default: + FIXME( "unhandled type %u\n", type ); + return 0; + } +} + static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XML_STRING *, const WS_XML_STRING *, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ); static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, - WS_READ_OPTION option, WS_HEAP *heap, void **ret, - ULONG size, ULONG *count ) + WS_HEAP *heap, void **ret, ULONG size, ULONG *count ) { HRESULT hr; ULONG item_size, nb_items = 0, nb_allocated = 1, offset = 0; + WS_READ_OPTION option; char *buf; - if (size != sizeof(void *)) return E_INVALIDARG; + if (size != sizeof(void *) || !(option = get_array_read_option( desc->type ))) return E_INVALIDARG; /* wrapper element */ if (desc->localName && ((hr = read_type_next_element_node( reader, desc->localName, desc->ns )) != S_OK)) return hr; - item_size = get_type_size( desc->type, desc->typeDescription ); + if (option == WS_READ_REQUIRED_VALUE) + item_size = get_type_size( desc->type, desc->typeDescription ); + else + item_size = sizeof(void *); + if (!(buf = ws_alloc_zero( heap, item_size ))) return WS_E_QUOTA_EXCEEDED; for (;;) { @@ -3002,7 +3034,7 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL nb_allocated *= 2; } hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->itemLocalName, desc->itemNs, - desc->typeDescription, WS_READ_REQUIRED_VALUE, heap, buf + offset, item_size ); + desc->typeDescription, option, heap, buf + offset, item_size ); if (hr == WS_E_INVALID_FORMAT) break; if (hr != S_OK) { @@ -3046,14 +3078,8 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION desc->typeDescription, option, heap, ret, size ); } -static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) +static WS_READ_OPTION get_field_read_option( WS_TYPE type ) { - if (options & ~(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) - { - FIXME( "options %08x not supported\n", options ); - return 0; - } - switch (type) { case WS_BOOL_TYPE: @@ -3087,7 +3113,13 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES ULONG size; HRESULT hr; - if (!desc || !(option = map_field_options( desc->type, desc->options ))) return E_INVALIDARG; + if (!desc) return E_INVALIDARG; + if (desc->options & ~(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) + { + FIXME( "options %08x not supported\n", desc->options ); + return E_NOTIMPL; + } + if (!(option = get_field_read_option( desc->type ))) return E_INVALIDARG; if (option == WS_READ_REQUIRED_VALUE) size = get_type_size( desc->type, desc->typeDescription ); @@ -3110,7 +3142,7 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES case WS_REPEATING_ELEMENT_FIELD_MAPPING: { ULONG count; - hr = read_type_repeating_element( reader, desc, option, heap, (void **)ptr, size, &count ); + hr = read_type_repeating_element( reader, desc, heap, (void **)ptr, size, &count ); if (hr == S_OK) *(ULONG *)(buf + desc->countOffset) = count; break; }

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: ce91365b105966885195fe36d5e14c4d7c4134c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce91365b105966885195fe36d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:52:00 2016 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 88 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 81b762e..e66100c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1051,7 +1051,7 @@ static void test_WsReadEndElement(void) hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); - hr = set_input( reader, "<a></a>", sizeof("<a></a>") - 1 ); + hr = set_input( reader, "<a></A>", sizeof("<a></A>") - 1 ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsFillReader( reader, sizeof("<a></a>") - 1, NULL, NULL ); @@ -1722,6 +1722,7 @@ static void test_WsMoveReader(void) WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}, ns = {0, NULL}; const WS_XML_NODE *node; WS_XML_ELEMENT_NODE *elem; + WS_XML_UTF8_TEXT utf8; hr = WsCreateReader( NULL, 0, &reader, NULL ) ; ok( hr == S_OK, "got %08x\n", hr ); @@ -1803,7 +1804,7 @@ static void test_WsMoveReader(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* EOF node is last child of BOF node */ hr = WsMoveReader( reader, WS_MOVE_TO_BOF, NULL, NULL ); @@ -1814,14 +1815,14 @@ static void test_WsMoveReader(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1848,7 +1849,7 @@ static void test_WsMoveReader(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1875,11 +1876,86 @@ static void test_WsMoveReader(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeWriter( writer ); + WsFreeHeap( heap ); + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* <a><b>test</b></a> */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = (BYTE *)"test"; + utf8.value.length = sizeof("test") - 1; + hr = WsWriteText( writer, &utf8.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsMoveReader( reader, WS_MOVE_TO_CHILD_NODE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "b", 1 ), "wrong data\n" ); + + hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap );

1 0

Hans Leidekker : qmgr: Clear job error on resume.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 98f7468f9a7c4ff5afe9dec2558e8bc43f0bf8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f7468f9a7c4ff5afe9dec25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:53:06 2016 +0200 qmgr: Clear job error on resume. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/job.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index f6891e3..33e3bd2 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -371,6 +371,12 @@ static HRESULT WINAPI BackgroundCopyJob_Resume( && This->state != BG_JOB_STATE_TRANSFERRING) { This->state = BG_JOB_STATE_QUEUED; + This->error.context = This->error.code = 0; + if (This->error.file) + { + IBackgroundCopyFile2_Release(This->error.file); + This->error.file = NULL; + } SetEvent(globalMgr.jobEvent); } LeaveCriticalSection(&globalMgr.cs);

1 0

Hans Leidekker : qmgr: Change job state on failure in transfer_file_http.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: fb704266fa6cf797d900ade4672dfb4c6f6cdd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb704266fa6cf797d900ade46… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:53:07 2016 +0200 qmgr: Change job state on failure in transfer_file_http. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 2525caf..302f407 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -420,7 +420,8 @@ done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); - if (!ret) DeleteFileW(tmpfile); + if (!ret && !transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_ERROR)) + transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); SetEvent(job->done); return ret; @@ -525,13 +526,9 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) if (!ret) { TRACE("WinHttpCrackUrl failed, trying local file copy\n"); - if (!transfer_file_local(file, tmpName)) return FALSE; - } - else if (!transfer_file_http(file, &uc, tmpName)) - { - WARN("HTTP transfer failed\n"); - return FALSE; + if (!transfer_file_local(file, tmpName)) WARN("local transfer failed\n"); } + else if (!transfer_file_http(file, &uc, tmpName)) WARN("HTTP transfer failed\n"); if (transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_QUEUED) || transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_QUEUED))

1 0

Nikolay Sivov : msdaps: Fix GetBasicErrorInfo() method proxy (Clang).
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 2b5390290ce5bae9848e4d21bd90ab9480745f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5390290ce5bae9848e4d21b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:48:13 2016 +0300 msdaps: Fix GetBasicErrorInfo() method proxy (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index ef0163a..53aca39 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1362,9 +1362,19 @@ HRESULT __RPC_STUB IErrorRecords_GetCustomErrorObject_Stub(IErrorRecords* This, HRESULT CALLBACK IErrorRecords_GetBasicErrorInfo_Proxy(IErrorRecords* This, ULONG ulRecordNum, ERRORINFO *pErrorInfo) { + IErrorInfo *error = NULL; + HRESULT hr; + TRACE("(%p)->%d %p\n", This, ulRecordNum, pErrorInfo); - return IErrorRecords_GetBasicErrorInfo_Proxy(This, ulRecordNum, pErrorInfo); + hr = IErrorRecords_RemoteGetBasicErrorInfo_Proxy(This, ulRecordNum, pErrorInfo, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + return hr; } HRESULT __RPC_STUB IErrorRecords_GetBasicErrorInfo_Stub(IErrorRecords* This, ULONG ulRecordNum, ERRORINFO *pErrorInfo,

1 0

Nikolay Sivov : msdaps: Always initialize error pointers in proxies.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: b50342ed53f019c08d445c90dc9f1123154acb64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50342ed53f019c08d445c90d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:48:14 2016 +0300 msdaps: Always initialize error pointers in proxies. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b50342ed53f019c08d445…

1 0

Nikolay Sivov : dwrite/tests: Couple more tests for IDWriteNumberSubstitution creation.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 7119c50940fb091e2985bdf8662189e8e9013837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7119c50940fb091e2985bdf86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:51:35 2016 +0300 dwrite/tests: Couple more tests for IDWriteNumberSubstitution creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 043d7a1..23c3d22 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1207,10 +1207,16 @@ static void test_numbersubstitution(void) IDWriteNumberSubstitution *substitution; HRESULT hr; + /* locale is not specified, method does not require it */ hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, NULL, FALSE, &substitution); ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteNumberSubstitution_Release(substitution); + /* invalid locale name, method does not require it */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, dummyW, FALSE, &substitution); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteNumberSubstitution_Release(substitution); + /* invalid method */ hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL+1, NULL, FALSE, &substitution); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -1220,6 +1226,9 @@ static void test_numbersubstitution(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); /* invalid locale */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, NULL, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, dummyW, FALSE, &substitution); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);

1 0