marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Cleanup IKsPrivatePropertySetImpl_Create().

oldstable
Michael Stefaniuc 2012-08-24 01:47:14 +02:00 committed by Alexandre Julliard
parent 054d930bb7
commit 1555aebf1e
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dsound/dsound_main.c
View File

@ -724,7 +724,7 @@ static IClassFactoryImpl DSOUND_CF[] = {
{ { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, DSOUND_CaptureCreate },
{ { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, DSOUND_CaptureCreate8 },
{ { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, DSOUND_FullDuplexCreate },
{ { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create },
{ { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, IKsPrivatePropertySetImpl_Create },
{ { NULL }, NULL, NULL }
};

2
dlls/dsound/dsound_private.h
View File

@ -254,7 +254,7 @@ struct IDirectSoundCaptureBufferImpl
int nrofnotifies;
};
HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, IKsPropertySet **piks) DECLSPEC_HIDDEN;
HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
/*******************************************************************************
*/

23
dlls/dsound/propset.c
View File

@ -619,23 +619,24 @@ static const IKsPropertySetVtbl ikspvt = {
IKsPrivatePropertySetImpl_QuerySupport
};
HRESULT IKsPrivatePropertySetImpl_Create(
REFIID riid,
IKsPropertySet **piks)
HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv)
{
IKsPrivatePropertySetImpl *iks;
TRACE("(%s, %p)\n", debugstr_guid(riid), piks);
HRESULT hr;
if (!IsEqualIID(riid, &IID_IUnknown) &&
!IsEqualIID(riid, &IID_IKsPropertySet)) {
*piks = 0;
return E_NOINTERFACE;
TRACE("(%s, %p)\n", debugstr_guid(riid), ppv);
iks = HeapAlloc(GetProcessHeap(), 0, sizeof(*iks));
if (!iks) {
WARN("out of memory\n");
return DSERR_OUTOFMEMORY;
}
iks = HeapAlloc(GetProcessHeap(),0,sizeof(*iks));
iks->ref = 1;
iks->IKsPropertySet_iface.lpVtbl = &ikspvt;
*piks = &iks->IKsPropertySet_iface;
return S_OK;
hr = IKsPropertySet_QueryInterface(&iks->IKsPropertySet_iface, riid, ppv);
IKsPropertySet_Release(&iks->IKsPropertySet_iface);
return hr;
}