From 8650c570a39c8a9202fe32f787680d05d9789d3d Mon Sep 17 00:00:00 2001 From: Detlef Riekenberg Date: Thu, 22 Feb 2007 21:15:29 +0100 Subject: [PATCH] serialui/tests: Add initial tests. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/serialui/tests/Makefile.in | 13 ++ dlls/serialui/tests/confdlg.c | 271 ++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 dlls/serialui/tests/Makefile.in create mode 100644 dlls/serialui/tests/confdlg.c diff --git a/.gitignore b/.gitignore index 2600d0335e2..21f12e37a57 100644 --- a/.gitignore +++ b/.gitignore @@ -441,6 +441,9 @@ dlls/secur32/tests/testlist.c dlls/sensapi/libsensapi.def dlls/serialui/libserialui.def dlls/serialui/serialui_rc.res +dlls/serialui/tests/*.ok +dlls/serialui/tests/serialui_crosstest.exe +dlls/serialui/tests/testlist.c dlls/setupapi/libsetupapi.def dlls/setupapi/setupapi.res dlls/setupapi/tests/*.ok @@ -830,6 +833,7 @@ programs/winetest/rpcrt4_test.exe programs/winetest/rsabase_test.exe programs/winetest/rsaenh_test.exe programs/winetest/secur32_test.exe +programs/winetest/serialui_test.exe programs/winetest/setupapi_test.exe programs/winetest/shdocvw_test.exe programs/winetest/shell32_test.exe diff --git a/Makefile.in b/Makefile.in index 64b59511969..86fa21340b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -340,6 +340,7 @@ ALL_MAKEFILES = \ dlls/security/Makefile \ dlls/sensapi/Makefile \ dlls/serialui/Makefile \ + dlls/serialui/tests/Makefile \ dlls/setupapi/Makefile \ dlls/setupapi/tests/Makefile \ dlls/sfc/Makefile \ @@ -672,6 +673,7 @@ dlls/secur32/tests/Makefile: dlls/secur32/tests/Makefile.in dlls/Maketest.rules dlls/security/Makefile: dlls/security/Makefile.in dlls/Makedll.rules dlls/sensapi/Makefile: dlls/sensapi/Makefile.in dlls/Makedll.rules dlls/serialui/Makefile: dlls/serialui/Makefile.in dlls/Makedll.rules +dlls/serialui/tests/Makefile: dlls/serialui/tests/Makefile.in dlls/Maketest.rules dlls/setupapi/Makefile: dlls/setupapi/Makefile.in dlls/Makedll.rules dlls/setupapi/tests/Makefile: dlls/setupapi/tests/Makefile.in dlls/Maketest.rules dlls/sfc/Makefile: dlls/sfc/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 38744e5c30d..fb9c11fd9df 100755 --- a/configure +++ b/configure @@ -20427,7 +20427,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/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/browseui/Makefile dlls/browseui/tests/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/credui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/ddrawex/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/itss/tests/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/odbccp32/tests/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/sfc_os/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/snmpapi/tests/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user32/Makefile dlls/user32/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winealsa.drv/Makefile dlls/winearts.drv/Makefile dlls/wineaudioio.drv/Makefile dlls/winecoreaudio.drv/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineesd.drv/Makefile dlls/winejack.drv/Makefile dlls/winejoystick.drv/Makefile dlls/winemp3.acm/Makefile dlls/winenas.drv/Makefile dlls/wineoss.drv/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wing32/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/tests/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" +ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/browseui/Makefile dlls/browseui/tests/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/credui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/ddrawex/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/itss/tests/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/odbccp32/tests/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/serialui/tests/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/sfc_os/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/snmpapi/tests/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user32/Makefile dlls/user32/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winealsa.drv/Makefile dlls/winearts.drv/Makefile dlls/wineaudioio.drv/Makefile dlls/winecoreaudio.drv/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineesd.drv/Makefile dlls/winejack.drv/Makefile dlls/winejoystick.drv/Makefile dlls/winemp3.acm/Makefile dlls/winenas.drv/Makefile dlls/wineoss.drv/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wing32/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/tests/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -21187,6 +21187,7 @@ do "dlls/security/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/security/Makefile" ;; "dlls/sensapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sensapi/Makefile" ;; "dlls/serialui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/serialui/Makefile" ;; + "dlls/serialui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/serialui/tests/Makefile" ;; "dlls/setupapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/setupapi/Makefile" ;; "dlls/setupapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/setupapi/tests/Makefile" ;; "dlls/sfc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sfc/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9e545ff5062..672dd78915c 100644 --- a/configure.ac +++ b/configure.ac @@ -1711,6 +1711,7 @@ dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile +dlls/serialui/tests/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile diff --git a/dlls/Makefile.in b/dlls/Makefile.in index e798e1ef4a8..2e3cafcf4b6 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -263,6 +263,7 @@ TESTSUBDIRS = \ rsabase/tests \ rsaenh/tests \ secur32/tests \ + serialui/tests \ setupapi/tests \ shdocvw/tests \ shell32/tests \ diff --git a/dlls/serialui/tests/Makefile.in b/dlls/serialui/tests/Makefile.in new file mode 100644 index 00000000000..a106fffbf5d --- /dev/null +++ b/dlls/serialui/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = serialui.dll +IMPORTS = kernel32 + +CTESTS = \ + confdlg.c + +@MAKE_TEST_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/serialui/tests/confdlg.c b/dlls/serialui/tests/confdlg.c new file mode 100644 index 00000000000..95a850e6282 --- /dev/null +++ b/dlls/serialui/tests/confdlg.c @@ -0,0 +1,271 @@ +/* + * Unit test suite for serialui API functions + * + * Copyright 2007 Detlef Riekenberg + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include +#include + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winnls.h" + +#include "wine/test.h" + + +static HINSTANCE hdll; +static DWORD (WINAPI *pGetDefaultCommConfigA)(LPCSTR, LPCOMMCONFIG, LPDWORD); +static DWORD (WINAPI *pGetDefaultCommConfigW)(LPCWSTR, LPCOMMCONFIG, LPDWORD); + + +static const CHAR com1A[] = "com1"; +static const CHAR emptyA[] = ""; +static const CHAR fmt_comA[] = "com%d"; +static const CHAR str_colonA[] = ":"; + +static const WCHAR com1W[] = {'c','o','m','1',0}; +static const WCHAR emptyW[] = {0}; +static const WCHAR fmt_comW[] = {'c','o','m','%','d',0}; +static const WCHAR str_colonW[] = {':',0}; + +/* ################# */ + +static LPCSTR load_functions(void) +{ + LPCSTR ptr; + + ptr = "serialui.dll"; + hdll = LoadLibraryA(ptr); + if (!hdll) return ptr; + + ptr = "drvGetDefaultCommConfigA"; + pGetDefaultCommConfigA = (VOID *) GetProcAddress(hdll, ptr); + if (!pGetDefaultCommConfigA) return ptr; + + ptr = "drvGetDefaultCommConfigW"; + pGetDefaultCommConfigW = (VOID *) GetProcAddress(hdll, ptr); + if (!pGetDefaultCommConfigW) return ptr; + + + return NULL; +} + +/* ################# */ + +static void test_drvGetDefaultCommConfigA(void) +{ + COMMCONFIG pCC[3]; + CHAR bufferA[16]; + DWORD i; + DWORD res; + DWORD len; + + + /* off by one: one byte smaller */ + i = sizeof(COMMCONFIG); + len = sizeof(COMMCONFIG) -1; + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigA(com1A, pCC, &len); + if (res == ERROR_CALL_NOT_IMPLEMENTED) { + /* NT does not implement the ANSI API */ + skip("*A not implemented\n"); + return; + } + ok( (res == ERROR_INSUFFICIENT_BUFFER) && (len >= i), + "returned %u with %u and %u (expected " + "ERROR_INSUFFICIENT_BUFFER and '>= %u')\n", res, GetLastError(), len, i); + + /* test ports "com0" - "com10" */ + for (i = 0; i < 11 ; i++) { + sprintf(bufferA, fmt_comA, i); + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigA(bufferA, pCC, &len); + if (i == 0) { + ok( res == ERROR_BADKEY, + "returned %u with %u and %u for %s (expected " + "ERROR_BADKEY)\n", res, GetLastError(), len, bufferA); + } + else + { + ok((res == ERROR_SUCCESS) || (res == ERROR_BADKEY), + "returned %u with %u and %u for %s (expected ERROR_SUCCESS or " + "ERROR_BADKEY)\n", res, GetLastError(), len, bufferA); + } + + /* a name with a colon is invalid */ + if (res == ERROR_SUCCESS) { + lstrcatA(bufferA, str_colonA); + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + res = pGetDefaultCommConfigA(bufferA, pCC, &len); + ok( res == ERROR_BADKEY, + "returned %u with %u and %u for %s (expected '0' with " + "ERROR_BADKEY)\n", res, GetLastError(), len, bufferA); + } + } + + + /* an empty String is not allowed */ + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigA(emptyA, pCC, &len); + ok( res == ERROR_BADKEY, + "returned %u with %u and %u for %s (expected ERROR_BADKEY)\n", + res, GetLastError(), len, emptyA); + + /* some NULL checks */ + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigA(NULL, pCC, &len); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u and %u for NULL (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError(), len); + + + len = sizeof(pCC); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigA(com1A, NULL, &len); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u and %u (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError(), len); + + + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigA(com1A, pCC, NULL); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); +} + +/* ################# */ + +static void test_drvGetDefaultCommConfigW(void) +{ + COMMCONFIG pCC[3]; + WCHAR bufferW[16]; + CHAR bufferA[16]; + DWORD i; + DWORD res; + DWORD len; + + + /* off by one: one byte smaller */ + i = sizeof(COMMCONFIG); + len = sizeof(COMMCONFIG) -1; + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigW(com1W, pCC, &len); + if (res == ERROR_CALL_NOT_IMPLEMENTED) { + skip("*W not implemented\n"); + return; + } + ok( (res == ERROR_INSUFFICIENT_BUFFER) && (len >= i), + "returned %u with %u and %u (expected " + "ERROR_INSUFFICIENT_BUFFER and '>= %u')\n", res, GetLastError(), len, i); + + /* test ports "com0" - "com10" */ + for (i = 0; i < 11 ; i++) { + sprintf(bufferA, fmt_comA, i); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigW(bufferW, pCC, &len); + if (i == 0) { + ok( res == ERROR_BADKEY, + "returned %u with %u and %u for %s (expected " + "ERROR_BADKEY)\n", res, GetLastError(), len, bufferA); + } + else + { + ok((res == ERROR_SUCCESS) || (res == ERROR_BADKEY), + "returned %u with %u and %u for %s (expected ERROR_SUCCESS or " + "ERROR_BADKEY)\n", res, GetLastError(), len, bufferA); + } + + /* a name with a colon is invalid */ + if (res == ERROR_SUCCESS) { + lstrcatA(bufferA, str_colonA); + lstrcatW(bufferW, str_colonW); + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + res = pGetDefaultCommConfigW(bufferW, pCC, &len); + ok( res == ERROR_BADKEY, + "returned %u with %u and %u for %s (expected '0' with " + "ERROR_BADKEY)\n", res, GetLastError(), len, bufferA); + } + } + + /* an empty String is not allowed */ + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigW(emptyW, pCC, &len); + ok( res == ERROR_BADKEY, + "returned %u with %u and %u for %s (expected ERROR_BADKEY)\n", + res, GetLastError(), len, emptyA); + + /* some NULL checks */ + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigW(NULL, pCC, &len); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u and %u for NULL (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError(), len); + + + len = sizeof(pCC); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigW(com1W, NULL, &len); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u and %u (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError(), len); + + + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigW(com1W, pCC, NULL); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + +} + +/* ################# */ + +START_TEST(confdlg) +{ + LPCSTR ptr; + + ptr = load_functions(); + if (ptr) { + skip("got NULL with %u for %s\n", GetLastError(), ptr); + return; + } + + test_drvGetDefaultCommConfigA(); + test_drvGetDefaultCommConfigW(); + +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index b4ab982d0a4..f35b768432c 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -66,6 +66,7 @@ TESTBINS = \ rsabase_test.exe \ rsaenh_test.exe \ secur32_test.exe \ + serialui_test.exe \ setupapi_test.exe \ shdocvw_test.exe \ shell32_test.exe \ @@ -168,6 +169,8 @@ rsaenh_test.exe: $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) cp $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) $@ && $(STRIP) $@ secur32_test.exe: $(DLLDIR)/secur32/tests/secur32_test.exe$(DLLEXT) cp $(DLLDIR)/secur32/tests/secur32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +serialui_test.exe: $(DLLDIR)/serialui/tests/serialui_test.exe$(DLLEXT) + cp $(DLLDIR)/serialui/tests/serialui_test.exe$(DLLEXT) $@ && $(STRIP) $@ setupapi_test.exe: $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) cp $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ shdocvw_test.exe: $(DLLDIR)/shdocvw/tests/shdocvw_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index db1c87ea699..423eb1ac583 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -189,6 +189,7 @@ rpcrt4_test.exe TESTRES "rpcrt4_test.exe" rsabase_test.exe TESTRES "rsabase_test.exe" rsaenh_test.exe TESTRES "rsaenh_test.exe" secur32_test.exe TESTRES "secur32_test.exe" +serialui_test.exe TESTRES "serialui_test.exe" setupapi_test.exe TESTRES "setupapi_test.exe" shdocvw_test.exe TESTRES "shdocvw_test.exe" shell32_test.exe TESTRES "shell32_test.exe"