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

wsdapi: Return "any" headers in read_message. 

Signed-off-by: Owen Rudge <orudge@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Owen Rudge 2018-06-13 19:11:26 +01:00 committed by Alexandre Julliard
parent 254203a45e
commit 098a99fc41
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/wsdapi/soap.c
View File

@ -1317,6 +1317,35 @@ static WSDXML_ELEMENT *find_element(WSDXML_ELEMENT *parent, LPCWSTR name, LPCWST
return NULL;
}
static void remove_element(WSDXML_ELEMENT *element)
{
WSDXML_NODE *cur;
if (element == NULL)
return;
if (element->Node.Parent->FirstChild == (WSDXML_NODE *) element)
element->Node.Parent->FirstChild = element->Node.Next;
else
{
cur = element->Node.Parent->FirstChild;
while (cur != NULL)
{
if (cur->Next == (WSDXML_NODE *) element)
{
cur->Next = element->Node.Next;
break;
}
cur = cur->Next;
}
}
WSDDetachLinkedMemory(element);
WSDFreeLinkedMemory(element);
}
HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type)
{
WSDXML_ELEMENT *envelope = NULL, *header_element, *body_element;
@ -1438,6 +1467,17 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg
soap_msg->Header.MessageID = duplicate_string(soap_msg, value);
if (soap_msg->Header.MessageID == NULL) goto outofmemory;
/* Now detach and free known headers to leave the "any" elements */
remove_element(find_element(header_element, actionString, addressingNsUri));
remove_element(find_element(header_element, toString, addressingNsUri));
remove_element(find_element(header_element, messageIdString, addressingNsUri));
remove_element(find_element(header_element, appSequenceString, discoveryNsUri));
soap_msg->Header.AnyHeaders = (WSDXML_ELEMENT *) header_element->FirstChild;
if (soap_msg->Header.AnyHeaders != NULL)
soap_msg->Header.AnyHeaders->Node.Parent = NULL;
/* Find the body element */
body_element = find_element(envelope, bodyString, envelopeNsUri);

2
dlls/wsdapi/tests/discovery.c
View File

@ -491,7 +491,7 @@ static void verify_wsdxml_any_text(const char *debug_prefix, WSDXML_ELEMENT *any
{
WSDXML_TEXT *child;
todo_wine ok(any != NULL, "%s: any == NULL\n", debug_prefix);
ok(any != NULL, "%s: any == NULL\n", debug_prefix);
if (any == NULL) return;
child = (WSDXML_TEXT *) any->FirstChild;