diff --git a/configure b/configure index 13a7b0001f6035e6d117ea005ccd3bfa6acf31e4..09c5b5e5a598d80228d4387241b612482d1336b4 100755 --- a/configure +++ b/configure @@ -13594,7 +13594,7 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile unicode/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile unicode/Makefile" cat >confcache <<\_ACEOF @@ -14205,6 +14205,7 @@ do "dlls/winmm/mciseq/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciseq/Makefile" ;; "dlls/winmm/mciwave/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciwave/Makefile" ;; "dlls/winmm/midimap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/midimap/Makefile" ;; + "dlls/winmm/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;; "dlls/winmm/wavemap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/wavemap/Makefile" ;; "dlls/winmm/winealsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winealsa/Makefile" ;; "dlls/winmm/winearts/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winearts/Makefile" ;; diff --git a/configure.ac b/configure.ac index 699c82f298b47c6cc374fde5ed4425982a83776a..3c24d3115040c6676d6200063505321037683021 100644 --- a/configure.ac +++ b/configure.ac @@ -1469,6 +1469,7 @@ dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile +dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 91b80b62cb67ca3bc5e66318af80cb62105be34b..ed090256375df238c2fd34e5809bf28dd3b2ccb1 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -29,6 +29,8 @@ RC_SRCS = winmm_res.rc EXTRA_OBJS16 = $(MODULE).glue.o +SUBDIRS = tests + @MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/winmm/tests/.cvsignore b/dlls/winmm/tests/.cvsignore new file mode 100644 index 0000000000000000000000000000000000000000..95d0257a1c68f1076d4f40ce989910471c2ef80e --- /dev/null +++ b/dlls/winmm/tests/.cvsignore @@ -0,0 +1,4 @@ +Makefile +testlist.c +wave.ok +winmm_test.exe.spec.c diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in new file mode 100644 index 0000000000000000000000000000000000000000..f736ec29a7e76e5fb580c310351c4fd23818f3b2 --- /dev/null +++ b/dlls/winmm/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = winmm.dll +IMPORTS = winmm kernel32 + +CTESTS = \ + wave.c + +@MAKE_TEST_RULES@ + +### Dependencies: diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c new file mode 100644 index 0000000000000000000000000000000000000000..4694c6002b40d2a3cc1e0ca684c39ca4cb39bffb --- /dev/null +++ b/dlls/winmm/tests/wave.c @@ -0,0 +1,180 @@ +/* + * Unit tests for winmm functions + * + * Copyright (c) 2002 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "wine/test.h" +#include "winbase.h" +#include <mmsystem.h> + +/* + * Note that in most of this test we may get MMSYSERR_BADDEVICEID errors + * at about any time if the user starts another application that uses the + * sound device. So we should not report these as test failures. + */ + +#define TEST_FORMATS 12 +static const int win_formats[TEST_FORMATS][4]={ + {WAVE_FORMAT_1M08, 11025, 8, 1}, + {WAVE_FORMAT_1S08, 11025, 8, 2}, + {WAVE_FORMAT_1M16, 11025, 16, 1}, + {WAVE_FORMAT_1S16, 11025, 16, 2}, + {WAVE_FORMAT_2M08, 22050, 8, 1}, + {WAVE_FORMAT_2S08, 22050, 8, 2}, + {WAVE_FORMAT_2M16, 22050, 16, 1}, + {WAVE_FORMAT_2S16, 22050, 16, 2}, + {WAVE_FORMAT_4M08, 44100, 8, 1}, + {WAVE_FORMAT_4S08, 44100, 8, 2}, + {WAVE_FORMAT_4M16, 44100, 16, 1}, + {WAVE_FORMAT_4S16, 44100, 16, 2} +}; + +void wave_out_tests() +{ + WAVEOUTCAPS caps; + WAVEFORMATEX format; + HWAVEOUT wout; + MMRESULT rc; + UINT ndev,d,f; + int success; + + ndev=waveOutGetNumDevs(); + winetest_trace("found %d WaveOut devices\n",ndev); + + todo_wine { + rc=waveOutGetDevCapsA(ndev+1,&caps,sizeof(caps)); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutGetDevCa psA: MMSYSERR_BADDEVICEID expected, got %d",rc); + } + + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=2; + format.wBitsPerSample=16; + format.nSamplesPerSec=44100; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + rc=waveOutOpen(&wout,ndev+1,&format,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutOpen: MMSYSERR_BADDEVICEID expected, got %d",rc); + + for (d=0;d<ndev;d++) { + rc=waveOutGetDevCapsA(d,&caps,sizeof(caps)); + success=(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID); + ok(success,"failed to get capabilities of device %d: rc=%d",d,rc); + if (!success) + continue; + + winetest_trace(" %d: \"%s\" %d.%d (%d:%d): channels=%d formats=%04lx support=%04lx\n", + d,caps.szPname,caps.vDriverVersion >> 8, + caps.vDriverVersion & 0xff, + caps.wMid,caps.wPid, + caps.wChannels,caps.dwFormats,caps.dwSupport); + + for (f=0;f<TEST_FORMATS;f++) { + if (!(caps.dwFormats & win_formats[f][0])) + continue; + + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=win_formats[f][3]; + format.wBitsPerSample=win_formats[f][2]; + format.nSamplesPerSec=win_formats[f][1]; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + + rc=waveOutOpen(&wout,d,&format,0,0,CALLBACK_NULL); + success=(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID); + ok(success, "failed to open device %d: rc=%d",d,rc); + if (success) { + ok(format.nChannels==win_formats[f][3] && + format.wBitsPerSample==win_formats[f][2] && + format.nSamplesPerSec==win_formats[f][1], + "got the wrong format: %ldx%2dx%d instead of %dx%2dx%d\n", + format.nSamplesPerSec, format.wBitsPerSample, + format.nChannels, win_formats[f][1], win_formats[f][2], + win_formats[f][3]); + } + if (rc==MMSYSERR_NOERROR) + waveOutClose(wout); + + /* Try again with WAVE_FORMAT_DIRECT */ + rc=waveOutOpen(&wout,d,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); + success=(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID); + ok(success, "failed to open device %d: rc=%d",d,rc); + if (success) { + ok(format.nChannels==win_formats[f][3] && + format.wBitsPerSample==win_formats[f][2] && + format.nSamplesPerSec==win_formats[f][1], + "got the wrong format: %ldx%2dx%d instead of %dx%2dx%d\n", + format.nSamplesPerSec, format.wBitsPerSample, + format.nChannels, win_formats[f][1], win_formats[f][2], + win_formats[f][3]); + } + if (rc==MMSYSERR_NOERROR) + waveOutClose(wout); + } + + /* Check an invalid format to test error handling */ + todo_wine { + winetest_trace("Testing invalid 2MHz format\n"); + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=2; + format.wBitsPerSample=16; + format.nSamplesPerSec=2000000; /* 2MHz! */ + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + rc=waveOutOpen(&wout,d,&format,0,0,CALLBACK_NULL); + success=(rc==WAVERR_BADFORMAT); + ok(success, "opening the device at 2MHz should fail %d: rc=%d",d,rc); + if (rc==MMSYSERR_NOERROR) { + winetest_trace(" got %ldx%2dx%d for %dx%2dx%d\n", + format.nSamplesPerSec, format.wBitsPerSample, + format.nChannels, + win_formats[f][1], win_formats[f][2], + win_formats[f][3]); + waveOutClose(wout); + } + } + + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=2; + format.wBitsPerSample=16; + format.nSamplesPerSec=2000000; /* 2MHz! */ + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + rc=waveOutOpen(&wout,d,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); + success=(rc==WAVERR_BADFORMAT); + ok(success, "opening the device at 2MHz should fail %d: rc=%d",d,rc); + if (rc==MMSYSERR_NOERROR) { + winetest_trace(" got %ldx%2dx%d for %dx%2dx%d\n", + format.nSamplesPerSec, format.wBitsPerSample, + format.nChannels, + win_formats[f][1], win_formats[f][2], + win_formats[f][3]); + waveOutClose(wout); + } + } +} + +START_TEST(wave) +{ + wave_out_tests(); +}