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

Hans Leidekker : webservices: Add support for reading comments in binary mode.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 6f65dbc04ce6f9770fe128cf398609338a6f90a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f65dbc04ce6f9770fe128cf3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:43 2017 +0200 webservices: Add support for reading comments in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/webservices/tests/reader.c | 16 ++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f0f96ea..7624eb9 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1942,7 +1942,7 @@ static HRESULT read_endelement( struct reader *reader ) } } -static HRESULT read_comment( struct reader *reader ) +static HRESULT read_comment_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; @@ -1982,6 +1982,39 @@ static HRESULT read_comment( struct reader *reader ) return S_OK; } +static HRESULT read_comment_bin( struct reader *reader ) +{ + struct node *node, *parent; + WS_XML_COMMENT_NODE *comment; + unsigned char type; + ULONG len; + HRESULT hr; + + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (type != RECORD_COMMENT) return WS_E_INVALID_FORMAT; + if ((hr = read_int31( reader, &len )) != S_OK) return hr; + + if (!(parent = 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 ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + if ((hr = read_bytes( reader, comment->value.bytes, len )) != S_OK) + { + free_node( node ); + return E_OUTOFMEMORY; + } + comment->value.length = len; + + read_insert_node( reader, parent, node ); + reader->state = READER_STATE_COMMENT; + return S_OK; +} + static HRESULT read_startcdata( struct reader *reader ) { struct node *node, *endnode, *parent; @@ -2074,7 +2107,7 @@ static HRESULT read_node_text( struct reader *reader ) } 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( 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 return read_text_text( reader ); @@ -2106,6 +2139,10 @@ static HRESULT read_node_bin( struct reader *reader ) { return read_endelement_bin( reader ); } + else if (type == RECORD_COMMENT) + { + return read_comment_bin( reader ); + } else if (type >= RECORD_SHORT_ELEMENT && type <= RECORD_PREFIX_ELEMENT_Z) { return read_element_bin( reader ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4af941b..4e1394c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4516,11 +4516,14 @@ static void test_binary_encoding(void) {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x01}; static const char res4[] = {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x99,0x04,'t','e','s','t'}; + static const char res200[] = + {0x02,0x07,'c','o','m','m','e','n','t'}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; const WS_XML_TEXT_NODE *text; const WS_XML_UTF8_TEXT *utf8; + const WS_XML_COMMENT_NODE *comment; WS_XML_READER *reader; HRESULT hr; @@ -4659,6 +4662,19 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* comment */ + hr = set_input_bin( reader, res200, sizeof(res200) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, 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_COMMENT, "got %u\n", node->nodeType ); + comment = (const WS_XML_COMMENT_NODE *)node; + ok( comment->value.length == 7, "got %u\n", comment->value.length ); + ok( !memcmp( comment->value.bytes, "comment", 7 ), "wrong data\n" ); + WsFreeReader( reader ); }

1 0

Hans Leidekker : webservices: Add support for reading text in binary mode.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: b9953cef4e4dc4d9ce45654abbe692d995ab72c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9953cef4e4dc4d9ce45654ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:42 2017 +0200 webservices: Add support for reading text in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 117 +++++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 47 ++++++++++++++++ 2 files changed, 158 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a5e3efc..f0f96ea 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1643,7 +1643,7 @@ error: return hr; } -static HRESULT read_text( struct reader *reader ) +static HRESULT read_text_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; @@ -1685,9 +1685,58 @@ static HRESULT read_text( struct reader *reader ) return S_OK; } +static HRESULT read_text_bin( struct reader *reader ) +{ + unsigned char type; + struct node *node, *parent; + WS_XML_TEXT_NODE *text; + WS_XML_UTF8_TEXT *utf8; + ULONG len; + HRESULT hr; + + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + + switch (type) + { + case RECORD_CHARS8_TEXT_WITH_ENDELEMENT: + { + unsigned char len8; + if ((hr = read_byte( reader, &len8 )) != S_OK) return hr; + len = len8; + break; + } + default: + ERR( "unhandled record type %02x\n", type ); + return WS_E_NOT_SUPPORTED; + } + + if (!(parent = 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( NULL, len ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + { + heap_free( utf8 ); + heap_free( node ); + return hr; + } + text->text = &utf8->text; + + read_insert_node( reader, parent, node ); + reader->state = READER_STATE_TEXT; + reader->text_conv_offset = 0; + return S_OK; +} + static HRESULT read_node_text( struct reader * ); -static HRESULT read_startelement( struct reader *reader ) +static HRESULT read_startelement_text( struct reader *reader ) { read_skip_whitespace( reader ); if (!read_cmp( reader, "/>", 2 )) @@ -1706,7 +1755,27 @@ static HRESULT read_startelement( struct reader *reader ) return WS_E_INVALID_FORMAT; } -static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) +static HRESULT read_node_bin( struct reader * ); + +static HRESULT read_startelement_bin( struct reader *reader ) +{ + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return WS_E_INVALID_FORMAT; + return read_node_bin( reader ); +} + +static HRESULT read_startelement( struct reader *reader ) +{ + switch (reader->input_enc) + { + case WS_XML_READER_ENCODING_TYPE_TEXT: return read_startelement_text( reader ); + case WS_XML_READER_ENCODING_TYPE_BINARY: return read_startelement_bin( reader ); + default: + ERR( "unhandled encoding %u\n", reader->input_enc ); + return WS_E_NOT_SUPPORTED; + } +} + +static HRESULT read_to_startelement_text( struct reader *reader, BOOL *found ) { HRESULT hr; @@ -1736,6 +1805,39 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } +static HRESULT read_to_startelement_bin( struct reader *reader, BOOL *found ) +{ + HRESULT hr; + + if (reader->state == READER_STATE_STARTELEMENT) + { + if (found) *found = TRUE; + return S_OK; + } + + if ((hr = read_element_bin( reader )) == S_OK && found) + { + if (reader->state == READER_STATE_STARTELEMENT) + *found = TRUE; + else + *found = FALSE; + } + + return hr; +} + +static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) +{ + switch (reader->input_enc) + { + case WS_XML_READER_ENCODING_TYPE_TEXT: return read_to_startelement_text( reader, found ); + case WS_XML_READER_ENCODING_TYPE_BINARY: return read_to_startelement_bin( reader, found ); + default: + ERR( "unhandled encoding %u\n", reader->input_enc ); + return WS_E_NOT_SUPPORTED; + } +} + static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) { ULONG i; @@ -1974,8 +2076,8 @@ static HRESULT read_node_text( struct reader *reader ) else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); else if (!read_cmp( reader, "<!--", 4 )) return read_comment( 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( reader ); - else return read_text( reader ); + else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement_text( reader ); + else return read_text_text( reader ); } } @@ -2008,7 +2110,10 @@ static HRESULT read_node_bin( struct reader *reader ) { return read_element_bin( reader ); } - + else if (type >= RECORD_ZERO_TEXT && type <= RECORD_QNAME_DICTIONARY_TEXT_WITH_ENDELEMENT) + { + return read_text_bin( reader ); + } FIXME( "unhandled record type %02x\n", type ); return WS_E_NOT_SUPPORTED; } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 41cbadc..4af941b 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4514,9 +4514,13 @@ static void test_binary_encoding(void) {0x6d,0x01,'t',0x09,0x01,'p',0x02,'n','s',0x01}; static const char res3[] = {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x01}; + static const char res4[] = + {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x99,0x04,'t','e','s','t'}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; + const WS_XML_TEXT_NODE *text; + const WS_XML_UTF8_TEXT *utf8; WS_XML_READER *reader; HRESULT hr; @@ -4612,6 +4616,49 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* element with text */ + hr = set_input_bin( reader, res4, sizeof(res4) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, 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 ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->prefix->length == 2, "got %u\n", elem->prefix->length ); + ok( !memcmp( elem->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + + hr = WsReadNode( reader, 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_TEXT, "got %u\n", node->nodeType ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + utf8 = (const WS_XML_UTF8_TEXT *)text->text; + ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "test", 4 ), "wrong text\n" ); + + hr = WsReadNode( reader, 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 ); }

