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

Nikolay Sivov : rpcrt4/tests: Added missing assignment (Coverity).
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: dcdf7d6f6d40b7f4eca6598a9a5253f9ad5c7ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdf7d6f6d40b7f4eca6598a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 14 23:32:17 2017 +0300 rpcrt4/tests: Added missing assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 2 +- dlls/rpcrt4/tests/server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 7fdaf88..f026e99 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -1146,7 +1146,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; - INetFwProfile_get_AuthorizedApplications( profile, &apps ); + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); ok( hr == S_OK, "got %08x\n", hr ); if (hr != S_OK) goto done; diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 44a024d..b42a78f 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1875,7 +1875,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; - INetFwProfile_get_AuthorizedApplications( profile, &apps ); + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); ok( hr == S_OK, "got %08x\n", hr ); if (hr != S_OK) goto done;

1 0

Nikolay Sivov : dwrite/tests: Fix rendering mode variable type (Coverity).
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: 74a9894819df4323be60e9c397a0d5c41a3b7592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a9894819df4323be60e9c39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 15 07:09:56 2017 +0300 dwrite/tests: Fix rendering mode variable type (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f1fef78..35be12e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5917,8 +5917,8 @@ static void test_GetRecommendedRenderingMode(void) mode1 = IDWriteRenderingParams3_GetRenderingMode1(params3); ok(mode1 == DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED, "got %d\n", mode1); - mode1 = IDWriteRenderingParams3_GetRenderingMode(params3); - ok(mode1 == DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC, "got %d\n", mode1); + mode = IDWriteRenderingParams3_GetRenderingMode(params3); + ok(mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, "got %d\n", mode); hr = IDWriteRenderingParams3_QueryInterface(params3, &IID_IDWriteRenderingParams, (void**)&params); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alex Henrie : mountmgr: Name DosDevices constants consistently.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: 88f245d068c1e86d96164bc0b8a5fd708702575f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f245d068c1e86d96164bc0b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 14 23:43:05 2017 -0600 mountmgr: Name DosDevices constants consistently. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 1b439d2..5101f2b 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1000,12 +1000,12 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p { static const WCHAR comW[] = {'C','O','M','%','u',0}; static const WCHAR lptW[] = {'L','P','T','%','u',0}; - static const WCHAR auxW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','A','U','X',0}; - static const WCHAR prnW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','P','R','N',0}; static const WCHAR device_serialW[] = {'\\','D','e','v','i','c','e','\\','S','e','r','i','a','l','%','u',0}; static const WCHAR device_parallelW[] = {'\\','D','e','v','i','c','e','\\','P','a','r','a','l','l','e','l','%','u',0}; static const WCHAR dosdevices_comW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','C','O','M','%','u',0}; + static const WCHAR dosdevices_auxW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','A','U','X',0}; static const WCHAR dosdevices_lptW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','L','P','T','%','u',0}; + static const WCHAR dosdevices_prnW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','P','R','N',0}; const WCHAR *dos_name_format, *nt_name_format, *reg_value_format, *symlink_format, *default_device; WCHAR dos_name[7], reg_value[256], nt_buffer[32], symlink_buffer[32]; DWORD type, size; @@ -1020,7 +1020,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p nt_name_format = device_serialW; reg_value_format = comW; symlink_format = dosdevices_comW; - default_device = auxW; + default_device = dosdevices_auxW; } else { @@ -1028,7 +1028,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p nt_name_format = device_parallelW; reg_value_format = dosdevices_lptW; symlink_format = dosdevices_lptW; - default_device = prnW; + default_device = dosdevices_prnW; } sprintfW( dos_name, dos_name_format, n );

1 0

Hans Leidekker : webservices: Move the reader to the next node in WsCopyNode.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: b37f7e81d29b36a667f820065e036ffb986b9176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37f7e81d29b36a667f820065… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 15 09:59:19 2017 +0200 webservices: Move the reader to the next node in WsCopyNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 5 +++++ dlls/webservices/writer.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 1d1ed04..5319769 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1940,6 +1940,7 @@ static void test_WsCopyNode(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"u"}, ns = {0, NULL}; WS_XML_NODE_POSITION pos, pos2; + const WS_XML_NODE *node; WS_XML_WRITER *writer; WS_XML_READER *reader; WS_XML_BUFFER *buffer; @@ -1998,6 +1999,10 @@ static void test_WsCopyNode(void) ok( pos2.buffer == pos.buffer, "wrong buffer\n" ); ok( pos2.node == pos.node, "wrong node\n" ); + 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 ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 81e21e5..74b6efd 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3427,6 +3427,8 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO if ((hr = write_tree( writer )) != S_OK) goto done; writer->current = current; + WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); + done: LeaveCriticalSection( &writer->cs ); return hr;

