reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-19 04:18:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oledb32: Use ifaces instead of vtbl pointers in convert.

Browse Source
This commit is contained in:
Michael Stefaniuc 2010-12-29 02:49:43 +01:00 committed by Alexandre Julliard
parent 5101f249c8
commit 7af2899aeb
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/oledb32/convert.c
View File

@ -38,8 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb);
typedef struct typedef struct
{ {
const struct IDataConvertVtbl *lpVtbl; IDataConvert IDataConvert_iface;
const struct IDCInfoVtbl *lpDCInfoVtbl; IDCInfo IDCInfo_iface;
LONG ref; LONG ref;
@ -48,12 +48,12 @@ typedef struct
static inline convert *impl_from_IDataConvert(IDataConvert *iface) static inline convert *impl_from_IDataConvert(IDataConvert *iface)
{ {
return (convert *)((char*)iface - FIELD_OFFSET(convert, lpVtbl)); return CONTAINING_RECORD(iface, convert, IDataConvert_iface);
} }
static inline convert *impl_from_IDCInfo(IDCInfo *iface) static inline convert *impl_from_IDCInfo(IDCInfo *iface)
{ {
return (convert *)((char*)iface - FIELD_OFFSET(convert, lpDCInfoVtbl)); return CONTAINING_RECORD(iface, convert, IDCInfo_iface);
} }
static HRESULT WINAPI convert_QueryInterface(IDataConvert* iface, static HRESULT WINAPI convert_QueryInterface(IDataConvert* iface,
@ -72,7 +72,7 @@ static HRESULT WINAPI convert_QueryInterface(IDataConvert* iface,
} }
else if(IsEqualIID(riid, &IID_IDCInfo)) else if(IsEqualIID(riid, &IID_IDCInfo))
{ {
*obj = &This->lpDCInfoVtbl; *obj = &This->IDCInfo_iface;
} }
else else
{ {
@ -985,21 +985,21 @@ static HRESULT WINAPI dcinfo_QueryInterface(IDCInfo* iface, REFIID riid, void **
{ {
convert *This = impl_from_IDCInfo(iface); convert *This = impl_from_IDCInfo(iface);
return IDataConvert_QueryInterface((IDataConvert *)This, riid, obj); return IDataConvert_QueryInterface(&This->IDataConvert_iface, riid, obj);
} }
static ULONG WINAPI dcinfo_AddRef(IDCInfo* iface) static ULONG WINAPI dcinfo_AddRef(IDCInfo* iface)
{ {
convert *This = impl_from_IDCInfo(iface); convert *This = impl_from_IDCInfo(iface);
return IDataConvert_AddRef((IDataConvert *)This); return IDataConvert_AddRef(&This->IDataConvert_iface);
} }
static ULONG WINAPI dcinfo_Release(IDCInfo* iface) static ULONG WINAPI dcinfo_Release(IDCInfo* iface)
{ {
convert *This = impl_from_IDCInfo(iface); convert *This = impl_from_IDCInfo(iface);
return IDataConvert_Release((IDataConvert *)This); return IDataConvert_Release(&This->IDataConvert_iface);
} }
static HRESULT WINAPI dcinfo_GetInfo(IDCInfo *iface, ULONG num, DCINFOTYPE types[], DCINFO **info_ptr) static HRESULT WINAPI dcinfo_GetInfo(IDCInfo *iface, ULONG num, DCINFOTYPE types[], DCINFO **info_ptr)
@ -1081,12 +1081,12 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj)
This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
if(!This) return E_OUTOFMEMORY; if(!This) return E_OUTOFMEMORY;
This->lpVtbl = &convert_vtbl; This->IDataConvert_iface.lpVtbl = &convert_vtbl;
This->lpDCInfoVtbl = &dcinfo_vtbl; This->IDCInfo_iface.lpVtbl = &dcinfo_vtbl;
This->ref = 1; This->ref = 1;
This->version = 0x110; This->version = 0x110;
*obj = &This->lpVtbl; *obj = &This->IDataConvert_iface;
return S_OK; return S_OK;
} }