Alistair Leslie-Hughes : oledb32: Add IDBProperties support in IDBInitialize.
Alexandre Julliard
julliard at winehq.org
Mon Oct 8 13:39:56 CDT 2012
Module: wine
Branch: master
Commit: 0eef665dbfe70d54b0bcee6514568554fff3f468
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eef665dbfe70d54b0bcee6514568554fff3f468
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Fri Oct 5 14:02:51 2012 +1000
oledb32: Add IDBProperties support in IDBInitialize.
---
dlls/oledb32/datainit.c | 74 +++++++++++++++++++++++++++++++++++++++++
dlls/oledb32/tests/database.c | 2 +-
2 files changed, 75 insertions(+), 1 deletions(-)
diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c
index a84d8aa..862c725 100644
--- a/dlls/oledb32/datainit.c
+++ b/dlls/oledb32/datainit.c
@@ -50,6 +50,7 @@ static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface)
typedef struct
{
IDBInitialize IDBInitialize_iface;
+ IDBProperties IDBProperties_iface;
LONG ref;
} dbinit;
@@ -59,6 +60,74 @@ static inline dbinit *impl_from_IDBInitialize(IDBInitialize *iface)
return CONTAINING_RECORD(iface, dbinit, IDBInitialize_iface);
}
+static inline dbinit *impl_from_IDBProperties(IDBProperties *iface)
+{
+ return CONTAINING_RECORD(iface, dbinit, IDBProperties_iface);
+}
+
+static HRESULT WINAPI dbprops_QueryInterface(IDBProperties *iface, REFIID riid, void **ppvObject)
+{
+ dbinit *This = impl_from_IDBProperties(iface);
+
+ return IDBInitialize_QueryInterface(&This->IDBInitialize_iface, riid, ppvObject);
+}
+
+static ULONG WINAPI dbprops_AddRef(IDBProperties *iface)
+{
+ dbinit *This = impl_from_IDBProperties(iface);
+
+ return IDBInitialize_AddRef(&This->IDBInitialize_iface);
+}
+
+static ULONG WINAPI dbprops_Release(IDBProperties *iface)
+{
+ dbinit *This = impl_from_IDBProperties(iface);
+
+ return IDBInitialize_Release(&This->IDBInitialize_iface);
+}
+
+static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets,
+ const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets)
+{
+ dbinit *This = impl_from_IDBProperties(iface);
+
+ FIXME("(%p)->(%d %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets,
+ const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets,
+ DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer)
+{
+ dbinit *This = impl_from_IDBProperties(iface);
+
+ FIXME("(%p)->(%d %p %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets,
+ prgPropertyInfoSets, ppDescBuffer);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets,
+ DBPROPSET rgPropertySets[])
+{
+ dbinit *This = impl_from_IDBProperties(iface);
+
+ FIXME("(%p)->(%d %p)\n", This, cPropertySets, rgPropertySets);
+
+ return E_NOTIMPL;
+}
+
+static const struct IDBPropertiesVtbl dbprops_vtbl =
+{
+ dbprops_QueryInterface,
+ dbprops_AddRef,
+ dbprops_Release,
+ dbprops_GetProperties,
+ dbprops_GetPropertyInfo,
+ dbprops_SetProperties
+};
+
static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **obj)
{
dbinit *This = impl_from_IDBInitialize(iface);
@@ -71,6 +140,10 @@ static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, v
{
*obj = iface;
}
+ else if(IsEqualIID(riid, &IID_IDBProperties))
+ {
+ *obj = &This->IDBProperties_iface;
+ }
else
{
FIXME("interface %s not implemented\n", debugstr_guid(riid));
@@ -144,6 +217,7 @@ static HRESULT create_db_init(void **obj)
if(!This) return E_OUTOFMEMORY;
This->IDBInitialize_iface.lpVtbl = &dbinit_vtbl;
+ This->IDBProperties_iface.lpVtbl = &dbprops_vtbl;
This->ref = 1;
*obj = &This->IDBInitialize_iface;
diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c
index fe92bb8..f093d17 100644
--- a/dlls/oledb32/tests/database.c
+++ b/dlls/oledb32/tests/database.c
@@ -51,7 +51,7 @@ static void test_database(void)
IDBProperties *props = NULL;
hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props);
- todo_wine ok(hr == S_OK, "got %08x\n", hr);
+ ok(hr == S_OK, "got %08x\n", hr);
if(SUCCEEDED(hr))
{
IDBProperties_Release(props);
More information about the wine-cvs
mailing list