Module: wine Branch: master Commit: 5c40a8a9ac64032b5837f0e6bf6081db1b255de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c40a8a9ac64032b5837f0e6bf... Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:32 2011 +0100 msdaps: COM cleanup for the IClassFactory iface. --- dlls/msdaps/main.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index 9b5afaa..b673b58 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -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