1 0

Hans Leidekker : webservices: Add support for reading attributes in binary mode.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 78428d963eb742eae5c35010640d673aa94f7cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78428d963eb742eae5c350106… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:41 2017 +0200 webservices: Add support for reading attributes in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 141 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 69 ++++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 39f0202..a5e3efc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1221,6 +1221,11 @@ error: return hr; } +static inline BOOL is_text_type( unsigned char type ) +{ + return (type >= RECORD_ZERO_TEXT && type <= RECORD_QNAME_DICTIONARY_TEXT_WITH_ENDELEMENT); +} + static HRESULT read_int31( struct reader *reader, ULONG *len ) { unsigned char byte; @@ -1258,6 +1263,42 @@ static HRESULT read_string( struct reader *reader, WS_XML_STRING **str ) return hr; } +static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE *attr ) +{ + WS_XML_UTF8_TEXT *utf8 = NULL; + unsigned char type; + HRESULT hr; + ULONG len; + + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + + switch (type) + { + case RECORD_CHARS8_TEXT: + { + unsigned char len8; + if ((hr = read_byte( reader, &len8 )) != S_OK) return hr; + len = len8; + break; + } + default: + ERR( "unhandled record type %02x\n", type ); + return WS_E_NOT_SUPPORTED; + } + + if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; + if (!len) utf8->value.bytes = (BYTE *)(utf8 + 1); /* quirk */ + if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + { + heap_free( utf8 ); + return hr; + } + + attr->value = &utf8->text; + return S_OK; +} + static HRESULT read_attribute_text( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { static const WS_XML_STRING xmlns = {5, (BYTE *)"xmlns"}; @@ -1314,6 +1355,83 @@ error: return hr; } +static inline BOOL is_attribute_type( unsigned char type ) +{ + return (type >= RECORD_SHORT_ATTRIBUTE && type <= RECORD_PREFIX_ATTRIBUTE_Z); +} + +static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret ) +{ + WS_XML_ATTRIBUTE *attr; + unsigned char type = 0; + HRESULT hr; + + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (!is_attribute_type( type )) return WS_E_INVALID_FORMAT; + if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; + + if (type >= RECORD_PREFIX_ATTRIBUTE_A && type <= RECORD_PREFIX_ATTRIBUTE_Z) + { + unsigned char ch = type - RECORD_PREFIX_ATTRIBUTE_A + 'a'; + if (!(attr->prefix = alloc_xml_string( &ch, 1 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + if ((hr = read_string( reader, &attr->localName )) != S_OK) goto error; + if ((hr = read_attribute_value_bin( reader, attr )) != S_OK) goto error; + } + else + { + switch (type) + { + case RECORD_SHORT_ATTRIBUTE: + if (!(attr->prefix = alloc_xml_string( NULL, 0 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + if ((hr = read_string( reader, &attr->localName )) != S_OK) goto error; + if ((hr = read_attribute_value_bin( reader, attr )) != S_OK) goto error; + break; + + case RECORD_ATTRIBUTE: + if ((hr = read_string( reader, &attr->prefix )) != S_OK) goto error; + if ((hr = read_string( reader, &attr->localName )) != S_OK) goto error; + if ((hr = read_attribute_value_bin( reader, attr )) != S_OK) goto error; + break; + + case RECORD_SHORT_XMLNS_ATTRIBUTE: + if (!(attr->prefix = alloc_xml_string( NULL, 0 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + if ((hr = read_string( reader, &attr->ns )) != S_OK) goto error; + attr->isXmlNs = 1; + break; + + case RECORD_XMLNS_ATTRIBUTE: + if ((hr = read_string( reader, &attr->prefix )) != S_OK) goto error; + if ((hr = read_string( reader, &attr->ns )) != S_OK) goto error; + if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; + attr->isXmlNs = 1; + break; + + default: + ERR( "unhandled record type %02x\n", type ); + return WS_E_NOT_SUPPORTED; + } + } + + *ret = attr; + return S_OK; + +error: + free_attribute( attr ); + return hr; +} + static inline struct node *find_parent( struct reader *reader ) { if (node_type( reader->current ) == WS_XML_NODE_TYPE_END_ELEMENT) @@ -1438,6 +1556,28 @@ static inline BOOL is_element_type( unsigned char type ) return (type >= RECORD_SHORT_ELEMENT && type <= RECORD_PREFIX_ELEMENT_Z); } +static HRESULT read_attributes_bin( struct reader *reader, WS_XML_ELEMENT_NODE *elem ) +{ + WS_XML_ATTRIBUTE *attr; + unsigned char type; + HRESULT hr; + + reader->current_attr = 0; + for (;;) + { + if ((hr = read_peek( reader, &type )) != 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) + { + free_attribute( attr ); + return hr; + } + reader->current_attr++; + } + return S_OK; +} + static HRESULT read_element_bin( struct reader *reader ) { struct node *node = NULL, *parent; @@ -1491,6 +1631,7 @@ static HRESULT read_element_bin( struct reader *reader ) goto error; } + if ((hr = read_attributes_bin( reader, elem )) != S_OK) goto error; if ((hr = set_namespaces( reader, elem )) != S_OK) goto error; read_insert_node( reader, parent, node ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 34fe2da..41cbadc 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4510,8 +4510,13 @@ static void test_binary_encoding(void) { static const char res[] = {0x40,0x01,'t',0x01}; + static const char res2[] = + {0x6d,0x01,'t',0x09,0x01,'p',0x02,'n','s',0x01}; + static const char res3[] = + {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x01}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; + const WS_XML_ATTRIBUTE *attr; WS_XML_READER *reader; HRESULT hr; @@ -4543,6 +4548,70 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* single character prefix element */ + hr = set_input_bin( reader, res2, sizeof(res2) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, 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 ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->prefix->length == 1, "got %u\n", elem->prefix->length ); + ok( !memcmp( elem->prefix->bytes, "p", 1 ), "wrong prefix\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + + hr = WsReadNode( reader, 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 ); + + /* element */ + hr = set_input_bin( reader, res3, sizeof(res3) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, 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 ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->prefix->length == 2, "got %u\n", elem->prefix->length ); + ok( !memcmp( elem->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + + hr = WsReadNode( reader, 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 ); }

1 0

Hans Leidekker : webservices: Add initial support for binary XML in the reader.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 505d60f988adc4be9a735afc800d172b2e7183ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=505d60f988adc4be9a735afc8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:40 2017 +0200 webservices: Add initial support for binary XML in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 451 +++++++++++++++++++++++++++++++--------- dlls/webservices/tests/reader.c | 52 +++++ 2 files changed, 399 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=505d60f988adc4be9a735…

1 0

Hans Leidekker : webservices: Add support for writing comments in binary mode.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: df5c1b6ed8c7e920be1616b6a988ee5d7a585666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5c1b6ed8c7e920be1616b6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:38 2017 +0200 webservices: Add support for writing comments in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 18 ++++++++++++++++-- dlls/webservices/writer.c | 24 +++++++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3e8dad4..2102c15 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3130,8 +3130,10 @@ static void test_repeating_element(void) static const WS_XML_STRING *init_xmlstring( const char *src, WS_XML_STRING *str ) { if (!src) return NULL; - str->length = strlen( src ); - str->bytes = (BYTE *)src; + str->length = strlen( src ); + str->bytes = (BYTE *)src; + str->dictionary = NULL; + str->id = 0; return str; } @@ -3453,6 +3455,8 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0x05,0x02,'p','2',0x01,'t',0x98,0x00,0x09,0x02,'p','2',0x02,'n','s',0x01}; static const char res103[] = {0x40,0x01,'t',0x05,0x02,'p','2',0x01,'t',0x98,0x04,'t','e','s','t',0x09,0x02,'p','2',0x02,'n','s',0x01}; + static const char res200[] = + {0x02,0x07,'c','o','m','m','e','n','t'}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; static const char prefix[] = "p", prefix2[] = "p2"; @@ -3460,6 +3464,7 @@ static void test_binary_encoding(void) const WS_XML_STRING *prefix_ptr, *localname_ptr, *ns_ptr; WS_XML_STRING str, str2, str3, localname2 = {1, (BYTE *)"t"}, empty = {0, NULL}; WS_XML_UTF8_TEXT utf8 = {{WS_XML_TEXT_TYPE_UTF8}}; + WS_XML_COMMENT_NODE comment = {{WS_XML_NODE_TYPE_COMMENT}}; WS_XML_WRITER *writer; HRESULT hr; ULONG i; @@ -3549,6 +3554,15 @@ static void test_binary_encoding(void) if (hr == S_OK) check_output_bin( writer, attr_tests[i].result, attr_tests[i].len_result, __LINE__ ); } + hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + comment.value.bytes = (BYTE *)"comment"; + comment.value.length = sizeof("comment") - 1; + hr = WsWriteNode( writer, &comment.node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr == S_OK) check_output_bin( writer, res200, sizeof(res200), __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index adf110d..bbd969d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3551,7 +3551,7 @@ static HRESULT write_add_comment_node( struct writer *writer, const WS_XML_STRIN return S_OK; } -static HRESULT write_comment( struct writer *writer ) +static HRESULT write_comment_text( struct writer *writer ) { const WS_XML_COMMENT_NODE *comment = (const WS_XML_COMMENT_NODE *)writer->current; HRESULT hr; @@ -3563,6 +3563,28 @@ static HRESULT write_comment( struct writer *writer ) return S_OK; } +static HRESULT write_comment_bin( struct writer *writer ) +{ + const WS_XML_COMMENT_NODE *comment = (const WS_XML_COMMENT_NODE *)writer->current; + HRESULT hr; + + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, RECORD_COMMENT ); + return write_string( writer, comment->value.bytes, comment->value.length ); +} + +static HRESULT write_comment( struct writer *writer ) +{ + switch (writer->output_enc) + { + case WS_XML_WRITER_ENCODING_TYPE_TEXT: return write_comment_text( writer ); + case WS_XML_WRITER_ENCODING_TYPE_BINARY: return write_comment_bin( writer ); + default: + ERR( "unhandled encoding %u\n", writer->output_enc ); + return WS_E_NOT_SUPPORTED; + } +} + static HRESULT write_comment_node( struct writer *writer, const WS_XML_STRING *value ) { HRESULT hr;

1 0

Alistair Leslie-Hughes : oleaut32/tests: Add more VarCat tests.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: e0b5496ccbafa33a5b2e78b12fa9d445804a57e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b5496ccbafa33a5b2e78b12… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 23 00:41:00 2017 +0000 oleaut32/tests: Add more VarCat tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 206 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 0e86ffb..a271c50 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -97,6 +97,150 @@ static BOOL has_i8; #define R8_MAX DBL_MAX #define R8_MIN DBL_MIN +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(dispatch_invoke); + +typedef struct +{ + IDispatch IDispatch_iface; + VARTYPE vt; + HRESULT result; +} DummyDispatch; + +static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) +{ + return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); +} + +static ULONG WINAPI DummyDispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI DummyDispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI DummyDispatch_QueryInterface(IDispatch *iface, + REFIID riid, + void** ppvObject) +{ + *ppvObject = NULL; + + if (IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + IDispatch_AddRef(iface); + } + + return *ppvObject ? S_OK : E_NOINTERFACE; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfo(IDispatch *iface, UINT tinfo, LCID lcid, ITypeInfo **ti) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, + UINT cnames, LCID lcid, DISPID *dispid) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, + DISPID dispid, REFIID riid, + LCID lcid, WORD wFlags, + DISPPARAMS *params, + VARIANT *res, + EXCEPINFO *ei, + UINT *arg_err) +{ + DummyDispatch *This = impl_from_IDispatch(iface); + + CHECK_EXPECT(dispatch_invoke); + + ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", wine_dbgstr_guid(riid)); + ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); + + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); + ok(params->cArgs == 0, "got %d\n", params->cArgs); + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); + + ok(res != NULL, "got %p\n", res); + ok(V_VT(res) == VT_EMPTY, "got %d\n", V_VT(res)); + ok(ei == NULL, "got %p\n", ei); + ok(arg_err == NULL, "got %p\n", arg_err); + + if (FAILED(This->result)) + return This->result; + + V_VT(res) = This->vt; + if (This->vt == VT_UI1) + V_UI1(res) = 34; + else if (This->vt == VT_NULL) + { + V_VT(res) = VT_NULL; + V_BSTR(res) = NULL; + } + else + memset(res, 0, sizeof(*res)); + + return S_OK; +} + +static const IDispatchVtbl DummyDispatch_VTable = +{ + DummyDispatch_QueryInterface, + DummyDispatch_AddRef, + DummyDispatch_Release, + DummyDispatch_GetTypeInfoCount, + DummyDispatch_GetTypeInfo, + DummyDispatch_GetIDsOfNames, + DummyDispatch_Invoke +}; + +static void init_test_dispatch(VARTYPE vt, DummyDispatch *dispatch) +{ + dispatch->IDispatch_iface.lpVtbl = &DummyDispatch_VTable; + dispatch->vt = vt; + dispatch->result = S_OK; +} + typedef struct IRecordInfoImpl { IRecordInfo IRecordInfo_iface; @@ -5607,6 +5751,7 @@ static void test_VarCat(void) HRESULT hres; HRESULT expected_error_num; int cmp; + DummyDispatch dispatch; CHECKPTR(VarCat); @@ -5941,6 +6086,67 @@ static void test_VarCat(void) VariantClear(&result); VariantClear(&expected); + /* Dispatch conversion */ + init_test_dispatch(VT_NULL, &dispatch); + V_VT(&left) = VT_DISPATCH; + V_DISPATCH(&left) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_UI1, &dispatch); + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + V_VT(&left) = VT_BSTR; + V_BSTR(&left) = SysAllocString(sz12); + SET_EXPECT(dispatch_invoke); + hres = pVarCat(&left,&right,&result); + ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + ok(!strcmp_wa(V_BSTR(&result), "1234"), "got %s\n", wine_dbgstr_w(V_BSTR(&result))); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + dispatch.result = E_OUTOFMEMORY; + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + /* Test boolean conversion */ V_VT(&left) = VT_BOOL; V_BOOL(&left) = VARIANT_TRUE;

1 0

Stefan Dösinger : iphlpapi: Implement if_nametoindex.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: a1026df4031292eeb8b33b2c0ca970560dc8b038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1026df4031292eeb8b33b2c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 24 19:09:53 2017 +0200 iphlpapi: Implement if_nametoindex. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 23 ++++++++++++++++++++++- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4e01926..4e5970c 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -160,7 +160,7 @@ @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) #@ stub if_indextoname -#@ stub if_nametoindex +@ stdcall if_nametoindex(str) IPHLP_if_nametoindex #@ stub InitializeIpForwardEntry #@ stub InitializeIpInterfaceEntry #@ stub InitializeUnicastIpAddressEntry diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 796950e..c592a90 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3208,3 +3208,17 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) luid->Info.IfType = row.dwType; return NO_ERROR; } + +/****************************************************************** + * if_nametoindex (IPHLPAPI.@) + */ +IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) +{ + IF_INDEX idx; + + TRACE("(%s)\n", name); + if (getInterfaceIndexByName(name, &idx) == NO_ERROR) + return idx; + + return 0; +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 5fb23fb..3369f78 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -96,6 +96,8 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); + static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); @@ -144,6 +146,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } } @@ -1792,7 +1795,7 @@ static void test_interface_identifier_conversion(void) SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; char nameA[IF_MAX_STRING_SIZE + 1]; - NET_IFINDEX index; + NET_IFINDEX index, index2; if (!pConvertInterfaceIndexToLuid) { @@ -1951,6 +1954,24 @@ static void test_interface_identifier_conversion(void) ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + + /* if_nametoindex */ + if (pif_nametoindex) + { + index2 = pif_nametoindex( NULL ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( nameA ); + ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); + /* Wargaming.net Game Center passes a GUID-like string. */ + index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); + ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + } + else + { + skip("if_nametoindex not supported\n"); + } } static void test_GetIfEntry2(void)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 8b4a31ebd5d741dd5caed3b6fe284b1ce9e55f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4a31ebd5d741dd5caed3b6f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 25 12:50:31 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5e7f597..c1fa0c5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7235,7 +7235,7 @@ msgstr "vain luku" #: oleacc.rc:105 msgctxt "object state" msgid "hot tracked" -msgstr "osoitettu" +msgstr "pikajäljitetty" #: oleacc.rc:106 msgctxt "object state" @@ -7250,7 +7250,7 @@ msgstr "laajennettu" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "kutistettu" +msgstr "tiivistetty" #: oleacc.rc:109 msgctxt "object state" @@ -7260,7 +7260,7 @@ msgstr "varattu" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "kelluva" +msgstr "irrallinen" #: oleacc.rc:111 msgctxt "object state" @@ -7315,7 +7315,7 @@ msgstr "linkitetty" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "käyty" +msgstr "läpikäyty" #: oleacc.rc:122 msgctxt "object state" @@ -11742,11 +11742,8 @@ msgid "&About Registry Editor" msgstr "&Tietoja rekisterieditorista" #: regedit.rc:91 regedit.rc:98 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "laajennettu" +msgstr "Laajenna" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -12222,11 +12219,8 @@ msgid "" msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1' ja sen aliavaimet?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "kutistettu" +msgstr "Tiivistä" #: regsvr32.rc:32 msgid ""

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: db000d21285ae72b3c4801b539d1c4da1710782e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db000d21285ae72b3c4801b53… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 25 08:06:10 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2d64d32..39a02a1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-26 09:05+0300\n" +"PO-Revision-Date: 2017-05-25 08:05+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7256,12 +7256,12 @@ msgstr "numatytasis" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "išplėstas" +msgstr "išskleistas" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "sutrauktas" +msgstr "suskleistas" #: oleacc.rc:109 msgctxt "object state" @@ -11732,7 +11732,7 @@ msgstr "&Kelių eilučių reikšmė" #: regedit.rc:55 regedit.rc:107 regedit.rc:129 msgid "&Expandable String Value" -msgstr "&Išskleidžiama eilutės reikšmė" +msgstr "&Išplečiama eilutės reikšmė" #: regedit.rc:59 regedit.rc:112 msgid "&Rename\tF2" @@ -11767,11 +11767,8 @@ msgid "&About Registry Editor" msgstr "&Apie Registro tvarkytuvę" #: regedit.rc:91 regedit.rc:98 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "išplėstas" +msgstr "Išskleisti" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -12251,11 +12248,8 @@ msgid "" msgstr "Ar tikrai norite pašalinti registro raktą „%1“ ir visus jo porakčius?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "sutrauktas" +msgstr "Suskleisti" #: regsvr32.rc:32 msgid ""

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalSphericalLight().
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: c940057171fda0754eb8d577607efce6c0e19fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c940057171fda0754eb8d5776… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 23 11:04:29 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalSphericalLight(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index a1d7930..c8000a1 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3160,7 +3160,7 @@ static void test_D3DXSHEvalSphericalLight(void) dir.x = 1.1f; dir.y = 1.2f; dir.z = 2.76f; - for (l = 0; l < sizeof(test) / sizeof(test[0]); l++) + for (l = 0; l < ARRAY_SIZE(test); ++l) { for (order = D3DXSH_MINORDER; order <= D3DXSH_MAXORDER; order++) {

1 0