Andrew Eikum : winmm/tests: Remove uninteresting tests.
Alexandre Julliard
julliard at winehq.org
Wed Jun 29 15:47:43 CDT 2011
Module: wine
Branch: master
Commit: 79575d33adec96c82fa4ba5f4fe8fbf1e24a6d19
URL: http://source.winehq.org/git/wine.git/?a=commit;h=79575d33adec96c82fa4ba5f4fe8fbf1e24a6d19
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Thu Jun 23 13:12:07 2011 -0500
winmm/tests: Remove uninteresting tests.
---
dlls/winmm/tests/capture.c | 25 +----------------------
dlls/winmm/tests/wave.c | 48 +-------------------------------------------
2 files changed, 2 insertions(+), 71 deletions(-)
diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c
index d0d5df9..2860b00 100644
--- a/dlls/winmm/tests/capture.c
+++ b/dlls/winmm/tests/capture.c
@@ -294,7 +294,7 @@ static void wave_in_test_device(UINT_PTR device)
{
WAVEINCAPSA capsA;
WAVEINCAPSW capsW;
- WAVEFORMATEX format,oformat;
+ WAVEFORMATEX format;
WAVEFORMATEXTENSIBLE wfex;
HWAVEIN win;
MMRESULT rc;
@@ -439,29 +439,6 @@ static void wave_in_test_device(UINT_PTR device)
VirtualFree(twoPages, 2 * dwPageSize, MEM_RELEASE);
}
- /* Testing invalid format: 2 MHz sample rate */
- format.wFormatTag=WAVE_FORMAT_PCM;
- format.nChannels=2;
- format.wBitsPerSample=16;
- format.nSamplesPerSec=2000000;
- format.nBlockAlign=format.nChannels*format.wBitsPerSample/8;
- format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign;
- format.cbSize=0;
- oformat=format;
- rc=waveInOpen(&win,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT);
- ok(rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG ||
- rc==MMSYSERR_INVALPARAM,
- "waveInOpen(%s): opening the device with 2 MHz sample rate should fail: "
- " rc=%s\n",dev_name(device),wave_in_error(rc));
- if (rc==MMSYSERR_NOERROR) {
- trace(" got %dx%2dx%d for %dx%2dx%d\n",
- format.nSamplesPerSec, format.wBitsPerSample,
- format.nChannels,
- oformat.nSamplesPerSec, oformat.wBitsPerSample,
- oformat.nChannels);
- waveInClose(win);
- }
-
/* test non PCM formats */
format.wFormatTag=WAVE_FORMAT_MULAW;
format.nChannels=1;
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index c85f13c..5bf7753 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -820,7 +820,7 @@ static void wave_out_test_device(UINT_PTR device)
{
WAVEOUTCAPSA capsA;
WAVEOUTCAPSW capsW;
- WAVEFORMATEX format, oformat;
+ WAVEFORMATEX format;
WAVEFORMATEXTENSIBLE wfex;
IMAADPCMWAVEFORMAT wfa;
HWAVEOUT wout;
@@ -1103,52 +1103,6 @@ static void wave_out_test_device(UINT_PTR device)
VirtualFree(twoPages, 0, MEM_RELEASE);
}
- /* Testing invalid format: 11 bits per sample */
- format.wFormatTag=WAVE_FORMAT_PCM;
- format.nChannels=2;
- format.wBitsPerSample=11;
- format.nSamplesPerSec=22050;
- format.nBlockAlign=format.nChannels*format.wBitsPerSample/8;
- format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign;
- format.cbSize=0;
- oformat=format;
- rc=waveOutOpen(&wout,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT);
- ok(rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG ||
- rc==MMSYSERR_INVALPARAM,
- "waveOutOpen(%s): opening the device in 11 bits mode should fail: "
- "rc=%s\n",dev_name(device),wave_out_error(rc));
- if (rc==MMSYSERR_NOERROR) {
- trace(" got %dx%2dx%d for %dx%2dx%d\n",
- format.nSamplesPerSec, format.wBitsPerSample,
- format.nChannels,
- oformat.nSamplesPerSec, oformat.wBitsPerSample,
- oformat.nChannels);
- waveOutClose(wout);
- }
-
- /* Testing invalid format: 2 MHz sample rate */
- format.wFormatTag=WAVE_FORMAT_PCM;
- format.nChannels=2;
- format.wBitsPerSample=16;
- format.nSamplesPerSec=2000000;
- format.nBlockAlign=format.nChannels*format.wBitsPerSample/8;
- format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign;
- format.cbSize=0;
- oformat=format;
- rc=waveOutOpen(&wout,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT);
- ok(rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG ||
- rc==MMSYSERR_INVALPARAM,
- "waveOutOpen(%s): opening the device at 2 MHz sample rate should fail: "
- "rc=%s\n",dev_name(device),wave_out_error(rc));
- if (rc==MMSYSERR_NOERROR) {
- trace(" got %dx%2dx%d for %dx%2dx%d\n",
- format.nSamplesPerSec, format.wBitsPerSample,
- format.nChannels,
- oformat.nSamplesPerSec, oformat.wBitsPerSample,
- oformat.nChannels);
- waveOutClose(wout);
- }
-
/* try some non PCM formats */
format.wFormatTag=WAVE_FORMAT_MULAW;
format.nChannels=1;
More information about the wine-cvs
mailing list