reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-21 03:15:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xmllite/reader: Always return node type from Read().

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-03-06 12:35:56 +03:00 committed by Alexandre Julliard
parent 80cf8838e3
commit 0cbd938af8
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/xmllite/reader.c
View File

@ -2786,12 +2786,10 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype)
hr = reader_parse_nextnode(This); hr = reader_parse_nextnode(This);
if (oldtype == XmlNodeType_None && This->nodetype != oldtype) if (oldtype == XmlNodeType_None && This->nodetype != oldtype)
This->state = XmlReadState_Interactive; This->state = XmlReadState_Interactive;
if (hr == S_OK)
{ TRACE("node type %s\n", debugstr_nodetype(This->nodetype));
TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); if (nodetype)
if (nodetype) *nodetype = This->nodetype;
*nodetype = This->nodetype;
}
return hr; return hr;
} }

37
dlls/xmllite/tests/reader.c
View File

@ -647,8 +647,9 @@ static void test_readerinput(void)
static void test_reader_state(void) static void test_reader_state(void)
{ {
IXmlReader *reader;
XmlNodeType nodetype; XmlNodeType nodetype;
IXmlReader *reader;
IStream *stream;
HRESULT hr; HRESULT hr;
hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
@ -662,10 +663,33 @@ static void test_reader_state(void)
test_read_state(reader, XmlReadState_Closed, -1, FALSE); test_read_state(reader, XmlReadState_Closed, -1, FALSE);
if (0) if (0)
{ {
/* newer versions crash here, probably cause no input was set */ /* newer versions crash here, probably because no input was set */
hr = IXmlReader_Read(reader, &nodetype); hr = IXmlReader_Read(reader, &nodetype);
ok(hr == S_FALSE, "got %08x\n", hr); ok(hr == S_FALSE, "got %08x\n", hr);
} }
stream = create_stream_on_data("xml", sizeof("xml"));
hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
test_read_state(reader, XmlReadState_Initial, -1, FALSE);
nodetype = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &nodetype);
todo_wine
ok(FAILED(hr), "got %08x\n", hr);
ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype);
test_read_state(reader, XmlReadState_Error, -1, TRUE);
nodetype = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &nodetype);
todo_wine
ok(FAILED(hr), "got %08x\n", hr);
ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype);
IStream_Release(stream);
IXmlReader_Release(reader); IXmlReader_Release(reader);
} }
@ -1118,9 +1142,8 @@ static void test_read_full(void)
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
i = 0; i = 0;
type = XmlNodeType_None; type = ~0u;
hr = IXmlReader_Read(reader, &type); while (IXmlReader_Read(reader, &type) == S_OK)
while (hr == S_OK)
{ {
ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i);
if (test->types[i] == XmlNodeType_None) break; if (test->types[i] == XmlNodeType_None) break;
@ -1134,7 +1157,6 @@ static void test_read_full(void)
ok(hr == S_OK, "%d: GetValue failed 0x%08x\n", i, hr); ok(hr == S_OK, "%d: GetValue failed 0x%08x\n", i, hr);
ok(len > 0, "%d: wrong value length %d\n", i, len); ok(len > 0, "%d: wrong value length %d\n", i, len);
} }
hr = IXmlReader_Read(reader, &type);
i++; i++;
} }
ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]); ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]);
@ -2024,6 +2046,7 @@ static void test_namespaceuri(void)
hr = IXmlReader_SetInput(reader, (IUnknown *)stream); hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
type = ~0u;
while (IXmlReader_Read(reader, &type) == S_OK) { while (IXmlReader_Read(reader, &type) == S_OK) {
const WCHAR *uri, *local; const WCHAR *uri, *local;
WCHAR *uriW; WCHAR *uriW;
@ -2042,6 +2065,8 @@ static void test_namespaceuri(void)
j++; j++;
} }
todo_wine
ok(type == XmlNodeType_None, "Unexpected node type %d\n", type);
IStream_Release(stream); IStream_Release(stream);
} }