Alistair Leslie-Hughes : msdasql: Implement ISourcesRowset GetSourcesRowset for enumeration.
Alexandre Julliard
julliard at winehq.org
Wed Nov 3 16:42:00 CDT 2021
Module: wine
Branch: master
Commit: cf82bc541773bb22b120f42f852c8863a222fbac
URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf82bc541773bb22b120f42f852c8863a222fbac
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Wed Nov 3 16:37:10 2021 +1100
msdasql: Implement ISourcesRowset GetSourcesRowset for enumeration.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msdasql/msdasql_main.c | 137 +++++++++++++++++++++++++++++++++++++++++-
dlls/oledb32/tests/database.c | 6 +-
2 files changed, 138 insertions(+), 5 deletions(-)
diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c
index ff16413004e..7402b505270 100644
--- a/dlls/msdasql/msdasql_main.c
+++ b/dlls/msdasql/msdasql_main.c
@@ -26,6 +26,7 @@
#include "oledb.h"
#include "rpcproxy.h"
#include "wine/debug.h"
+#include "oledberr.h"
#include "initguid.h"
#include "msdasql.h"
@@ -605,13 +606,145 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface)
return ref;
}
+struct msdasql_enum_rowset
+{
+ IRowset IRowset_iface;
+ LONG ref;
+};
+
+static inline struct msdasql_enum_rowset *msdasql_rs_from_IRowset(IRowset *iface)
+{
+ return CONTAINING_RECORD(iface, struct msdasql_enum_rowset, IRowset_iface);
+}
+
+static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv)
+{
+ struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
+
+ TRACE( "%p, %s, %p\n", rowset, debugstr_guid(riid), ppv );
+ *ppv = NULL;
+
+ if(IsEqualGUID(&IID_IUnknown, riid) ||
+ IsEqualGUID(&IID_IRowset, riid))
+ {
+ *ppv = &rowset->IRowset_iface;
+ }
+
+ if(*ppv)
+ {
+ IUnknown_AddRef((IUnknown*)*ppv);
+ return S_OK;
+ }
+
+ FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI enum_rowset_AddRef(IRowset *iface)
+{
+ struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
+ LONG refs = InterlockedIncrement( &rowset->ref );
+ TRACE( "%p new refcount %d\n", rowset, refs );
+ return refs;
+}
+
+static ULONG WINAPI enum_rowset_Release(IRowset *iface)
+{
+ struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
+ LONG refs = InterlockedDecrement( &rowset->ref );
+ TRACE( "%p new refcount %d\n", rowset, refs );
+ if (!refs)
+ {
+ TRACE( "destroying %p\n", rowset );
+ free( rowset );
+ }
+ return refs;
+}
+
+static HRESULT WINAPI enum_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count,
+ const HROW rows[], DBREFCOUNT ref_counts[], DBROWSTATUS status[])
+{
+ struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
+
+ FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enum_rowset_GetData(IRowset *iface, HROW row, HACCESSOR accessor, void *data)
+{
+ struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
+
+ FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enum_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved, DBROWOFFSET offset,
+ DBROWCOUNT count, DBCOUNTITEM *obtained, HROW **rows)
+{
+ struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
+
+ FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows);
+
+ if (!obtained || !rows)
+ return E_INVALIDARG;
+
+ *obtained = 0;
+
+ if (!count)
+ return S_OK;
+
+ return DB_S_ENDOFROWSET;
+}
+
+static HRESULT WINAPI enum_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count,
+ const HROW rows[], DBROWOPTIONS options[], DBREFCOUNT ref_counts[], DBROWSTATUS status[])
+{
+ struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
+
+ FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status);
+
+ return S_OK;
+}
+
+static HRESULT WINAPI enum_rowset_RestartPosition(IRowset *iface, HCHAPTER reserved)
+{
+ struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface );
+
+ FIXME("%p, %ld\n", rowset, reserved);
+
+ return S_OK;
+}
+
+static const struct IRowsetVtbl enum_rowset_vtbl =
+{
+ enum_rowset_QueryInterface,
+ enum_rowset_AddRef,
+ enum_rowset_Release,
+ enum_rowset_AddRefRows,
+ enum_rowset_GetData,
+ enum_rowset_GetNextRows,
+ enum_rowset_ReleaseRows,
+ enum_rowset_RestartPosition
+};
+
static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnknown *outer, REFIID riid, ULONG sets,
DBPROPSET properties[], IUnknown **rowset)
{
struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface);
- FIXME("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset);
+ struct msdasql_enum_rowset *enum_rs;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset);
+
+ enum_rs = malloc(sizeof(*enum_rs));
+ enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl;
+ enum_rs->ref = 1;
+
+ hr = IRowset_QueryInterface(&enum_rs->IRowset_iface, riid, (void**)rowset);
+ IRowset_Release(&enum_rs->IRowset_iface);
+ return hr;
}
static const ISourcesRowsetVtbl msdsqlenum_vtbl =
diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c
index 7fdc3df4176..7e298fcb129 100644
--- a/dlls/oledb32/tests/database.c
+++ b/dlls/oledb32/tests/database.c
@@ -1073,19 +1073,19 @@ static void test_odbc_enumerator(void)
}
hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, 0, (IUnknown**)&rowset);
- todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr);
+ ok(hr == S_OK, "Failed to create object 0x%08x\n", hr);
if (hr == S_OK)
{
IAccessor *accessor;
IRowsetInfo *info;
hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void **)&accessor);
- ok(hr == S_OK, "got %08x\n", hr);
+ todo_wine ok(hr == S_OK, "got %08x\n", hr);
if (hr == S_OK)
IAccessor_Release(accessor);
hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void **)&info);
- ok(hr == S_OK, "got %08x\n", hr);
+ todo_wine ok(hr == S_OK, "got %08x\n", hr);
if (hr == S_OK)
IRowsetInfo_Release(info);
More information about the wine-cvs
mailing list