1 0

Hans Leidekker : webservices: Properly handle readers positioned at BOF or EOF in WsCopyNode.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: bae46fb214859a96b17b0f4168286a940ae220e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae46fb214859a96b17b0f416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 15 09:59:20 2017 +0200 webservices: Properly handle readers positioned at BOF or EOF in WsCopyNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 57 +++++++++++++++++++++++++++-------------- dlls/webservices/tests/writer.c | 35 +++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 19 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0cfc844..85a6dc9 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -407,25 +407,6 @@ static void clear_prefixes( struct prefix *prefixes, ULONG count ) } } -HRESULT copy_node( WS_XML_READER *handle, struct node **node ) -{ - struct reader *reader = (struct reader *)handle; - HRESULT hr; - - EnterCriticalSection( &reader->cs ); - - if (reader->magic != READER_MAGIC) - { - LeaveCriticalSection( &reader->cs ); - return E_INVALIDARG; - } - - hr = dup_tree( node, reader->current ); - - LeaveCriticalSection( &reader->cs ); - return hr; -} - static HRESULT set_prefix( struct prefix *prefix, const WS_XML_STRING *str, const WS_XML_STRING *ns ) { if (str) @@ -1654,6 +1635,44 @@ static HRESULT read_node( struct reader *reader ) } } +HRESULT copy_node( WS_XML_READER *handle, struct node **node ) +{ + struct reader *reader = (struct reader *)handle; + const struct list *ptr; + const struct node *start; + HRESULT hr; + + EnterCriticalSection( &reader->cs ); + + if (reader->magic != READER_MAGIC) + { + LeaveCriticalSection( &reader->cs ); + return E_INVALIDARG; + } + + if (reader->current != reader->root) ptr = &reader->current->entry; + else /* copy whole tree */ + { + if (!read_end_of_data( reader )) + { + for (;;) + { + if ((hr = read_node( reader )) != S_OK) goto done; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_EOF) break; + } + } + ptr = list_head( &reader->root->children ); + } + + start = LIST_ENTRY( ptr, struct node, entry ); + if (node_type( start ) == WS_XML_NODE_TYPE_EOF) hr = WS_E_INVALID_OPERATION; + else hr = dup_tree( node, start ); + +done: + LeaveCriticalSection( &reader->cs ); + return hr; +} + /************************************************************************** * WsReadEndElement [webservices.@] */ diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 5319769..5c86595 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2003,6 +2003,41 @@ static void test_WsCopyNode(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + /* reader positioned at EOF */ + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCopyNode( writer, reader, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + /* reader positioned at BOF */ + hr = set_input( reader, "<v/>", sizeof("<v/>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof("<v/>") - 1, 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_BOF, "got %u\n", node->nodeType ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCopyNode( writer, reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_buffer( buffer, "<v/>", __LINE__ ); + + 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 ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap );

1 0

Hans Leidekker : webservices: Treat empty prefixes as NULL.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: a1c9801dc60be12e74ffef32e2a9b96371ce8b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c9801dc60be12e74ffef32e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 15 09:59:21 2017 +0200 webservices: Treat empty prefixes as NULL. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 35 ++++++++++++++++++++++++++++++----- dlls/webservices/writer.c | 12 ++++++------ 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 5c86595..0d5fa2a 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -395,7 +395,7 @@ static void test_WsWriteStartElement(void) HRESULT hr; WS_XML_WRITER *writer; WS_XML_STRING prefix = {1, (BYTE *)"p"}, ns = {2, (BYTE *)"ns"}, ns2 = {3, (BYTE *)"ns2"}; - WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}; + WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}, empty = {0, NULL}; hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -469,6 +469,17 @@ static void test_WsWriteStartElement(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\"><b xmlns=\"ns2\"/></p:a>", __LINE__ ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &empty, &localname, &empty, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndStartElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<a></a>", __LINE__ ); + WsFreeWriter( writer ); } @@ -476,7 +487,8 @@ 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_STRING prefix = {1, (BYTE *)"p"}, localname = {3, (BYTE *)"str"}; + WS_XML_STRING localname2 = {3, (BYTE *)"len"}, ns = {2, (BYTE *)"ns"}, empty = {0, NULL}; WS_XML_UTF8_TEXT text = {{WS_XML_TEXT_TYPE_UTF8}}; hr = WsCreateWriter( NULL, 0, &writer, NULL ); @@ -492,9 +504,7 @@ static void test_WsWriteStartAttribute(void) 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 ); + hr = WsWriteStartAttribute( writer, &prefix, &localname2, &ns, FALSE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "", __LINE__ ); @@ -513,6 +523,21 @@ static void test_WsWriteStartAttribute(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<p:str p:len=\"0\" xmlns:p=\"ns\"/>", __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 = WsWriteStartAttribute( writer, &empty, &localname2, &empty, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndAttribute( writer, 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:str len=\"\" xmlns:p=\"ns\"/>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 74b6efd..5902f45 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -518,12 +518,12 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) /* ' prefix:attr="value"' */ size = attr->localName->length + 4 /* ' =""' */; - if (prefix) size += prefix->length + 1 /* ':' */; + if (prefix && prefix->length) size += prefix->length + 1 /* ':' */; if (text) size += text->value.length; if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_char( writer, ' ' ); - if (prefix) + if (prefix && prefix->length) { write_bytes( writer, prefix->bytes, prefix->length ); write_char( writer, ':' ); @@ -734,11 +734,11 @@ static HRESULT write_startelement( struct writer *writer ) /* '<prefix:localname prefix:attr="value"... xmlns:prefix="ns"'... */ size = elem->localName->length + 1 /* '<' */; - if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; + if (elem->prefix && elem->prefix->length) size += elem->prefix->length + 1 /* ':' */; if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_char( writer, '<' ); - if (elem->prefix) + if (elem->prefix && elem->prefix->length) { write_bytes( writer, elem->prefix->bytes, elem->prefix->length ); write_char( writer, ':' ); @@ -796,12 +796,12 @@ static HRESULT write_endelement( struct writer *writer, const WS_XML_ELEMENT_NOD /* '</prefix:localname>' */ size = elem->localName->length + 3 /* '</>' */; - if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; + if (elem->prefix && elem->prefix->length) size += elem->prefix->length + 1 /* ':' */; if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_char( writer, '<' ); write_char( writer, '/' ); - if (elem->prefix) + if (elem->prefix && elem->prefix->length) { write_bytes( writer, elem->prefix->bytes, elem->prefix->length ); write_char( writer, ':' );

1 0

Hans Leidekker : webservices: Fix duplicating attributes.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: eaf2cd11aef7696bf1ec3f854ade8641b38fbb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf2cd11aef7696bf1ec3f854… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 15 09:59:22 2017 +0200 webservices: Fix duplicating attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 85a6dc9..4e7211f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -151,16 +151,28 @@ void destroy_nodes( struct node *node ) static WS_XML_ATTRIBUTE *dup_attribute( const WS_XML_ATTRIBUTE *src ) { WS_XML_ATTRIBUTE *dst; - const WS_XML_STRING *prefix = (src->prefix && src->prefix->length) ? src->prefix : NULL; + const WS_XML_STRING *prefix = src->prefix; const WS_XML_STRING *localname = src->localName; const WS_XML_STRING *ns = src->localName; + const WS_XML_TEXT *text = src->value; if (!(dst = heap_alloc( sizeof(*dst) ))) return NULL; dst->singleQuote = src->singleQuote; dst->isXmlNs = src->isXmlNs; - if (prefix && !(dst->prefix = alloc_xml_string( prefix->bytes, prefix->length ))) goto error; - if (localname && !(dst->localName = alloc_xml_string( localname->bytes, localname->length ))) goto error; - if (ns && !(dst->ns = alloc_xml_string( ns->bytes, ns->length ))) goto error; + + if (!prefix) dst->prefix = NULL; + else if (!(dst->prefix = alloc_xml_string( prefix->bytes, prefix->length ))) goto error; + if (!(dst->localName = alloc_xml_string( localname->bytes, localname->length ))) goto error; + if (!(dst->ns = alloc_xml_string( ns->bytes, ns->length ))) goto error; + + if (text) + { + WS_XML_UTF8_TEXT *utf8; + const WS_XML_UTF8_TEXT *utf8_src = (const WS_XML_UTF8_TEXT *)text; + if (!(utf8 = alloc_utf8_text( utf8_src->value.bytes, utf8_src->value.length ))) goto error; + dst->value = &utf8->text; + } + return dst; error: @@ -223,7 +235,7 @@ static struct node *dup_text_node( const WS_XML_TEXT_NODE *src ) if (src->text) { WS_XML_UTF8_TEXT *utf8; - const WS_XML_UTF8_TEXT *utf8_src = (WS_XML_UTF8_TEXT *)src->text; + const WS_XML_UTF8_TEXT *utf8_src = (const WS_XML_UTF8_TEXT *)src->text; if (!(utf8 = alloc_utf8_text( utf8_src->value.bytes, utf8_src->value.length ))) { free_node( node );

1 0

Hans Leidekker : webservices: Use a WS_BYTES structure to store XML buffer data.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: 3f20b66a546b214d23026c81dd9d7e999d62e7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f20b66a546b214d23026c81d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 15 09:59:23 2017 +0200 webservices: Use a WS_BYTES structure to store XML buffer data. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/heap.c | 10 +++++----- dlls/webservices/reader.c | 4 ++-- dlls/webservices/webservices_private.h | 3 +-- dlls/webservices/writer.c | 30 +++++++++++++++--------------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 9e8e0bd..7a4b3b4 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -320,21 +320,21 @@ struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap ) struct xmlbuf *ret; if (!(ret = ws_alloc( heap, sizeof(*ret) ))) return NULL; - if (!(ret->ptr = ws_alloc( heap, XML_BUFFER_INITIAL_ALLOCATED_SIZE ))) + if (!(ret->bytes.bytes = ws_alloc( heap, XML_BUFFER_INITIAL_ALLOCATED_SIZE ))) { ws_free( heap, ret, sizeof(*ret) ); return NULL; } - ret->heap = heap; - ret->size_allocated = XML_BUFFER_INITIAL_ALLOCATED_SIZE; - ret->size = 0; + ret->heap = heap; + ret->size = XML_BUFFER_INITIAL_ALLOCATED_SIZE; + ret->bytes.length = 0; return ret; } void free_xmlbuf( struct xmlbuf *xmlbuf ) { if (!xmlbuf) return; - ws_free( xmlbuf->heap, xmlbuf->ptr, xmlbuf->size_allocated ); + ws_free( xmlbuf->heap, xmlbuf->bytes.bytes, xmlbuf->size ); ws_free( xmlbuf->heap, xmlbuf, sizeof(*xmlbuf) ); } diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4e7211f..1d85f00 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4662,12 +4662,12 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, if ((hr = init_reader( reader )) != S_OK) goto done; - charset = detect_charset( xmlbuf->ptr, xmlbuf->size, &offset ); + charset = detect_charset( xmlbuf->bytes.bytes, xmlbuf->bytes.length, &offset ); hr = prop_set( reader->prop, reader->prop_count, WS_XML_READER_PROPERTY_CHARSET, &charset, sizeof(charset) ); if (hr != S_OK) goto done; - set_input_buffer( reader, xmlbuf, (const unsigned char *)xmlbuf->ptr + offset, xmlbuf->size - offset ); + set_input_buffer( reader, xmlbuf, xmlbuf->bytes.bytes + offset, xmlbuf->bytes.length - offset ); if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; else read_insert_bof( reader, node ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 0a1a953..75dfdb9 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -21,8 +21,7 @@ struct xmlbuf { WS_HEAP *heap; - void *ptr; - SIZE_T size_allocated; + WS_BYTES bytes; SIZE_T size; }; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 5902f45..b9ddb39 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -288,8 +288,8 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT if (size != sizeof(*bytes)) hr = E_INVALIDARG; else { - bytes->bytes = writer->output_buf->ptr; - bytes->length = writer->output_buf->size; + bytes->bytes = writer->output_buf->bytes.bytes; + bytes->length = writer->output_buf->bytes.length; } break; } @@ -310,7 +310,7 @@ static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf ) } writer->output_buf = xmlbuf; writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; - writer->write_bufptr = xmlbuf->ptr; + writer->write_bufptr = xmlbuf->bytes.bytes; writer->write_pos = 0; } @@ -441,16 +441,16 @@ static HRESULT write_grow_buffer( struct writer *writer, ULONG size ) SIZE_T new_size; void *tmp; - if (buf->size_allocated >= writer->write_pos + size) + if (buf->size >= writer->write_pos + size) { - buf->size = writer->write_pos + size; + buf->bytes.length = writer->write_pos + size; return S_OK; } - new_size = max( buf->size_allocated * 2, writer->write_pos + size ); - if (!(tmp = ws_realloc( buf->heap, buf->ptr, buf->size_allocated, new_size ))) return WS_E_QUOTA_EXCEEDED; - writer->write_bufptr = buf->ptr = tmp; - buf->size_allocated = new_size; - buf->size = writer->write_pos + size; + new_size = max( buf->size * 2, writer->write_pos + size ); + if (!(tmp = ws_realloc( buf->heap, buf->bytes.bytes, buf->size, new_size ))) return WS_E_QUOTA_EXCEEDED; + writer->write_bufptr = buf->bytes.bytes = tmp; + buf->size = new_size; + buf->bytes.length = writer->write_pos + size; return S_OK; } @@ -2820,8 +2820,8 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W } if ((hr = write_flush( writer )) != S_OK) goto done; - if ((hr = write_grow_buffer( writer, xmlbuf->size )) != S_OK) goto done; - write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); + if ((hr = write_grow_buffer( writer, xmlbuf->bytes.length )) != S_OK) goto done; + write_bytes( writer, xmlbuf->bytes.bytes, xmlbuf->bytes.length ); done: LeaveCriticalSection( &writer->cs ); @@ -2869,12 +2869,12 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu if (hr != S_OK) goto done; } - if (!(buf = ws_alloc( heap, xmlbuf->size ))) hr = WS_E_QUOTA_EXCEEDED; + if (!(buf = ws_alloc( heap, xmlbuf->bytes.length ))) hr = WS_E_QUOTA_EXCEEDED; else { - memcpy( buf, xmlbuf->ptr, xmlbuf->size ); + memcpy( buf, xmlbuf->bytes.bytes, xmlbuf->bytes.length ); *bytes = buf; - *size = xmlbuf->size; + *size = xmlbuf->bytes.length; } done:

