Alexandre Julliard : winmm/tests: Assume volume is not supported if waveGetOutVolume fails.
Alexandre Julliard
julliard at winehq.org
Mon Feb 16 09:34:56 CST 2009
Module: wine
Branch: master
Commit: 9f32c0d9d60662ac8e00ce5cbd4aebd4fdf8dc89
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f32c0d9d60662ac8e00ce5cbd4aebd4fdf8dc89
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Feb 16 12:26:18 2009 +0100
winmm/tests: Assume volume is not supported if waveGetOutVolume fails.
---
dlls/winmm/tests/wave.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 37685ed..c6b0282 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -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
* 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)
waveOutClose(handle2);
@@ -700,6 +701,7 @@ static void wave_out_test_deviceOut(int device, double duration,
ok(rc==MMSYSERR_INVALPARAM,"waveOutGetVolume(%s,0) expected "
"MMSYSERR_INVALPARAM, got %s\n", dev_name(device),wave_out_error(rc));
rc=waveOutGetVolume(wout,&volume);
+ if (rc == MMSYSERR_NOTSUPPORTED) has_volume = FALSE;
ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED,
"waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc));
More information about the wine-cvs
mailing list