Hans Leidekker : webservices: Don' t validate reader state in read_endelement.
Module: wine Branch: master Commit: b960e6f81b821ea4b5da6ddaf82badadd3c765d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b960e6f81b821ea4b5da6ddaf8... Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 15:43:44 2016 +0100 webservices: Don't validate reader state in read_endelement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 ---------- dlls/webservices/tests/reader.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 08f2287..515ed1e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1101,16 +1101,6 @@ static HRESULT read_endelement( struct reader *reader ) WS_XML_STRING *prefix, *localname; HRESULT hr; - switch (reader->state) - { - case READER_STATE_TEXT: - case READER_STATE_STARTELEMENT: - case READER_STATE_STARTENDELEMENT: - break; - default: - return WS_E_INVALID_FORMAT; - } - if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; read_skip( reader, 2 ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index d2f2308..958d08c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -885,7 +885,7 @@ static void test_WsReadStartElement(void) if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr );
participants (1)
-
Alexandre Julliard