msdaps: COM cleanup for the IClassFactory iface.

This commit is contained in:
Michael Stefaniuc 2011-01-06 22:21:32 +01:00 committed by Alexandre Julliard
parent a9ae183d8a
commit 5c40a8a9ac

View file

@ -60,13 +60,18 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
*/
typedef struct
{
const IClassFactoryVtbl *lpVtbl;
IClassFactory IClassFactory_iface;
HRESULT (*create_object)( IUnknown*, LPVOID* );
} 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)
{
cf *This = (cf *)iface;
cf *This = impl_from_IClassFactory(iface);
TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj);
@ -92,7 +97,7 @@ static ULONG WINAPI CF_Release(IClassFactory *iface)
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;
HRESULT r;
@ -122,10 +127,10 @@ static const IClassFactoryVtbl CF_Vtbl =
CF_LockServer
};
static cf row_server_cf = { &CF_Vtbl, create_row_server };
static cf row_proxy_cf = { &CF_Vtbl, create_row_marshal };
static cf rowset_server_cf = { &CF_Vtbl, create_rowset_server };
static cf rowset_proxy_cf = { &CF_Vtbl, create_rowset_marshal };
static cf row_server_cf = { { &CF_Vtbl }, create_row_server };
static cf row_proxy_cf = { { &CF_Vtbl }, create_row_marshal };
static cf rowset_server_cf = { { &CF_Vtbl }, create_rowset_server };
static cf rowset_proxy_cf = { { &CF_Vtbl }, create_rowset_marshal };
/***********************************************************************
* DllGetClassObject