Nikolay Sivov : xmllite/reader: Fix position methods return values in closed reader state.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 79a65678fc158a56e789946e3ce6ebbf6bda0d0a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79a65678fc158a56e789946e3c...

Author: Nikolay Sivov 
Date:   Fri Mar 10 11:06:42 2017 +0300

xmllite/reader: Fix position methods return values in closed reader state.

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

---

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

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index c9ab4e1..c5aa99b 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -3320,7 +3320,7 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb
         break;
     }

-    return S_OK;
+    return This->state == XmlReadState_Closed ? S_FALSE : S_OK;
 }

static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_position)
@@ -3355,7 +3355,7 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po
         break;
     }

-    return S_OK;
+    return This->state == XmlReadState_Closed ? S_FALSE : S_OK;
 }

static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count)
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index a44af67..f7987c7 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -2484,6 +2484,8 @@ static void test_reader_position(void)
     hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL);
     ok(hr == S_OK, "S_OK, got %08x\n", hr);

+    TEST_READER_STATE(reader, XmlReadState_Closed);
+
     /* position methods with Null args */
     hr = IXmlReader_GetLineNumber(reader, NULL);
     ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
@@ -2493,13 +2495,11 @@ static void test_reader_position(void)

position = 123;
     hr = IXmlReader_GetLinePosition(reader, &position);
-todo_wine
     ok(hr == S_FALSE, "got %#x\n", hr);
     ok(position == 0, "got %u\n", position);

position = 123;
     hr = IXmlReader_GetLineNumber(reader, &position);
-todo_wine
     ok(hr == S_FALSE, "got %#x\n", hr);
     ok(position == 0, "got %u\n", position);

@@ -2508,6 +2508,7 @@ todo_wine
     hr = IXmlReader_SetInput(reader, (IUnknown *)stream);
     ok(hr == S_OK, "got %08x\n", hr);

+    TEST_READER_STATE(reader, XmlReadState_Initial);
     TEST_READER_POSITION(reader, 0, 0);
     hr = IXmlReader_Read(reader, &type);
     ok(hr == S_OK, "got %08x\n", hr);
@@ -2532,6 +2533,7 @@ todo_wine
     TEST_READER_POSITION2(reader, 1, 37, ~0u, 40);

IXmlReader_SetInput(reader, NULL);
+    TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);
     TEST_READER_POSITION(reader, 0, 0);

IStream_Release(stream);