Alistair Leslie-Hughes : msado15: Implement _Recordset get_CursorLocation and put_CursorLocation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7d51008ecf1666ea7ceb44c8f92185c30612ec90
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7d51008ecf1666ea7ceb44c8f...

Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Date:   Thu Jan 23 23:43:38 2020 +0000

msado15: Implement _Recordset get_CursorLocation and put_CursorLocation.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msado15/recordset.c     | 20 ++++++++++++++++----
 dlls/msado15/tests/msado15.c |  6 ++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index 1d28d6b957..1f16add4c3 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -43,6 +43,7 @@ struct recordset
     LONG               allocated;
     LONG               index;
     VARIANT           *data;
+    CursorLocationEnum cursor_location;
 };
 
 struct fields
@@ -1229,14 +1230,24 @@ static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affec
 
 static HRESULT WINAPI recordset_get_CursorLocation( _Recordset *iface, CursorLocationEnum *cursor_loc )
 {
-    FIXME( "%p, %p\n", iface, cursor_loc );
-    return E_NOTIMPL;
+    struct recordset *recordset = impl_from_Recordset( iface );
+
+    TRACE( "%p, %p\n", iface, cursor_loc );
+
+    *cursor_loc = recordset->cursor_location;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLocationEnum cursor_loc )
 {
-    FIXME( "%p, %u\n", iface, cursor_loc );
-    return E_NOTIMPL;
+    struct recordset *recordset = impl_from_Recordset( iface );
+
+    TRACE( "%p, %u\n", iface, cursor_loc );
+
+    recordset->cursor_location = cursor_loc;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *records_affected, _Recordset **record_set )
@@ -1524,6 +1535,7 @@ HRESULT Recordset_create( void **obj )
     recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl;
     recordset->refs = 1;
     recordset->index = -1;
+    recordset->cursor_location = adUseServer;
 
     *obj = &recordset->Recordset_iface;
     TRACE( "returning iface %p\n", *obj );
diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c
index afdf0dfb6a..917d131063 100644
--- a/dlls/msado15/tests/msado15.c
+++ b/dlls/msado15/tests/msado15.c
@@ -65,6 +65,7 @@ static void test_Recordset(void)
     Field *field;
     LONG refs, count, state;
     VARIANT missing, val, index;
+    CursorLocationEnum location;
     BSTR name;
     HRESULT hr;
 
@@ -132,6 +133,11 @@ static void test_Recordset(void)
     ok( hr == S_OK, "got %08x\n", hr );
     ok( state == adStateClosed, "got %d\n", state );
 
+    location = -1;
+    hr = _Recordset_get_CursorLocation( recordset, &location );
+    ok( hr == S_OK, "got %08x\n", hr );
+    ok( location == adUseServer, "got %d\n", location );
+
     VariantInit( &missing );
     hr = _Recordset_AddNew( recordset, missing, missing );
     ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );