From 5864ef417e25cb6152cacf5801ea58b980dd0396 Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Fri, 13 Jan 2017 10:10:42 +0000 Subject: [PATCH] dmime/tests: Skip the tests if InitAudio fails for any reason. Fixes failures on Windows 10. Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/dmime/tests/dmime.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3e93c396d78..1e96abaa48e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -22,6 +22,7 @@ #include #include #include +#include #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) @@ -57,11 +58,13 @@ static void test_COM_audiopath(void) } hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); - if (hr == DSERR_NODRIVER) { - skip("No audio driver\n"); + ok(hr == S_OK || hr == DSERR_NODRIVER || + broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED), /* Win 10 testbot */ + "DirectMusicPerformance_InitAudio failed: %08x\n", hr); + if (FAILED(hr)) { + skip("Audio failed to initialize\n"); return; } - ok(hr == S_OK, "DirectMusicPerformance_InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &dmap); ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %08x\n", hr);