[PATCH] msado15: Implement _Recordset get/put Bookmark

[Alistair Leslie-Hughes]

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/msado15/recordset.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index a86936eb037..05107d7a50e 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -1029,14 +1029,22 @@ static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof )
 
 static HRESULT WINAPI recordset_get_Bookmark( _Recordset *iface, VARIANT *bookmark )
 {
-    FIXME( "%p, %p\n", iface, bookmark );
-    return E_NOTIMPL;
+    struct recordset *recordset = impl_from_Recordset( iface );
+    TRACE( "%p, %p\n", iface, bookmark );
+    V_VT(bookmark) = VT_I4;
+    V_I4(bookmark) = recordset->index;
+    return S_OK;
 }
 
 static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmark )
 {
-    FIXME( "%p, %s\n", iface, debugstr_variant(&bookmark) );
-    return E_NOTIMPL;
+    struct recordset *recordset = impl_from_Recordset( iface );
+    TRACE( "%p, %s\n", iface, debugstr_variant(&bookmark) );
+    if (V_VT(&bookmark) != VT_I4)
+        ERR("Unexpected type %d\n", V_VT(&bookmark));
+
+    recordset->index = V_I4(&bookmark);
+    return S_OK;
 }
 
 static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size )
-- 
2.30.2

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=87692

Your paranoid android.


=== debiant2 (build log) ===

Task: WineTest did not produce the win32 report

=== debiant2 (build log) ===

Task: Could not create the wow32 wineprefix: Failed to disable the crash dialogs: 
Task: WineTest did not produce the 0 report

[Hans Leidekker]

On Thu, 2021-03-25 at 20:24 +1100, Alistair Leslie-Hughes wrote:
>  static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmark )
>  {
> -    FIXME( "%p, %s\n", iface, debugstr_variant(&bookmark) );
> -    return E_NOTIMPL;
> +    struct recordset *recordset = impl_from_Recordset( iface );
> +    TRACE( "%p, %s\n", iface, debugstr_variant(&bookmark) );
> +    if (V_VT(&bookmark) != VT_I4)
> +        ERR("Unexpected type %d\n", V_VT(&bookmark));
> +
> +    recordset->index = V_I4(&bookmark);
> +    return S_OK;
>  }

Please add a test to show what should be done with invalid input.