ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wiaservc: COM cleanup for the IClassFactory iface.

This commit is contained in:
Michael Stefaniuc 2011-01-13 01:27:09 +01:00 committed by Alexandre Julliard
parent c3d28bae6d
commit 70a1ce9954
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wiaservc/factory.c
View File

@ -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 }
};

5
dlls/wiaservc/service.c
View File

@ -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;

2
dlls/wiaservc/wiaservc_private.h
View File

@ -23,7 +23,7 @@
typedef struct
{
const IClassFactoryVtbl *lpVtbl;
IClassFactory IClassFactory_iface;
} ClassFactoryImpl;
extern ClassFactoryImpl WIASERVC_ClassFactory;