oledb32: Add IErrorInfo Support.

dlls/oledb32/Makefile.in

@@ -5,6 +5,7 @@ IMPORTS   = uuid oleaut32 ole32 user32 advapi32
 C_SRCS = \
 	convert.c \
 	datainit.c \
+	errorinfo.c \
 	main.c
 
 IDL_I_SRCS = convert.idl

dlls/oledb32/errorinfo.c

@@ -0,0 +1,359 @@
+/* OLE DB ErrorInfo
+ *
+ * Copyright 2013 Alistair Leslie-Hughes
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#include <stdarg.h>
+#include <string.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+#include "oleauto.h"
+#include "winerror.h"
+#include "oledb.h"
+#include "oledberr.h"
+
+#include "oledb_private.h"
+
+#include "wine/unicode.h"
+#include "wine/list.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(oledb);
+
+struct ErrorEntry
+{
+    struct list entry;
+    ERRORINFO*      info;
+    DISPPARAMS      dispparams;
+    IUnknown        *unknown;
+    DWORD           lookupID;
+};
+
+typedef struct ErrorInfoImpl
+{
+    IErrorInfo     IErrorInfo_iface;
+    IErrorRecords  IErrorRecords_iface;
+    LONG ref;
+
+    GUID m_Guid;
+    BSTR source;
+    BSTR description;
+    BSTR help_file;
+    DWORD help_context;
+
+    struct list errors;
+} ErrorInfoImpl;
+
+static inline ErrorInfoImpl *impl_from_IErrorInfo( IErrorInfo *iface )
+{
+    return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorInfo_iface);
+}
+
+static inline ErrorInfoImpl *impl_from_IErrorRecords( IErrorRecords *iface )
+{
+    return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorRecords_iface);
+}
+
+static HRESULT WINAPI IErrorInfoImpl_QueryInterface(IErrorInfo* iface, REFIID riid, void **ppvoid)
+{
+    ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
+    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid),ppvoid);
+
+    *ppvoid = NULL;
+
+    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IErrorInfo))
+    {
+      *ppvoid = &This->IErrorInfo_iface;
+    }
+    else if (IsEqualIID(riid, &IID_IErrorRecords))
+    {
+      *ppvoid = &This->IErrorRecords_iface;
+    }
+
+    if(*ppvoid)
+    {
+      IUnknown_AddRef( (IUnknown*)*ppvoid );
+      return S_OK;
+    }
+
+    FIXME("interface %s not implemented\n", debugstr_guid(riid));
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI IErrorInfoImpl_AddRef(IErrorInfo* iface)
+{
+    ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
+    TRACE("(%p)->%u\n",This,This->ref);
+    return InterlockedIncrement(&This->ref);
+}
+
+static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface)
+{
+    ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
+    ULONG ref = InterlockedDecrement(&This->ref);
+
+    TRACE("(%p)->%u\n",This,ref+1);
+
+    if (!ref)
+    {
+        SysFreeString(This->source);
+        SysFreeString(This->description);
+        SysFreeString(This->help_file);
+        HeapFree(GetProcessHeap(), 0, This);
+    }
+    return ref;
+}
+
+static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID * pGUID)
+{
+    ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
+
+    TRACE("(%p)\n",This);
+
+    if(!pGUID )
+        return E_INVALIDARG;
+
+    *pGUID = This->m_Guid;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *pBstrSource)
+{
+    ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
+
+    TRACE("(%p)->(%p)\n",This, pBstrSource);
+
+    if (pBstrSource == NULL)
+        return E_INVALIDARG;
+
+    *pBstrSource = SysAllocString(This->source);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *pBstrDescription)
+{
+    ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
+
+    TRACE("(%p)->(%p)\n",This, pBstrDescription);
+
+    if (pBstrDescription == NULL)
+        return E_INVALIDARG;
+
+    *pBstrDescription = SysAllocString(This->description);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *pBstrHelpFile)
+{
+    ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
+
+    TRACE("(%p)->(%p)\n",This, pBstrHelpFile);
+
+    if (pBstrHelpFile == NULL)
+        return E_INVALIDARG;
+
+    *pBstrHelpFile = SysAllocString(This->help_file);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *pdwHelpContext)
+{
+    ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
+
+    TRACE("(%p)->(%p)\n",This, pdwHelpContext);
+
+    if (pdwHelpContext == NULL)
+        return E_INVALIDARG;
+
+    *pdwHelpContext = This->help_context;
+
+    return S_OK;
+}
+
+static const IErrorInfoVtbl ErrorInfoVtbl =
+{
+    IErrorInfoImpl_QueryInterface,
+    IErrorInfoImpl_AddRef,
+    IErrorInfoImpl_Release,
+    IErrorInfoImpl_GetGUID,
+    IErrorInfoImpl_GetSource,
+    IErrorInfoImpl_GetDescription,
+    IErrorInfoImpl_GetHelpFile,
+    IErrorInfoImpl_GetHelpContext
+};
+
+static HRESULT WINAPI errorrec_QueryInterface(IErrorRecords *iface, REFIID riid, void **ppvObject)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+    return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvObject);
+}
+
+static ULONG WINAPI WINAPI errorrec_AddRef(IErrorRecords *iface)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+    return IErrorInfo_AddRef(&This->IErrorInfo_iface);
+}
+
+static ULONG WINAPI WINAPI errorrec_Release(IErrorRecords *iface)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+    return IErrorInfo_Release(&This->IErrorInfo_iface);
+}
+
+static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *pErrorInfo,
+        DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+
+    FIXME("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID);
+
+    if(pErrorInfo)
+        return E_INVALIDARG;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ulRecordNum,
+        ERRORINFO *pErrorInfo)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+
+    FIXME("(%p)->(%d %p)\n", This, ulRecordNum, pErrorInfo);
+
+    if(!pErrorInfo)
+        return E_INVALIDARG;
+
+    if(ulRecordNum > list_count(&This->errors))
+        return DB_E_BADRECORDNUM;
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG ulRecordNum,
+        REFIID riid, IUnknown **ppObject)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+
+    FIXME("(%p)->(%d %s, %p)\n", This, ulRecordNum, debugstr_guid(riid), ppObject);
+
+    if (!ppObject)
+        return E_INVALIDARG;
+
+    *ppObject = NULL;
+
+    if(ulRecordNum > list_count(&This->errors))
+        return DB_E_BADRECORDNUM;
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG ulRecordNum,
+        LCID lcid, IErrorInfo **ppErrorInfo)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+
+    FIXME("(%p)->(%d %d, %p)\n", This, ulRecordNum, lcid, ppErrorInfo);
+
+    if (!ppErrorInfo)
+        return E_INVALIDARG;
+
+    if(ulRecordNum > list_count(&This->errors))
+        return DB_E_BADRECORDNUM;
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG ulRecordNum,
+        DISPPARAMS *pdispparams)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+
+    FIXME("(%p)->(%d %p)\n", This, ulRecordNum, pdispparams);
+
+    if (!pdispparams)
+        return E_INVALIDARG;
+
+    if(ulRecordNum > list_count(&This->errors))
+        return DB_E_BADRECORDNUM;
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *records)
+{
+    ErrorInfoImpl *This = impl_from_IErrorRecords(iface);
+
+    TRACE("(%p)->(%p)\n", This, records);
+
+    if(!records)
+        return E_INVALIDARG;
+
+    *records = list_count(&This->errors);
+
+    TRACE("<--(%d)\n", *records);
+
+    return S_OK;
+}
+
+static const IErrorRecordsVtbl ErrorRecordsVtbl =
+{
+    errorrec_QueryInterface,
+    errorrec_AddRef,
+    errorrec_Release,
+    errorrec_AddErrorRecord,
+    errorrec_GetBasicErrorInfo,
+    errorrec_GetCustomErrorObject,
+    errorrec_GetErrorInfo,
+    errorrec_GetErrorParameters,
+    errorrec_GetRecordCount
+};
+
+HRESULT create_error_info(IUnknown *outer, void **obj)
+{
+    ErrorInfoImpl *This;
+
+    TRACE("(%p, %p)\n", outer, obj);
+
+    *obj = NULL;
+
+    if(outer) return CLASS_E_NOAGGREGATION;
+
+    This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
+    if(!This) return E_OUTOFMEMORY;
+
+    This->IErrorInfo_iface.lpVtbl = &ErrorInfoVtbl;
+    This->IErrorRecords_iface.lpVtbl = &ErrorRecordsVtbl;
+    This->ref = 1;
+    This->source = NULL;
+    This->description = NULL;
+    This->help_file = NULL;
+    This->help_context = 0;
+
+    list_init(&This->errors);
+
+    *obj = &This->IErrorInfo_iface;
+
+    return S_OK;
+}

dlls/oledb32/main.c

@@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb);
 
 static HINSTANCE instance;
 
+DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d);
+
 BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv)
 {
     switch(reason)
@@ -126,6 +128,7 @@ static const IClassFactoryVtbl CF_Vtbl =
 
 static cf oledb_convert_cf = { { &CF_Vtbl }, create_oledb_convert };
 static cf oledb_datainit_cf = { { &CF_Vtbl }, create_data_init };
+static cf oledb_errorinfo_cf = { { &CF_Vtbl }, create_error_info };
 
 /******************************************************************
  * DllGetClassObject
@@ -144,6 +147,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj)
         *obj = &oledb_datainit_cf;
         return S_OK;
     }
+    else if ( IsEqualCLSID (rclsid, &CSLID_MSDAER) )
+    {
+        *obj = &oledb_errorinfo_cf;
+        return S_OK;
+    }
 
     return CLASS_E_CLASSNOTAVAILABLE;
 }

dlls/oledb32/oledb32_classes.idl

@@ -30,3 +30,14 @@ coclass OLEDB_CONVERSIONLIBRARY
     interface IDataConvert;
     interface IDCInfo;
 }
+
+[
+    helpstring("OLE DB Error Collection Service"),
+    threading(both),
+    progid("MSDAER.1"),
+    vi_progid("MSDAER"),
+    uuid(C8B522CF-5CF3-11CE-ADE5-00AA0044773D)
+]
+coclass OLEDB_MSDAER
+{
+}

dlls/oledb32/oledb_private.h

@@ -19,3 +19,4 @@
 
 HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
 HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
+HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;

dlls/oledb32/tests/database.c

@@ -125,10 +125,11 @@ static void test_errorinfo(void)
     IUnknown *unk = NULL;
 
     hr = CoCreateInstance(&CSLID_MSDAER, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown,(void**)&unk);
-    todo_wine ok(hr == S_OK, "got %08x\n", hr);
+    ok(hr == S_OK, "got %08x\n", hr);
     if(hr == S_OK)
     {
         IErrorInfo *errorinfo;
+        IErrorRecords *errrecs;
 
         hr = IUnknown_QueryInterface(unk, &IID_IErrorInfo, (void**)&errorinfo);
         ok(hr == S_OK, "got %08x\n", hr);
@@ -137,6 +138,13 @@ static void test_errorinfo(void)
             IErrorInfo_Release(errorinfo);
         }
 
+        hr = IUnknown_QueryInterface(unk, &IID_IErrorRecords, (void**)&errrecs);
+        ok(hr == S_OK, "got %08x\n", hr);
+        if(hr == S_OK)
+        {
+            IErrorRecords_Release(errrecs);
+        }
+
         IUnknown_Release(unk);
     }
 }