Alistair Leslie-Hughes : msado15: Implement Dispatch functions in _Recordset.

[Alexandre Julliard]

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

Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Date:   Fri Feb 26 19:02:26 2021 +1100

msado15: Implement Dispatch functions in _Recordset.

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/main.c            |  1 +
 dlls/msado15/msado15_private.h |  1 +
 dlls/msado15/recordset.c       | 44 ++++++++++++++++++++++++++++++++++--------
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c
index ac92c034ff9..3bfb6a1fe66 100644
--- a/dlls/msado15/main.c
+++ b/dlls/msado15/main.c
@@ -183,6 +183,7 @@ static REFIID tid_ids[] = {
     &IID__Connection,
     &IID_Field,
     &IID_Fields,
+    &IID__Recordset,
     &IID__Stream,
 };
 
diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h
index 6bfe0fc91fd..d1e177e1a3c 100644
--- a/dlls/msado15/msado15_private.h
+++ b/dlls/msado15/msado15_private.h
@@ -47,6 +47,7 @@ typedef enum tid_t {
     Connection_tid,
     Field_tid,
     Fields_tid,
+    Recordset_tid,
     Stream_tid,
     LAST_tid
 } tid_t;
diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index 1c550680e0d..a4fe5b53736 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -928,29 +928,57 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid,
 
 static HRESULT WINAPI recordset_GetTypeInfoCount( _Recordset *iface, UINT *count )
 {
-    FIXME( "%p, %p\n", iface, count );
-    return E_NOTIMPL;
+    struct recordset *recordset = impl_from_Recordset( iface );
+    TRACE( "%p, %p\n", recordset, count );
+    *count = 1;
+    return S_OK;
 }
 
 static HRESULT WINAPI recordset_GetTypeInfo( _Recordset *iface, UINT index, LCID lcid, ITypeInfo **info )
 {
-    FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info );
-    return E_NOTIMPL;
+    struct recordset *recordset = impl_from_Recordset( iface );
+    TRACE( "%p, %u, %u, %p\n", recordset, index, lcid, info );
+    return get_typeinfo(Recordset_tid, info);
 }
 
 static HRESULT WINAPI recordset_GetIDsOfNames( _Recordset *iface, REFIID riid, LPOLESTR *names, UINT count,
                                                 LCID lcid, DISPID *dispid )
 {
-    FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid );
-    return E_NOTIMPL;
+    struct recordset *recordset = impl_from_Recordset( iface );
+    HRESULT hr;
+    ITypeInfo *typeinfo;
+
+    TRACE( "%p, %s, %p, %u, %u, %p\n", recordset, debugstr_guid(riid), names, count, lcid, dispid );
+
+    hr = get_typeinfo(Recordset_tid, &typeinfo);
+    if(SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid);
+        ITypeInfo_Release(typeinfo);
+    }
+
+    return hr;
 }
 
 static HRESULT WINAPI recordset_Invoke( _Recordset *iface, DISPID member, REFIID riid, LCID lcid, WORD flags,
                                          DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err )
 {
-    FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params,
+    struct recordset *recordset = impl_from_Recordset( iface );
+    HRESULT hr;
+    ITypeInfo *typeinfo;
+
+    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", recordset, member, debugstr_guid(riid), lcid, flags, params,
            result, excep_info, arg_err );
-    return E_NOTIMPL;
+
+    hr = get_typeinfo(Recordset_tid, &typeinfo);
+    if(SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_Invoke(typeinfo, &recordset->Recordset_iface, member, flags, params,
+                               result, excep_info, arg_err);
+        ITypeInfo_Release(typeinfo);
+    }
+
+    return hr;
 }
 
 static HRESULT WINAPI recordset_get_Properties( _Recordset *iface, Properties **obj )