xmllite/reader: Reset node type to XmlNodeType_None on EOF.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
0cbd938af8
commit
b188079349
|
@ -2552,7 +2552,10 @@ static HRESULT reader_parse_nextnode(xmlreader *reader)
|
||||||
if (FAILED(hr)) return hr;
|
if (FAILED(hr)) return hr;
|
||||||
|
|
||||||
if (hr == S_FALSE)
|
if (hr == S_FALSE)
|
||||||
|
{
|
||||||
reader->instate = XmlReadInState_Eof;
|
reader->instate = XmlReadInState_Eof;
|
||||||
|
reader->nodetype = XmlNodeType_None;
|
||||||
|
}
|
||||||
return hr;
|
return hr;
|
||||||
case XmlReadInState_Eof:
|
case XmlReadInState_Eof:
|
||||||
return S_FALSE;
|
return S_FALSE;
|
||||||
|
|
|
@ -904,8 +904,7 @@ todo_wine
|
||||||
hr = IXmlReader_Read(reader, &type);
|
hr = IXmlReader_Read(reader, &type);
|
||||||
todo_wine
|
todo_wine
|
||||||
ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr);
|
ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr);
|
||||||
todo_wine
|
ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type));
|
||||||
ok(type == XmlNodeType_None, "expected None, got %s\n", type_to_str(type));
|
|
||||||
ok_pos(reader, 1, 41, -1, -1, TRUE);
|
ok_pos(reader, 1, 41, -1, -1, TRUE);
|
||||||
test_read_state(reader, XmlReadState_Error, -1, TRUE);
|
test_read_state(reader, XmlReadState_Error, -1, TRUE);
|
||||||
|
|
||||||
|
@ -2065,7 +2064,6 @@ static void test_namespaceuri(void)
|
||||||
|
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
todo_wine
|
|
||||||
ok(type == XmlNodeType_None, "Unexpected node type %d\n", type);
|
ok(type == XmlNodeType_None, "Unexpected node type %d\n", type);
|
||||||
|
|
||||||
IStream_Release(stream);
|
IStream_Release(stream);
|
||||||
|
|
Loading…
Reference in New Issue