Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
6b583f93
Commit
6b583f93
authored
Aug 31, 2016
by
Hans Leidekker
Committed by
Alexandre Julliard
Aug 31, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
webservices: Implement WsReadEnvelopeEnd.
Signed-off-by:
Hans Leidekker
<
hans@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a8c34355
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
1 deletion
+76
-1
msg.c
dlls/webservices/msg.c
+27
-0
msg.c
dlls/webservices/tests/msg.c
+47
-0
webservices.spec
dlls/webservices/webservices.spec
+1
-1
webservices.h
include/webservices.h
+1
-0
No files found.
dlls/webservices/msg.c
View file @
6b583f93
...
...
@@ -588,6 +588,33 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W
return
S_OK
;
}
static
HRESULT
read_envelope_end
(
WS_XML_READER
*
reader
)
{
HRESULT
hr
;
if
((
hr
=
WsReadEndElement
(
reader
,
NULL
))
!=
S_OK
)
return
hr
;
/* </s:Body> */
return
WsReadEndElement
(
reader
,
NULL
);
/* </s:Envelope> */
}
/**************************************************************************
* WsReadEnvelopeEnd [webservices.@]
*/
HRESULT
WINAPI
WsReadEnvelopeEnd
(
WS_MESSAGE
*
handle
,
WS_ERROR
*
error
)
{
struct
msg
*
msg
=
(
struct
msg
*
)
handle
;
HRESULT
hr
;
TRACE
(
"%p %p
\n
"
,
handle
,
error
);
if
(
error
)
FIXME
(
"ignoring error parameter
\n
"
);
if
(
!
handle
)
return
E_INVALIDARG
;
if
(
msg
->
state
!=
WS_MESSAGE_STATE_READING
)
return
WS_E_INVALID_OPERATION
;
if
((
hr
=
read_envelope_end
(
msg
->
reader_body
))
!=
S_OK
)
return
hr
;
msg
->
state
=
WS_MESSAGE_STATE_DONE
;
return
S_OK
;
}
/**************************************************************************
* WsInitializeMessage [webservices.@]
*/
...
...
dlls/webservices/tests/msg.c
View file @
6b583f93
...
...
@@ -916,6 +916,52 @@ static void test_WsReadEnvelopeStart(void)
WsFreeReader
(
reader
);
}
static
void
test_WsReadEnvelopeEnd
(
void
)
{
static
const
char
xml
[]
=
"<s:Envelope xmlns:s=
\"
http://schemas.xmlsoap.org/soap/envelope/
\"
><s:Body></s:Body></s:Envelope>"
;
WS_MESSAGE
*
msg
,
*
msg2
;
WS_XML_READER
*
reader
;
WS_MESSAGE_STATE
state
;
HRESULT
hr
;
hr
=
WsReadEnvelopeEnd
(
NULL
,
NULL
);
ok
(
hr
==
E_INVALIDARG
,
"got %08x
\n
"
,
hr
);
hr
=
WsCreateMessage
(
WS_ADDRESSING_VERSION_0_9
,
WS_ENVELOPE_VERSION_SOAP_1_1
,
NULL
,
0
,
&
msg
,
NULL
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
hr
=
WsCreateReader
(
NULL
,
0
,
&
reader
,
NULL
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
hr
=
WsInitializeMessage
(
msg
,
WS_REQUEST_MESSAGE
,
NULL
,
NULL
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
hr
=
WsCreateMessage
(
WS_ADDRESSING_VERSION_0_9
,
WS_ENVELOPE_VERSION_SOAP_1_1
,
NULL
,
0
,
&
msg2
,
NULL
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
hr
=
set_input
(
reader
,
xml
,
strlen
(
xml
)
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
hr
=
WsReadEnvelopeEnd
(
msg2
,
NULL
);
ok
(
hr
==
WS_E_INVALID_OPERATION
,
"got %08x
\n
"
,
hr
);
hr
=
WsReadEnvelopeStart
(
msg2
,
reader
,
NULL
,
NULL
,
NULL
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
hr
=
WsReadEnvelopeEnd
(
msg2
,
NULL
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
state
=
0xdeadbeef
;
hr
=
WsGetMessageProperty
(
msg2
,
WS_MESSAGE_PROPERTY_STATE
,
&
state
,
sizeof
(
state
),
NULL
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
ok
(
state
==
WS_MESSAGE_STATE_DONE
,
"got %u
\n
"
,
state
);
WsFreeMessage
(
msg
);
WsFreeMessage
(
msg2
);
WsFreeReader
(
reader
);
}
START_TEST
(
msg
)
{
test_WsCreateMessage
();
...
...
@@ -932,4 +978,5 @@ START_TEST(msg)
test_WsAddCustomHeader
();
test_WsRemoveCustomHeader
();
test_WsReadEnvelopeStart
();
test_WsReadEnvelopeEnd
();
}
dlls/webservices/webservices.spec
View file @
6b583f93
...
...
@@ -111,7 +111,7 @@
@ stdcall WsReadEndAttribute(ptr ptr)
@ stdcall WsReadEndElement(ptr ptr)
@ stub WsReadEndpointAddressExtension
@ st
ub WsReadEnvelopeEnd
@ st
dcall WsReadEnvelopeEnd(ptr ptr)
@ stdcall WsReadEnvelopeStart(ptr ptr ptr ptr ptr)
@ stub WsReadMessageEnd
@ stub WsReadMessageStart
...
...
include/webservices.h
View file @
6b583f93
...
...
@@ -1444,6 +1444,7 @@ HRESULT WINAPI WsReadElement(WS_XML_READER*, const WS_ELEMENT_DESCRIPTION*, WS_R
WS_HEAP
*
,
void
*
,
ULONG
,
WS_ERROR
*
);
HRESULT
WINAPI
WsReadEndAttribute
(
WS_XML_READER
*
,
WS_ERROR
*
);
HRESULT
WINAPI
WsReadEndElement
(
WS_XML_READER
*
,
WS_ERROR
*
);
HRESULT
WINAPI
WsReadEnvelopeEnd
(
WS_MESSAGE
*
,
WS_ERROR
*
);
HRESULT
WINAPI
WsReadEnvelopeStart
(
WS_MESSAGE
*
,
WS_XML_READER
*
,
WS_MESSAGE_DONE_CALLBACK
,
void
*
,
WS_ERROR
*
);
HRESULT
WINAPI
WsReadNode
(
WS_XML_READER
*
,
WS_ERROR
*
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment