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

dmusic: Cleanup DMUSIC_CreateDirectMusicImpl.

This commit is contained in:
Christian Costa 2012-05-25 08:04:31 +02:00 committed by Alexandre Julliard
parent a33d34b83e
commit 0b0985f391
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/dmusic/dmusic.c
View File

@ -369,23 +369,37 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = {
IDirectMusic8Impl_SetExternalMasterClock IDirectMusic8Impl_SetExternalMasterClock
}; };
/* for ClassFactory */ /* For ClassFactory */
HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter)
{
IDirectMusic8Impl *dmusic; IDirectMusic8Impl *dmusic;
HRESULT ret;
TRACE("(%p,%p,%p)\n",lpcGUID, ppobj, pUnkOuter); TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter);
*ret_iface = NULL;
dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl));
if (NULL == dmusic) { if (!dmusic)
*ppobj = NULL;
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
}
dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl;
dmusic->ref = 0; /* will be inited with QueryInterface */ dmusic->ref = 0; /* Will be inited by QueryInterface */
dmusic->pMasterClock = NULL; dmusic->pMasterClock = NULL;
dmusic->ppPorts = NULL; dmusic->ppPorts = NULL;
dmusic->nrofports = 0; dmusic->nrofports = 0;
DMUSIC_CreateReferenceClockImpl (&IID_IReferenceClock, (LPVOID*)&dmusic->pMasterClock, NULL); ret = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&dmusic->pMasterClock, NULL);
if (FAILED(ret)) {
return IDirectMusic8Impl_QueryInterface ((LPDIRECTMUSIC8)dmusic, lpcGUID, ppobj); HeapFree(GetProcessHeap(), 0, dmusic);
return ret;
}
ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface);
if (FAILED(ret)) {
IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface);
HeapFree(GetProcessHeap(), 0, dmusic);
return ret;
}
return S_OK;
} }