ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webservices: Fix the condition to determine when to skip writing a namespace attribute. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2016-08-25 20:02:45 +02:00 committed by Alexandre Julliard
parent 633828f832
commit 3950998778
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/webservices/writer.c
View File

@ -558,6 +558,12 @@ static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XM
return S_OK; return S_OK;
} }
static inline BOOL str_equal( const WS_XML_STRING *str1, const WS_XML_STRING *str2 )
{
if (!str1 && !str2) return TRUE;
return WsXmlStringEquals( str1, str2, NULL ) == S_OK;
}
static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_STRING *prefix, static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_STRING *prefix,
const WS_XML_STRING *ns ) const WS_XML_STRING *ns )
{ {
@ -572,11 +578,8 @@ static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_ST
for (i = 0; i < elem->attributeCount; i++) for (i = 0; i < elem->attributeCount; i++)
{ {
if (!elem->attributes[i]->isXmlNs) continue; if (!elem->attributes[i]->isXmlNs) continue;
if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && if (str_equal( elem->attributes[i]->prefix, prefix ) &&
WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) str_equal( elem->attributes[i]->ns, ns )) return TRUE;
{
return TRUE;
}
} }
} }
return FALSE; return FALSE;
@ -587,8 +590,7 @@ static HRESULT write_set_element_namespace( struct writer *writer )
WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; WS_XML_ELEMENT_NODE *elem = &writer->current->hdr;
HRESULT hr; HRESULT hr;
if (!elem->ns->length || is_current_namespace( writer, elem->ns ) || if (!elem->ns->length || namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK;
namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK;
if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK)
return hr; return hr;