November 2015 - Wine-commits

Hans Leidekker : webservices: Avoid writing redundant namespace attributes.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: e9435db25ff7e95c9a97bf7ce643f8c010d06a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9435db25ff7e95c9a97bf7ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:03 2015 +0100 webservices: Avoid writing redundant namespace attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f55f56e..feb858f 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -73,6 +73,7 @@ struct writer enum writer_state state; struct node *root; struct node *current; + WS_XML_STRING *current_ns; WS_XML_WRITER_OUTPUT_TYPE output_type; struct xmlbuf *output_buf; WS_HEAP *output_heap; @@ -123,6 +124,7 @@ static HRESULT get_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID static void free_writer( struct writer *writer ) { destroy_nodes( writer->root ); + heap_free( writer->current_ns ); WsFreeHeap( writer->output_heap ); heap_free( writer ); } @@ -161,8 +163,11 @@ static HRESULT write_init_state( struct writer *writer ) { struct node *node; + heap_free( writer->current_ns ); + writer->current_ns = NULL; destroy_nodes( writer->root ); writer->root = NULL; + if (!(node = alloc_node( WS_XML_NODE_TYPE_EOF ))) return E_OUTOFMEMORY; write_insert_eof( writer, node ); writer->state = WRITER_STATE_INITIAL; @@ -476,6 +481,20 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) return S_OK; } +static inline BOOL is_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) +{ + return (WsXmlStringEquals( writer->current_ns, ns, NULL ) == S_OK); +} + +static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) +{ + WS_XML_STRING *str; + if (!(str = alloc_xml_string( (const char *)ns->bytes, ns->length ))) return E_OUTOFMEMORY; + heap_free( writer->current_ns ); + writer->current_ns = str; + return S_OK; +} + static HRESULT write_startelement( struct writer *writer ) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)writer->current; @@ -486,7 +505,7 @@ static HRESULT write_startelement( struct writer *writer ) size = elem->localName->length + 1 /* '<' */; if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; - if (elem->ns->length) + if (elem->ns->length && !is_current_namespace( writer, elem->ns )) { size += strlen(" xmlns") + elem->ns->length + 3 /* '=""' */; if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; @@ -504,8 +523,10 @@ static HRESULT write_startelement( struct writer *writer ) { if ((hr = write_attribute( writer, elem->attributes[i] )) != S_OK) return hr; } - if (elem->ns->length) + if (elem->ns->length && !is_current_namespace( writer, elem->ns )) { + if ((hr = set_current_namespace( writer, elem->ns )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)" xmlns", 6 ); if (elem->prefix) {

1 0

Hans Leidekker : webservices: Implement WsWriteEndStartElement.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: f236df36fcd2c0756eb442f1cb72720786dde740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f236df36fcd2c0756eb442f1c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:04 2015 +0100 webservices: Implement WsWriteEndStartElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 1d811ae..df56adb 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -174,7 +174,7 @@ @ stub WsWriteEndAttribute @ stub WsWriteEndCData @ stdcall WsWriteEndElement(ptr ptr) -@ stub WsWriteEndStartElement +@ stdcall WsWriteEndStartElement(ptr ptr) @ stub WsWriteEnvelopeEnd @ stub WsWriteEnvelopeStart @ stub WsWriteMessageEnd diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index feb858f..976f97b 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -611,6 +611,28 @@ HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error ) } /************************************************************************** + * WsWriteEndStartElement [webservices.@] + */ +HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + if (writer->state != WRITER_STATE_STARTELEMENT) return WS_E_INVALID_OPERATION; + + if ((hr = write_startelement( writer )) != S_OK) return hr; + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, '>' ); + + writer->state = WRITER_STATE_ENDSTARTELEMENT; + return S_OK; +} + +/************************************************************************** * WsWriteStartElement [webservices.@] */ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING *prefix,

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 08c32f4ec34739c4ac73ae9a824db112ceaeb737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c32f4ec34739c4ac73ae9a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:05 2015 +0100 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/writer.c | 79 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 9f0ae2b..95aac89 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -326,10 +326,89 @@ static void test_WsSetOutputToBuffer(void) WsFreeHeap( heap ); } +static void check_output( WS_XML_WRITER *writer, const char *expected, unsigned int line ) +{ + WS_BYTES bytes; + ULONG size = sizeof(bytes); + int len = strlen( expected ); + HRESULT hr; + + memset( &bytes, 0, sizeof(bytes) ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", line, hr ); + ok( bytes.length == len, "%u: got %u expected %u\n", line, bytes.length, len ); + if (bytes.length != len) return; + ok( !memcmp( bytes.bytes, expected, len ), "%u: got %s expected %s\n", line, bytes.bytes, expected ); +} + +static void test_WsWriteStartElement(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING prefix = {1, (BYTE *)"p"}, ns = {2, (BYTE *)"ns"}; + WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( NULL, &prefix, &localname, &ns, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* first call to WsWriteStartElement doesn't output anything */ + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + /* two ways to close an element */ + hr = WsWriteEndStartElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\"></p:a>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\"/>", __LINE__ ); + + /* nested elements */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<a xmlns=\"ns\">", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<a xmlns=\"ns\"><b/>", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<a xmlns=\"ns\"><b/></a>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); test_WsCreateXmlBuffer(); test_WsSetOutput(); test_WsSetOutputToBuffer(); + test_WsWriteStartElement(); }

1 0

Hans Leidekker : webservices: Implement WsWriteStartAttribute.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 919b1b5fdc0564ba4286029df9854a68ef7ffb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=919b1b5fdc0564ba4286029df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:06 2015 +0100 webservices: Implement WsWriteStartAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 4 ++-- dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 ++ dlls/webservices/writer.c | 43 ++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a0d0792..cc71f98 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -284,7 +284,7 @@ struct node *alloc_node( WS_XML_NODE_TYPE type ) return ret; } -static void free_attribute( WS_XML_ATTRIBUTE *attr ) +void free_attribute( WS_XML_ATTRIBUTE *attr ) { if (!attr) return; heap_free( attr->prefix ); @@ -807,7 +807,7 @@ static HRESULT read_xmldecl( struct reader *reader ) return S_OK; } -static HRESULT append_attribute( WS_XML_ELEMENT_NODE *elem, WS_XML_ATTRIBUTE *attr ) +HRESULT append_attribute( WS_XML_ELEMENT_NODE *elem, WS_XML_ATTRIBUTE *attr ) { if (elem->attributeCount) { diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index df56adb..c92588b 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -181,7 +181,7 @@ @ stub WsWriteMessageStart @ stub WsWriteNode @ stub WsWriteQualifiedName -@ stub WsWriteStartAttribute +@ stdcall WsWriteStartAttribute(ptr ptr ptr ptr long ptr) @ stub WsWriteStartCData @ stdcall WsWriteStartElement(ptr ptr ptr ptr ptr) @ stub WsWriteText diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index cac9b87..3bb039f 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -29,6 +29,8 @@ void *ws_realloc( WS_HEAP *, void *, SIZE_T ) DECLSPEC_HIDDEN; void ws_free( WS_HEAP *, void * ) DECLSPEC_HIDDEN; const char *debugstr_xmlstr( const WS_XML_STRING * ) DECLSPEC_HIDDEN; WS_XML_STRING *alloc_xml_string( const char *, ULONG ) DECLSPEC_HIDDEN; +HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; +void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 976f97b..a9ff761 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -633,6 +633,49 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) } /************************************************************************** + * WsWriteStartAttribute [webservices.@] + */ +HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + BOOL single, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_ELEMENT_NODE *elem; + WS_XML_ATTRIBUTE *attr; + HRESULT hr = E_OUTOFMEMORY; + + TRACE( "%p %s %s %s %d %p\n", handle, debugstr_xmlstr(prefix), debugstr_xmlstr(localname), + debugstr_xmlstr(ns), single, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !localname || !ns) return E_INVALIDARG; + + if (writer->state != WRITER_STATE_STARTELEMENT) return WS_E_INVALID_OPERATION; + elem = (WS_XML_ELEMENT_NODE *)writer->current; + + if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; + attr->singleQuote = !!single; + + if (prefix && !(attr->prefix = alloc_xml_string( (const char *)prefix->bytes, prefix->length ))) + goto error; + + if (!(attr->localName = alloc_xml_string( (const char *)localname->bytes, localname->length ))) + goto error; + + if (!(attr->ns = alloc_xml_string( (const char *)ns->bytes, ns->length ))) + goto error; + + if ((hr = append_attribute( elem, attr )) != S_OK) goto error; + + writer->state = WRITER_STATE_STARTATTRIBUTE; + return S_OK; + +error: + free_attribute( attr ); + return hr; +} + +/************************************************************************** * WsWriteStartElement [webservices.@] */ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING *prefix,

