dsound: NOP on SetSpeakerConfig.
This commit is contained in:
parent
6bab173139
commit
a48c7fe408
|
@ -386,8 +386,8 @@ static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, D
|
||||||
return DSERR_UNINITIALIZED;
|
return DSERR_UNINITIALIZED;
|
||||||
}
|
}
|
||||||
|
|
||||||
This->device->speaker_config = config;
|
/* NOP on Vista and above */
|
||||||
WARN("not fully functional\n");
|
|
||||||
return DS_OK;
|
return DS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -158,10 +158,10 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized,
|
||||||
if (rc==DS_OK) {
|
if (rc==DS_OK) {
|
||||||
rc=IDirectSound_GetSpeakerConfig(dso,&new_speaker_config);
|
rc=IDirectSound_GetSpeakerConfig(dso,&new_speaker_config);
|
||||||
ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc);
|
ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc);
|
||||||
if (rc==DS_OK && speaker_config!=new_speaker_config)
|
if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config)
|
||||||
trace("IDirectSound_GetSpeakerConfig() failed to set speaker "
|
trace("IDirectSound_GetSpeakerConfig() failed to set speaker "
|
||||||
"config: expected 0x%08x, got 0x%08x\n",
|
"config: expected 0x%08x or 0x%08x, got 0x%08x\n",
|
||||||
speaker_config,new_speaker_config);
|
speaker_config,ref_speaker_config,new_speaker_config);
|
||||||
IDirectSound_SetSpeakerConfig(dso,ref_speaker_config);
|
IDirectSound_SetSpeakerConfig(dso,ref_speaker_config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -171,10 +171,10 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized,
|
||||||
if (rc==DS_OK) {
|
if (rc==DS_OK) {
|
||||||
rc=IDirectSound8_GetSpeakerConfig(dso,&new_speaker_config);
|
rc=IDirectSound8_GetSpeakerConfig(dso,&new_speaker_config);
|
||||||
ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc);
|
ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc);
|
||||||
if (rc==DS_OK && speaker_config!=new_speaker_config)
|
if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config)
|
||||||
trace("IDirectSound8_GetSpeakerConfig() failed to set speaker "
|
trace("IDirectSound8_GetSpeakerConfig() failed to set speaker "
|
||||||
"config: expected 0x%08x, got 0x%08x\n",
|
"config: expected 0x%08x or 0x%08x, got 0x%08x\n",
|
||||||
speaker_config,new_speaker_config);
|
speaker_config,ref_speaker_config,new_speaker_config);
|
||||||
IDirectSound8_SetSpeakerConfig(dso,ref_speaker_config);
|
IDirectSound8_SetSpeakerConfig(dso,ref_speaker_config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue