diff --git a/dlls/wiaservc/factory.c b/dlls/wiaservc/factory.c index 30caa897683769582c7dbfaab761c9818167139b..a80b83091f477a426f0097788364982cb3e991d3 100644 --- a/dlls/wiaservc/factory.c +++ b/dlls/wiaservc/factory.c @@ -32,6 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wia); +static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); +} + static ULONG WINAPI WIASERVC_IClassFactory_AddRef(LPCLASSFACTORY iface) { @@ -42,11 +47,11 @@ static HRESULT WINAPI WIASERVC_IClassFactory_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - ClassFactoryImpl *This = (ClassFactoryImpl *) iface; + ClassFactoryImpl *This = impl_from_IClassFactory(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = &This->lpVtbl; + *ppvObj = &This->IClassFactory_iface; return S_OK; } @@ -99,5 +104,5 @@ static const IClassFactoryVtbl WIASERVC_IClassFactory_Vtbl = ClassFactoryImpl WIASERVC_ClassFactory = { - &WIASERVC_IClassFactory_Vtbl + { &WIASERVC_IClassFactory_Vtbl } }; diff --git a/dlls/wiaservc/service.c b/dlls/wiaservc/service.c index 14b21bd243f646366c7207595fe55442ad12f4da..c1cdb83e6070a2fcb25825eb1b429b1230869909 100644 --- a/dlls/wiaservc/service.c +++ b/dlls/wiaservc/service.c @@ -95,9 +95,8 @@ StartCount(void) return FALSE; hr = CoRegisterClassObject(&CLSID_WiaDevMgr, - (IUnknown *) &WIASERVC_ClassFactory, - CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, - &dwReg); + (IUnknown *) &WIASERVC_ClassFactory.IClassFactory_iface, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &dwReg); if (FAILED(hr)) return FALSE; diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index 103281966e7b05c8a4787a71110c4ecd539300fd..72c0b21321576fe2506c0472f56843cc9fb66dba 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -23,7 +23,7 @@ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } ClassFactoryImpl; extern ClassFactoryImpl WIASERVC_ClassFactory;