Nikolay Sivov : xmllite/reader: Implement IsEOF().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 073c43a139de7cb6bc43c2d4a9328fbd004f6903
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=073c43a139de7cb6bc43c2d4a9...

Author: Nikolay Sivov 
Date:   Mon Mar  6 12:35:58 2017 +0300

xmllite/reader: Implement IsEOF().

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/xmllite/reader.c       |  6 +++--
 dlls/xmllite/tests/reader.c | 56 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index ae5d9ea..8e975b3 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -2554,6 +2554,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader)
             if (hr == S_FALSE)
             {
                 reader->instate = XmlReadInState_Eof;
+                reader->state = XmlReadState_EndOfFile;
                 reader->nodetype = XmlNodeType_None;
             }
             return hr;
@@ -3171,8 +3172,9 @@ static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth)

static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface)
 {
-    FIXME("(%p): stub\n", iface);
-    return FALSE;
+    xmlreader *This = impl_from_IXmlReader(iface);
+    TRACE("(%p)\n", iface);
+    return This->state == XmlReadState_EndOfFile;
 }

static const struct IXmlReaderVtbl xmlreader_vtbl =
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index f41375a..6389019 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -2173,6 +2173,61 @@ static void test_encoding_detection(void)
     IXmlReader_Release(reader);
 }

+static void test_eof_state(IXmlReader *reader, BOOL eof)
+{
+    LONG_PTR state;
+    HRESULT hr;
+
+    ok(IXmlReader_IsEOF(reader) == eof, "Unexpected IsEOF() result\n");
+    hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state);
+    ok(hr == S_OK, "GetProperty() failed, %#x\n", hr);
+    ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %ld\n", state);
+}
+
+static void test_endoffile(void)
+{
+    static const char *xml = "<a/>";
+    IXmlReader *reader;
+    XmlNodeType type;
+    IStream *stream;
+    HRESULT hr;
+
+    hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
+    ok(hr == S_OK, "S_OK, got %08x\n", hr);
+
+    test_eof_state(reader, FALSE);
+
+    stream = create_stream_on_data(xml, strlen(xml));
+
+    hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
+    ok(hr == S_OK, "got %08x\n", hr);
+
+    test_eof_state(reader, FALSE);
+
+    type = XmlNodeType_None;
+    hr = IXmlReader_Read(reader, &type);
+    ok(hr == S_OK, "got %#x\n", hr);
+    ok(type == XmlNodeType_Element, "Unexpected type %d\n", type);
+
+    test_eof_state(reader, FALSE);
+
+    type = XmlNodeType_Element;
+    hr = IXmlReader_Read(reader, &type);
+    ok(hr == S_FALSE, "got %#x\n", hr);
+    ok(type == XmlNodeType_None, "Unexpected type %d\n", type);
+
+    test_eof_state(reader, TRUE);
+
+    hr = IXmlReader_SetInput(reader, NULL);
+    ok(hr == S_OK, "got %08x\n", hr);
+
+    test_eof_state(reader, FALSE);
+
+    IStream_Release(stream);
+
+    IXmlReader_Release(reader);
+}
+
 START_TEST(reader)
 {
     test_reader_create();
@@ -2196,4 +2251,5 @@ START_TEST(reader)
     test_namespaceuri();
     test_read_charref();
     test_encoding_detection();
+    test_endoffile();
 }