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

wiaservc: Return pointer to vtbl instead of implementation in wiadevmgr_Constructor.

Browse source
This commit is contained in:
Sebastian Lackner 2015-03-27 09:14:37 +01:00 committed by Alexandre Julliard
parent 05757794a0
commit f630fb4f6a
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/wiaservc/factory.c
View file

@ -70,19 +70,19 @@ WIASERVC_IClassFactory_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter,
REFIID riid, LPVOID *ppvObj)
{
HRESULT res;
IUnknown *punk = NULL;
IWiaDevMgr *devmgr = NULL;
TRACE("IID: %s\n", debugstr_guid(riid));
if (pUnkOuter)
return CLASS_E_NOAGGREGATION;
res = wiadevmgr_Constructor((LPVOID*) &punk);
res = wiadevmgr_Constructor(&devmgr);
if (FAILED(res))
return res;
res = IUnknown_QueryInterface(punk, riid, ppvObj);
IUnknown_Release(punk);
res = IWiaDevMgr_QueryInterface(devmgr, riid, ppvObj);
IWiaDevMgr_Release(devmgr);
return res;
}

4
dlls/wiaservc/wiadevmgr.c
View file

@ -164,7 +164,7 @@ static const IWiaDevMgrVtbl WIASERVC_IWiaDevMgr_Vtbl =
wiadevmgr_AddDeviceDlg
};
HRESULT wiadevmgr_Constructor(LPVOID *ppObj)
HRESULT wiadevmgr_Constructor(IWiaDevMgr **ppObj)
{
wiadevmgr *This;
TRACE("(%p)\n", ppObj);
@ -173,7 +173,7 @@ HRESULT wiadevmgr_Constructor(LPVOID *ppObj)
{
This->IWiaDevMgr_iface.lpVtbl = &WIASERVC_IWiaDevMgr_Vtbl;
This->ref = 1;
*ppObj = This;
*ppObj = &This->IWiaDevMgr_iface;
return S_OK;
}
*ppObj = NULL;

2
dlls/wiaservc/wiaservc_private.h
View file

@ -34,7 +34,7 @@ typedef struct
LONG ref;
} wiadevmgr;
HRESULT wiadevmgr_Constructor(LPVOID *ppObj) DECLSPEC_HIDDEN;
HRESULT wiadevmgr_Constructor(IWiaDevMgr **ppObj) DECLSPEC_HIDDEN;
/* Little helper functions */
static inline char *