system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 21:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

oledb32: Use an iface instead of a vtbl pointer in IClassFactoryImpl.

Browse source
This commit is contained in:
Michael Stefaniuc 2010-12-05 15:17:05 +01:00 committed by Alexandre Julliard
parent ed5260ba92
commit 1c0982e85f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/oledb32/main.c
View file

@ -59,13 +59,18 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv)
*/ */
typedef struct typedef struct
{ {
const IClassFactoryVtbl *lpVtbl; IClassFactory IClassFactory_iface;
HRESULT (*create_object)( IUnknown*, LPVOID* ); HRESULT (*create_object)( IUnknown*, LPVOID* );
} cf; } cf;
static inline cf *impl_from_IClassFactory(IClassFactory *iface)
{
return CONTAINING_RECORD(iface, cf, IClassFactory_iface);
}
static HRESULT WINAPI CF_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) static HRESULT WINAPI CF_QueryInterface(IClassFactory *iface, REFIID riid, void **obj)
{ {
cf *This = (cf *)iface; cf *This = impl_from_IClassFactory(iface);
TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj);
@ -91,7 +96,7 @@ static ULONG WINAPI CF_Release(IClassFactory *iface)
static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **obj) static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **obj)
{ {
cf *This = (cf *)iface; cf *This = impl_from_IClassFactory(iface);
IUnknown *unk = NULL; IUnknown *unk = NULL;
HRESULT r; HRESULT r;
@ -121,7 +126,7 @@ static const IClassFactoryVtbl CF_Vtbl =
CF_LockServer CF_LockServer
}; };
static cf oledb_convert_cf = { &CF_Vtbl, create_oledb_convert }; static cf oledb_convert_cf = { { &CF_Vtbl }, create_oledb_convert };
/****************************************************************** /******************************************************************
* DllGetClassObject * DllGetClassObject