Skip to content

W
wine-winehq
Commit 1b685779 authored by Jeremy White's avatar Jeremy White Committed by Alexandre Julliard
Browse files
Options

When testing the WAVE_MAPPER device, it seems inappropriate (to me) to

demand WAVE_FORMAT_DIRECT; this fixes another slew of tests.
parent 15ec2780
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
dlls/winmm/tests/wave.c
View file @ 1b685779
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment