Give the right ids to the DirectSoundCreate8 function (thanks to
Robert Reif).
This commit is contained in:
parent
1279d9a0f4
commit
f5a4a9b60a
|
@ -760,10 +760,7 @@ HRESULT WINAPI DirectSoundCreate8(LPCGUID lpcGUID,LPDIRECTSOUND8 *ppDS,IUnknown
|
||||||
setup_dsound_options();
|
setup_dsound_options();
|
||||||
|
|
||||||
/* Default device? */
|
/* Default device? */
|
||||||
if ( !lpcGUID ||
|
if (!lpcGUID || IsEqualGUID(lpcGUID, &GUID_NULL))
|
||||||
IsEqualGUID(lpcGUID, &GUID_NULL) ||
|
|
||||||
IsEqualGUID(lpcGUID, &IID_IDirectSound) ||
|
|
||||||
IsEqualGUID(lpcGUID, &IID_IDirectSound8))
|
|
||||||
lpcGUID = &DSDEVID_DefaultPlayback;
|
lpcGUID = &DSDEVID_DefaultPlayback;
|
||||||
|
|
||||||
if (GetDeviceID(lpcGUID, &devGuid) != DS_OK) {
|
if (GetDeviceID(lpcGUID, &devGuid) != DS_OK) {
|
||||||
|
@ -959,7 +956,7 @@ static HRESULT WINAPI DSCF_CreateInstance(
|
||||||
if ( IsEqualGUID( &IID_IDirectSound, riid ) ||
|
if ( IsEqualGUID( &IID_IDirectSound, riid ) ||
|
||||||
IsEqualGUID( &IID_IDirectSound8, riid ) ) {
|
IsEqualGUID( &IID_IDirectSound8, riid ) ) {
|
||||||
/* FIXME: reuse already created dsound if present? */
|
/* FIXME: reuse already created dsound if present? */
|
||||||
return DirectSoundCreate8(riid,(LPDIRECTSOUND8*)ppobj,pOuter);
|
return DirectSoundCreate8(0,(LPDIRECTSOUND8*)ppobj,pOuter);
|
||||||
}
|
}
|
||||||
if ( IsEqualGUID( &IID_IDirectSoundCapture, riid ) ||
|
if ( IsEqualGUID( &IID_IDirectSoundCapture, riid ) ||
|
||||||
IsEqualGUID( &IID_IDirectSoundCapture8, riid ) ) {
|
IsEqualGUID( &IID_IDirectSoundCapture8, riid ) ) {
|
||||||
|
|
Loading…
Reference in New Issue