1 0

Hans Leidekker : webservices: Implement WS_XML_WRITER_PROPERTY_BUFFERS.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: 87522d67cfdeac45ffe25e4ad0a7dbade811f612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87522d67cfdeac45ffe25e4ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 15 09:59:24 2017 +0200 webservices: Implement WS_XML_WRITER_PROPERTY_BUFFERS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 14 +++++++++----- dlls/webservices/writer.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 0d5fa2a..4dfa1db 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1969,6 +1969,7 @@ static void test_WsCopyNode(void) WS_XML_WRITER *writer; WS_XML_READER *reader; WS_XML_BUFFER *buffer; + WS_BUFFERS bufs; WS_HEAP *heap; HRESULT hr; @@ -2049,20 +2050,23 @@ static void test_WsCopyNode(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); - hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsCopyNode( writer, reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output_buffer( buffer, "<v/>", __LINE__ ); + check_output( writer, "<v/>", __LINE__ ); 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 ); + memset( &bufs, 0, sizeof(bufs) ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFERS, &bufs, sizeof(bufs), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( bufs.bufferCount == 1, "got %u\n", bufs.bufferCount ); + ok( bufs.buffers != NULL, "buffers not set\n" ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b9ddb39..421b79d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -293,6 +293,19 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT } break; } + case WS_XML_WRITER_PROPERTY_BUFFERS: + if (writer->output_buf->bytes.length) + { + WS_BUFFERS *buffers = buf; + if (size != sizeof(*buffers)) hr = E_INVALIDARG; + else + { + buffers->bufferCount = 1; + buffers->buffers = &writer->output_buf->bytes; + } + break; + } + /* fall through */ default: hr = prop_get( writer->prop, writer->prop_count, id, buf, size ); }

1 0

Hugh McMaster : uninstaller: Pass RegQueryValueExW() the size of the buffer (Coverity).
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: 581533b65c7d6144c66ad03423453ca12fc2b6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581533b65c7d6144c66ad0342… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 15 08:02:31 2017 +0000 uninstaller: Pass RegQueryValueExW() the size of the buffer (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 6909e0f..1c834ea 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -228,6 +228,7 @@ static int FetchFromRootKey(HKEY root) for (i=0; RegEnumKeyExW( root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL ) != ERROR_NO_MORE_ITEMS; ++i) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); + size = sizeof(value); if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &type, (LPBYTE)&value, &size) && type == REG_DWORD && value == 1) {

1 0