winmm/tests: Assume volume is not supported if waveGetOutVolume fails.

This commit is contained in:
Alexandre Julliard 2009-02-16 12:26:18 +01:00
parent 5720375fec
commit 9f32c0d9d6
1 changed files with 3 additions and 1 deletions

View File

@ -62,7 +62,8 @@ static void test_multiple_waveopens(void)
/* In windows this is most likely allowed, in wine an application can use the waveout /* In windows this is most likely allowed, in wine an application can use the waveout
* interface, but so can directsound.. this causes problems if directsound goes active * interface, but so can directsound.. this causes problems if directsound goes active
*/ */
todo_wine ok(ret == MMSYSERR_NOERROR, "waveOutOpen returns: %x\n", ret); todo_wine ok(ret == MMSYSERR_NOERROR || broken(ret == MMSYSERR_ALLOCATED), /* winME */
"waveOutOpen returns: %x\n", ret);
if (ret == MMSYSERR_NOERROR) if (ret == MMSYSERR_NOERROR)
waveOutClose(handle2); waveOutClose(handle2);
@ -700,6 +701,7 @@ static void wave_out_test_deviceOut(int device, double duration,
ok(rc==MMSYSERR_INVALPARAM,"waveOutGetVolume(%s,0) expected " ok(rc==MMSYSERR_INVALPARAM,"waveOutGetVolume(%s,0) expected "
"MMSYSERR_INVALPARAM, got %s\n", dev_name(device),wave_out_error(rc)); "MMSYSERR_INVALPARAM, got %s\n", dev_name(device),wave_out_error(rc));
rc=waveOutGetVolume(wout,&volume); rc=waveOutGetVolume(wout,&volume);
if (rc == MMSYSERR_NOTSUPPORTED) has_volume = FALSE;
ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED,
"waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc));