ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oledb32: Use better naming for IErrorRecords implementation structure. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-11-16 16:48:34 +03:00 committed by Alexandre Julliard
parent cb11d67035
commit 9a084ab6d3
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
dlls/oledb32/errorinfo.c
View File

@ -46,7 +46,7 @@ struct ErrorEntry
DWORD lookupID; DWORD lookupID;
}; };
typedef struct ErrorInfoImpl typedef struct errorrecords
{ {
IErrorInfo IErrorInfo_iface; IErrorInfo IErrorInfo_iface;
IErrorRecords IErrorRecords_iface; IErrorRecords IErrorRecords_iface;
@ -55,21 +55,21 @@ typedef struct ErrorInfoImpl
struct ErrorEntry *records; struct ErrorEntry *records;
unsigned int allocated; unsigned int allocated;
unsigned int count; unsigned int count;
} ErrorInfoImpl; } errorrecords;
static inline ErrorInfoImpl *impl_from_IErrorInfo( IErrorInfo *iface ) static inline errorrecords *impl_from_IErrorInfo( IErrorInfo *iface )
{ {
return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorInfo_iface); return CONTAINING_RECORD(iface, errorrecords, IErrorInfo_iface);
} }
static inline ErrorInfoImpl *impl_from_IErrorRecords( IErrorRecords *iface ) static inline errorrecords *impl_from_IErrorRecords( IErrorRecords *iface )
{ {
return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorRecords_iface); return CONTAINING_RECORD(iface, errorrecords, IErrorRecords_iface);
} }
static HRESULT WINAPI IErrorInfoImpl_QueryInterface(IErrorInfo* iface, REFIID riid, void **ppvoid) static HRESULT WINAPI errorrecords_QueryInterface(IErrorInfo* iface, REFIID riid, void **ppvoid)
{ {
ErrorInfoImpl *This = impl_from_IErrorInfo(iface); errorrecords *This = impl_from_IErrorInfo(iface);
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid),ppvoid); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid),ppvoid);
*ppvoid = NULL; *ppvoid = NULL;
@ -93,16 +93,16 @@ static HRESULT WINAPI IErrorInfoImpl_QueryInterface(IErrorInfo* iface, REFIID ri
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI IErrorInfoImpl_AddRef(IErrorInfo* iface) static ULONG WINAPI errorrecords_AddRef(IErrorInfo* iface)
{ {
ErrorInfoImpl *This = impl_from_IErrorInfo(iface); errorrecords *This = impl_from_IErrorInfo(iface);
TRACE("(%p)->%u\n",This,This->ref); TRACE("(%p)->%u\n",This,This->ref);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
} }
static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) static ULONG WINAPI errorrecords_Release(IErrorInfo* iface)
{ {
ErrorInfoImpl *This = impl_from_IErrorInfo(iface); errorrecords *This = impl_from_IErrorInfo(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->%u\n",This,ref+1); TRACE("(%p)->%u\n",This,ref+1);
@ -122,9 +122,9 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface)
return ref; return ref;
} }
static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID *guid) static HRESULT WINAPI errorrecords_GetGUID(IErrorInfo* iface, GUID *guid)
{ {
ErrorInfoImpl *This = impl_from_IErrorInfo(iface); errorrecords *This = impl_from_IErrorInfo(iface);
TRACE("(%p)->(%p)\n", This, guid); TRACE("(%p)->(%p)\n", This, guid);
@ -136,9 +136,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID *guid)
return S_OK; return S_OK;
} }
static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *source) static HRESULT WINAPI errorrecords_GetSource(IErrorInfo* iface, BSTR *source)
{ {
ErrorInfoImpl *This = impl_from_IErrorInfo(iface); errorrecords *This = impl_from_IErrorInfo(iface);
TRACE("(%p)->(%p)\n", This, source); TRACE("(%p)->(%p)\n", This, source);
@ -150,9 +150,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *source)
return E_FAIL; return E_FAIL;
} }
static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *description) static HRESULT WINAPI errorrecords_GetDescription(IErrorInfo* iface, BSTR *description)
{ {
ErrorInfoImpl *This = impl_from_IErrorInfo(iface); errorrecords *This = impl_from_IErrorInfo(iface);
TRACE("(%p)->(%p)\n", This, description); TRACE("(%p)->(%p)\n", This, description);
@ -164,9 +164,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *des
return E_FAIL; return E_FAIL;
} }
static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *helpfile) static HRESULT WINAPI errorrecords_GetHelpFile(IErrorInfo* iface, BSTR *helpfile)
{ {
ErrorInfoImpl *This = impl_from_IErrorInfo(iface); errorrecords *This = impl_from_IErrorInfo(iface);
TRACE("(%p)->(%p)\n", This, helpfile); TRACE("(%p)->(%p)\n", This, helpfile);
@ -178,9 +178,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *helpfi
return E_FAIL; return E_FAIL;
} }
static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *context) static HRESULT WINAPI errorrecords_GetHelpContext(IErrorInfo* iface, DWORD *context)
{ {
ErrorInfoImpl *This = impl_from_IErrorInfo(iface); errorrecords *This = impl_from_IErrorInfo(iface);
TRACE("(%p)->(%p)\n", This, context); TRACE("(%p)->(%p)\n", This, context);
@ -194,38 +194,38 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *co
static const IErrorInfoVtbl ErrorInfoVtbl = static const IErrorInfoVtbl ErrorInfoVtbl =
{ {
IErrorInfoImpl_QueryInterface, errorrecords_QueryInterface,
IErrorInfoImpl_AddRef, errorrecords_AddRef,
IErrorInfoImpl_Release, errorrecords_Release,
IErrorInfoImpl_GetGUID, errorrecords_GetGUID,
IErrorInfoImpl_GetSource, errorrecords_GetSource,
IErrorInfoImpl_GetDescription, errorrecords_GetDescription,
IErrorInfoImpl_GetHelpFile, errorrecords_GetHelpFile,
IErrorInfoImpl_GetHelpContext errorrecords_GetHelpContext
}; };
static HRESULT WINAPI errorrec_QueryInterface(IErrorRecords *iface, REFIID riid, void **ppvObject) static HRESULT WINAPI errorrec_QueryInterface(IErrorRecords *iface, REFIID riid, void **ppvObject)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvObject); return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvObject);
} }
static ULONG WINAPI WINAPI errorrec_AddRef(IErrorRecords *iface) static ULONG WINAPI WINAPI errorrec_AddRef(IErrorRecords *iface)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
return IErrorInfo_AddRef(&This->IErrorInfo_iface); return IErrorInfo_AddRef(&This->IErrorInfo_iface);
} }
static ULONG WINAPI WINAPI errorrec_Release(IErrorRecords *iface) static ULONG WINAPI WINAPI errorrec_Release(IErrorRecords *iface)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
return IErrorInfo_Release(&This->IErrorInfo_iface); return IErrorInfo_Release(&This->IErrorInfo_iface);
} }
static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *pErrorInfo, static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *pErrorInfo,
DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID) DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
struct ErrorEntry *entry; struct ErrorEntry *entry;
TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID);
@ -269,7 +269,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p
static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG index, ERRORINFO *info) static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG index, ERRORINFO *info)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
TRACE("(%p)->(%u %p)\n", This, index, info); TRACE("(%p)->(%u %p)\n", This, index, info);
@ -287,7 +287,7 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ind
static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG index, static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG index,
REFIID riid, IUnknown **object) REFIID riid, IUnknown **object)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
TRACE("(%p)->(%u %s %p)\n", This, index, debugstr_guid(riid), object); TRACE("(%p)->(%u %s %p)\n", This, index, debugstr_guid(riid), object);
@ -309,7 +309,7 @@ static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG
static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index,
LCID lcid, IErrorInfo **ppErrorInfo) LCID lcid, IErrorInfo **ppErrorInfo)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
FIXME("(%p)->(%u %d, %p)\n", This, index, lcid, ppErrorInfo); FIXME("(%p)->(%u %d, %p)\n", This, index, lcid, ppErrorInfo);
@ -324,7 +324,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index,
static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG index, DISPPARAMS *pdispparams) static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG index, DISPPARAMS *pdispparams)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
FIXME("(%p)->(%u %p)\n", This, index, pdispparams); FIXME("(%p)->(%u %p)\n", This, index, pdispparams);
@ -339,7 +339,7 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in
static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count) static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count)
{ {
ErrorInfoImpl *This = impl_from_IErrorRecords(iface); errorrecords *This = impl_from_IErrorRecords(iface);
TRACE("(%p)->(%p)\n", This, count); TRACE("(%p)->(%p)\n", This, count);
@ -368,7 +368,7 @@ static const IErrorRecordsVtbl ErrorRecordsVtbl =
HRESULT create_error_info(IUnknown *outer, void **obj) HRESULT create_error_info(IUnknown *outer, void **obj)
{ {
ErrorInfoImpl *This; errorrecords *This;
TRACE("(%p, %p)\n", outer, obj); TRACE("(%p, %p)\n", outer, obj);