1 0

Hans Leidekker : webservices: Implement WsWriteEndAttribute.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 112e1af5f15bb72fcfdbe5508cef7ed3008e6e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=112e1af5f15bb72fcfdbe5508… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:07 2015 +0100 webservices: Implement WsWriteEndAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index c92588b..8189768 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -171,7 +171,7 @@ @ stub WsWriteChars @ stub WsWriteCharsUtf8 @ stub WsWriteElement -@ stub WsWriteEndAttribute +@ stdcall WsWriteEndAttribute(ptr ptr) @ stub WsWriteEndCData @ stdcall WsWriteEndElement(ptr ptr) @ stdcall WsWriteEndStartElement(ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index a9ff761..59a2859 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -566,6 +566,23 @@ static HRESULT write_endelement( struct writer *writer ) } /************************************************************************** + * WsWriteEndAttribute [webservices.@] + */ +HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + if (writer->state != WRITER_STATE_STARTATTRIBUTE) return WS_E_INVALID_OPERATION; + + writer->state = WRITER_STATE_STARTELEMENT; + return S_OK; +} + +/************************************************************************** * WsWriteEndElement [webservices.@] */ HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error )

1 0

Hans Leidekker : webservices: Implement WsWriteText.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 83e4e135716d71001085c18284664372be82d96c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e4e135716d71001085c1828… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:08 2015 +0100 webservices: Implement WsWriteText. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- dlls/webservices/tests/writer.c | 46 ++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 32 +++++++++++++++++++++++ 5 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index cc71f98..10f3aab 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -659,7 +659,7 @@ WS_XML_STRING *alloc_xml_string( const char *data, ULONG len ) return ret; } -static WS_XML_UTF8_TEXT *alloc_utf8_text( const char *data, ULONG len ) +WS_XML_UTF8_TEXT *alloc_utf8_text( const char *data, ULONG len ) { WS_XML_UTF8_TEXT *ret; diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 95aac89..f99705e 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -404,6 +404,51 @@ static void test_WsWriteStartElement(void) WsFreeWriter( writer ); } +static void test_WsWriteStartAttribute(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING prefix = {1, (BYTE *)"p"}, localname = {3, (BYTE *)"str"}, ns = {2, (BYTE *)"ns"}; + WS_XML_UTF8_TEXT text; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( NULL, &prefix, &localname, &ns, FALSE, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* WsWriteStartAttribute doesn't output anything */ + localname.length = 3; + localname.bytes = (BYTE *)"len"; + hr = WsWriteStartAttribute( writer, &prefix, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + text.text.textType = WS_XML_TEXT_TYPE_UTF8; + text.value.length = 1; + text.value.bytes = (BYTE *)"0"; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + /* WsWriteEndAttribute doesn't output anything */ + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str p:len=\"0\" xmlns:p=\"ns\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -411,4 +456,5 @@ START_TEST(writer) test_WsSetOutput(); test_WsSetOutputToBuffer(); test_WsWriteStartElement(); + test_WsWriteStartAttribute(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8189768..5a2baba 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -184,7 +184,7 @@ @ stdcall WsWriteStartAttribute(ptr ptr ptr ptr long ptr) @ stub WsWriteStartCData @ stdcall WsWriteStartElement(ptr ptr ptr ptr ptr) -@ stub WsWriteText +@ stdcall WsWriteText(ptr ptr ptr) @ stub WsWriteType @ stub WsWriteValue @ stub WsWriteXmlBuffer diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 3bb039f..5c121a1 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -29,6 +29,7 @@ void *ws_realloc( WS_HEAP *, void *, SIZE_T ) DECLSPEC_HIDDEN; void ws_free( WS_HEAP *, void * ) DECLSPEC_HIDDEN; const char *debugstr_xmlstr( const WS_XML_STRING * ) DECLSPEC_HIDDEN; WS_XML_STRING *alloc_xml_string( const char *, ULONG ) DECLSPEC_HIDDEN; +WS_XML_UTF8_TEXT *alloc_utf8_text( const char *, ULONG ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 59a2859..b03b15d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -738,3 +738,35 @@ error: free_node( node ); return hr; } + +/************************************************************************** + * WsWriteText [webservices.@] + */ +HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_ELEMENT_NODE *elem; + WS_XML_UTF8_TEXT *src, *dst; + + TRACE( "%p %p %p\n", handle, text, error ); + + if (!writer || !text) return E_INVALIDARG; + + if (writer->state != WRITER_STATE_STARTATTRIBUTE) + { + FIXME( "can't handle writer state %u\n", writer->state ); + return E_NOTIMPL; + } + if (text->textType != WS_XML_TEXT_TYPE_UTF8) + { + FIXME( "text type %u not supported\n", text->textType ); + return E_NOTIMPL; + } + src = (WS_XML_UTF8_TEXT *)text; + if (!(dst = alloc_utf8_text( (const char *)src->value.bytes, src->value.length ))) + return E_OUTOFMEMORY; + + elem = (WS_XML_ELEMENT_NODE *)writer->current; + elem->attributes[elem->attributeCount - 1]->value = (WS_XML_TEXT *)dst; + return S_OK; +}

1 0

Hans Leidekker : webservices/tests: Add more tests.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 038cb1183a01025dfc2a005b4a1e61d2a08d50ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=038cb1183a01025dfc2a005b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:09 2015 +0100 webservices/tests: Add more tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 164 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index dab57f1..8a6ba3e 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -29,7 +29,7 @@ static const char data2[] = static const char data3[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" - "<text>test</text>"; + "<text>test</TEXT>"; static const char data4[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" @@ -61,6 +61,9 @@ static const char data8[] = static const char data9[] = "<text xml:attr=\"value\">test</text>"; +static const char data10[] = + "<a></b>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -584,6 +587,32 @@ static void test_WsFillReader(void) WS_XML_READER *reader; const WS_XML_NODE *node; + /* what happens of we don't call WsFillReader? */ + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = set_input( reader, data1, sizeof(data1) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + WsFreeReader( reader ); + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; ok( hr == S_OK, "got %08x\n", hr ); @@ -903,6 +932,22 @@ static void test_WsReadEndElement(void) hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_input( reader, data10, sizeof(data10) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data10) - 1, NULL, NULL ); + 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 ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); WsFreeReader( reader ); } @@ -1479,6 +1524,122 @@ static void test_WsAlloc(void) WsFreeHeap( heap ); } +static void test_WsMoveReader(void) +{ + HRESULT hr; + WS_HEAP *heap; + WS_XML_READER *reader; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buffer; + WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}, ns = {0, NULL}; + const WS_XML_NODE *node; + WS_XML_ELEMENT_NODE *elem; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsMoveReader( NULL, WS_MOVE_TO_EOF, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* reader must be set to an XML buffer */ + hr = WsMoveReader( reader, WS_MOVE_TO_EOF, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, data8, sizeof(data8) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsMoveReader( reader, WS_MOVE_TO_EOF, NULL, NULL ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + WsFreeReader( reader ); + + 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/></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 ); + + 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 = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsMoveReader( reader, WS_MOVE_TO_EOF, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* first element is child node of BOF node */ + hr = WsMoveReader( reader, WS_MOVE_TO_BOF, 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 ); + 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, "a", 1 ), "wrong data\n" ); + + 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 ); + 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", elem->node.nodeType ); + + /* EOF node is last child of BOF node */ + hr = WsMoveReader( reader, WS_MOVE_TO_BOF, 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", elem->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 ); + + WsFreeReader( reader ); + WsFreeWriter( writer ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1495,4 +1656,5 @@ START_TEST(reader) test_WsGetXmlAttribute(); test_WsXmlStringEquals(); test_WsAlloc(); + test_WsMoveReader(); }

1 0

Qian Hong : quartz: Fix crashing when connect to NULL Pin.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 682291fb71288b292d590093f1021a3cd418a2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=682291fb71288b292d590093f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Nov 9 16:44:23 2015 +0800 quartz: Fix crashing when connect to NULL Pin. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 26a4080..e0474fc 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -913,6 +913,9 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); + if(!ppinOut || !ppinIn) + return E_POINTER; + if (TRACE_ON(quartz)) { hr = IPin_QueryPinInfo(ppinIn, &PinInfo);

1 0

Qian Hong : quartz/tests: Add NULL pointer tests for IGraphBuilder.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 7408a3a79ecb67c888e9b63f249348be998fbd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7408a3a79ecb67c888e9b63f2… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Nov 9 16:44:46 2015 +0800 quartz/tests: Add NULL pointer tests for IGraphBuilder. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2f56151..80b468c 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -180,6 +180,9 @@ static void test_graph_builder(void) ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); + ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned %x\n", hr); + /* add the two filters to the graph */ hr = IGraphBuilder_AddFilter(pgraph, pF, testFilterW); ok(hr == S_OK, "failed to add pF to the graph: %x\n", hr); @@ -204,6 +207,16 @@ static void test_graph_builder(void) hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, NULL); ok(hr == E_POINTER, "IGraphBuilder_FindFilterByName returned %x\n", hr); + hr = IGraphBuilder_Connect(pgraph, NULL, pIn); + ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, pIn, NULL); + ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, pIn, pIn); +todo_wine + ok(hr == VFW_E_CANNOT_CONNECT, "IGraphBuilder_Connect returned %x\n", hr); + if (pIn) IPin_Release(pIn); if (pEnum) IEnumPins_Release(pEnum); if (pF) IBaseFilter_Release(pF);

1 0

Qian Hong : quartz: Fix error code when checking circular connection.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 8254058cbb05574905edf208e20fece485b08c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8254058cbb05574905edf208e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Nov 9 16:45:03 2015 +0800 quartz: Fix error code when checking circular connection. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 ++-- dlls/quartz/tests/filtergraph.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e0474fc..0b25259 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -611,7 +611,7 @@ static HRESULT CheckCircularConnection(IFilterGraphImpl *This, IPin *out, IPin * if (info_out.dir != PINDIR_OUTPUT) { IBaseFilter_Release(info_out.pFilter); - return E_UNEXPECTED; + return VFW_E_CANNOT_CONNECT; } hr = IPin_QueryPinInfo(in, &info_in); @@ -621,7 +621,7 @@ static HRESULT CheckCircularConnection(IFilterGraphImpl *This, IPin *out, IPin * goto out; if (info_in.dir != PINDIR_INPUT) { - hr = E_UNEXPECTED; + hr = VFW_E_CANNOT_CONNECT; goto out; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 80b468c..b42aea8 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -214,7 +214,6 @@ static void test_graph_builder(void) ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); hr = IGraphBuilder_Connect(pgraph, pIn, pIn); -todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "IGraphBuilder_Connect returned %x\n", hr); if (pIn) IPin_Release(pIn);

1 0