From 1b685779a4be00dd2467589d470bba5f12db0bf4 Mon Sep 17 00:00:00 2001 From: Jeremy White Date: Wed, 23 Feb 2005 12:42:43 +0000 Subject: [PATCH] When testing the WAVE_MAPPER device, it seems inappropriate (to me) to demand WAVE_FORMAT_DIRECT; this fixes another slew of tests. --- dlls/winmm/tests/wave.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 38895336af0..4ea73a9bf50 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -705,13 +705,15 @@ static void wave_out_test_device(int device) format.cbSize=0; wave_out_test_deviceOut(device,1.0,&format,win_formats[f][0], 0,&capsA,winetest_interactive,TRUE); - wave_out_test_deviceOut(device,1.0,&format,win_formats[f][0], + if (device != WAVE_MAPPER) + { + wave_out_test_deviceOut(device,1.0,&format,win_formats[f][0], WAVE_FORMAT_DIRECT,&capsA,winetest_interactive, TRUE); - if (device != WAVE_MAPPER) wave_out_test_deviceOut(device,1.0,&format,win_formats[f][0], WAVE_MAPPED,&capsA,winetest_interactive, TRUE); + } } /* Try a PCMWAVEFORMAT aligned next to an unaccessible page for bounds @@ -734,13 +736,15 @@ static void wave_out_test_device(int device) pwfx->nAvgBytesPerSec=pwfx->nSamplesPerSec*pwfx->nBlockAlign; wave_out_test_deviceOut(device,1.0,pwfx,WAVE_FORMAT_2M08,0, &capsA,winetest_interactive,TRUE); - wave_out_test_deviceOut(device,1.0,pwfx,WAVE_FORMAT_2M08, + if (device != WAVE_MAPPER) + { + wave_out_test_deviceOut(device,1.0,pwfx,WAVE_FORMAT_2M08, WAVE_FORMAT_DIRECT,&capsA, winetest_interactive,TRUE); - if (device != WAVE_MAPPER) wave_out_test_deviceOut(device,1.0,pwfx,WAVE_FORMAT_2M08, WAVE_MAPPED,&capsA,winetest_interactive, TRUE); + } } VirtualFree(twoPages, 2 * dwPageSize, MEM_RELEASE); }