From 39857443e4159d5c9e04fb93e158603b374f1a44 Mon Sep 17 00:00:00 2001 From: Dan Kegel Date: Sun, 3 Sep 2006 21:13:08 -0700 Subject: [PATCH] programs/wcmd: Rename to programs/cmd. --- configure | 4 ++-- configure.ac | 2 +- dlls/msvcrt/process.c | 2 +- documentation/PACKAGING | 3 +-- programs/.gitignore | 2 +- programs/Makefile.in | 5 ++--- programs/{wcmd => cmd}/Cs.rc | 0 programs/{wcmd => cmd}/De.rc | 0 programs/{wcmd => cmd}/En.rc | 26 +++++++++++++------------- programs/{wcmd => cmd}/Es.rc | 0 programs/{wcmd => cmd}/Fr.rc | 0 programs/{wcmd => cmd}/Ja.rc | 0 programs/{wcmd => cmd}/Ko.rc | 0 programs/{wcmd => cmd}/Makefile.in | 2 +- programs/{wcmd => cmd}/Nl.rc | 0 programs/{wcmd => cmd}/No.rc | 0 programs/{wcmd => cmd}/Pl.rc | 0 programs/{wcmd => cmd}/Pt.rc | 0 programs/{wcmd => cmd}/README | 10 +++++----- programs/{wcmd => cmd}/Ru.rc | 0 programs/{wcmd => cmd}/Si.rc | 0 programs/{wcmd => cmd}/Tr.rc | 0 programs/{wcmd => cmd}/batch.c | 2 +- programs/{wcmd => cmd}/builtins.c | 2 +- programs/{wcmd => cmd}/directory.c | 2 +- programs/{wcmd => cmd}/wcmd.h | 2 +- programs/{wcmd => cmd}/wcmdmain.c | 8 ++++---- programs/{wcmd => cmd}/wcmdrc.rc | 0 programs/make_progs | 5 ++--- tools/wine.inf | 8 ++++---- 30 files changed, 41 insertions(+), 44 deletions(-) rename programs/{wcmd => cmd}/Cs.rc (100%) rename programs/{wcmd => cmd}/De.rc (100%) rename programs/{wcmd => cmd}/En.rc (92%) rename programs/{wcmd => cmd}/Es.rc (100%) rename programs/{wcmd => cmd}/Fr.rc (100%) rename programs/{wcmd => cmd}/Ja.rc (100%) rename programs/{wcmd => cmd}/Ko.rc (100%) rename programs/{wcmd => cmd}/Makefile.in (93%) rename programs/{wcmd => cmd}/Nl.rc (100%) rename programs/{wcmd => cmd}/No.rc (100%) rename programs/{wcmd => cmd}/Pl.rc (100%) rename programs/{wcmd => cmd}/Pt.rc (100%) rename programs/{wcmd => cmd}/README (86%) rename programs/{wcmd => cmd}/Ru.rc (100%) rename programs/{wcmd => cmd}/Si.rc (100%) rename programs/{wcmd => cmd}/Tr.rc (100%) rename programs/{wcmd => cmd}/batch.c (99%) rename programs/{wcmd => cmd}/builtins.c (99%) rename programs/{wcmd => cmd}/directory.c (99%) rename programs/{wcmd => cmd}/wcmd.h (98%) rename programs/{wcmd => cmd}/wcmdmain.c (99%) rename programs/{wcmd => cmd}/wcmdrc.rc (100%) diff --git a/configure b/configure index c02192ef43b..665f614ba23 100755 --- a/configure +++ b/configure @@ -24046,7 +24046,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/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/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/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/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/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/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/kernel/Makefile dlls/kernel/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/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/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/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/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/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/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/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/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/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/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/wcmd/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/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/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/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/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/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/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/kernel/Makefile dlls/kernel/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/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/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/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/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/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/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/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/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/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 @@ -24863,6 +24863,7 @@ do "loader/Makefile") CONFIG_FILES="$CONFIG_FILES loader/Makefile" ;; "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; "programs/clock/Makefile") CONFIG_FILES="$CONFIG_FILES programs/clock/Makefile" ;; + "programs/cmd/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cmd/Makefile" ;; "programs/cmdlgtst/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cmdlgtst/Makefile" ;; "programs/control/Makefile") CONFIG_FILES="$CONFIG_FILES programs/control/Makefile" ;; "programs/eject/Makefile") CONFIG_FILES="$CONFIG_FILES programs/eject/Makefile" ;; @@ -24883,7 +24884,6 @@ do "programs/taskmgr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/taskmgr/Makefile" ;; "programs/uninstaller/Makefile") CONFIG_FILES="$CONFIG_FILES programs/uninstaller/Makefile" ;; "programs/view/Makefile") CONFIG_FILES="$CONFIG_FILES programs/view/Makefile" ;; - "programs/wcmd/Makefile") CONFIG_FILES="$CONFIG_FILES programs/wcmd/Makefile" ;; "programs/wineboot/Makefile") CONFIG_FILES="$CONFIG_FILES programs/wineboot/Makefile" ;; "programs/winebrowser/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winebrowser/Makefile" ;; "programs/winecfg/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winecfg/Makefile" ;; diff --git a/configure.ac b/configure.ac index 4790a553dd6..c9a18546103 100644 --- a/configure.ac +++ b/configure.ac @@ -1756,6 +1756,7 @@ libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile +programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile @@ -1776,7 +1777,6 @@ programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile -programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b740badf29f..ac44065310c 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -531,7 +531,7 @@ MSVCRT_intptr_t CDECL _spawnvp(int flags, const char* name, const char* const* a */ MSVCRT_FILE* CDECL MSVCRT__popen(const char* command, const char* mode) { - static const char wcmd[] = "wcmd", cmdFlag[] = " /C ", comSpec[] = "COMSPEC"; + static const char wcmd[] = "cmd", cmdFlag[] = " /C ", comSpec[] = "COMSPEC"; MSVCRT_FILE *ret; BOOL readPipe = TRUE; int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1, fdStdErr = -1; diff --git a/documentation/PACKAGING b/documentation/PACKAGING index 3443222794b..df9438eb496 100644 --- a/documentation/PACKAGING +++ b/documentation/PACKAGING @@ -197,6 +197,7 @@ WINE COMPONENTS ~~~~~~~~~~~~~~~ * Executable Files + - cmd : Wine's command line interpreter, a cmd.exe replacement. - notepad : The windows Notepad replacement. - progman : A Program Manager replacement. - regedit : A graphical tool to edit your registry or for @@ -207,7 +208,6 @@ WINE COMPONENTS managing running Windows and Winlib processes. - uninstaller: A program to uninstall installed Windows programs. Like the Add/Remove Program in the windows control panel. - - wcmd : Wine's command line interpreter, a cmd.exe replacement. - widl : Wine IDL compiler compiles (MS-RPC and DCOM) Interface Definition Language files. - wine : The main Wine executable. This program will load a Windows @@ -454,7 +454,6 @@ You will need to package the files: $prefix/bin/regedit $prefix/bin/rundll32 $prefix/bin/regsvr32 - $prefix/bin/wcmd $prefix/bin/widl $prefix/bin/winhelp diff --git a/programs/.gitignore b/programs/.gitignore index 7320986ff70..29f7ca303db 100644 --- a/programs/.gitignore +++ b/programs/.gitignore @@ -3,6 +3,7 @@ /wineapploader /winelauncher clock/clock +cmd/cmd cmdlgtst/cmdlgtst control/control eject/eject @@ -23,7 +24,6 @@ start/start taskmgr/taskmgr uninstaller/uninstaller view/view -wcmd/wcmd wineboot/wineboot winebrowser/winebrowser winecfg/winecfg diff --git a/programs/Makefile.in b/programs/Makefile.in index 9b892d9558f..0e0c67e66ce 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -7,6 +7,7 @@ VPATH = @srcdir@ SUBDIRS = \ clock \ + cmd \ cmdlgtst \ control \ eject \ @@ -27,7 +28,6 @@ SUBDIRS = \ taskmgr \ uninstaller \ view \ - wcmd \ wineboot \ winebrowser \ winecfg \ @@ -46,6 +46,7 @@ SUBDIRS = \ # Sub-directories to run make install into INSTALLSUBDIRS = \ clock \ + cmd \ control \ eject \ expand \ @@ -64,7 +65,6 @@ INSTALLSUBDIRS = \ start \ taskmgr \ uninstaller \ - wcmd \ wineboot \ winebrowser \ winecfg \ @@ -87,7 +87,6 @@ INSTALLPROGS = \ regedit \ regsvr32 \ uninstaller \ - wcmd \ wineboot \ winebrowser \ winecfg \ diff --git a/programs/wcmd/Cs.rc b/programs/cmd/Cs.rc similarity index 100% rename from programs/wcmd/Cs.rc rename to programs/cmd/Cs.rc diff --git a/programs/wcmd/De.rc b/programs/cmd/De.rc similarity index 100% rename from programs/wcmd/De.rc rename to programs/cmd/De.rc diff --git a/programs/wcmd/En.rc b/programs/cmd/En.rc similarity index 92% rename from programs/wcmd/En.rc rename to programs/cmd/En.rc index 6c49df554df..fda556ee442 100644 --- a/programs/wcmd/En.rc +++ b/programs/cmd/En.rc @@ -62,7 +62,7 @@ preceding it with an @ sign.\n" Syntax: FOR %variable IN (set) DO command\n\ \n\ The requirement to double the % sign when using FOR in a batch file does\n\ -not exist in wcmd.\n" +not exist in wine's cmd.\n" WCMD_GOTO, "The GOTO command transfers execution to another statement within a\n\ @@ -105,7 +105,7 @@ below the item are moved as well.\n\ MOVE fails if the old and new locations are on different DOS drive letters.\n" WCMD_PATH, -"PATH displays or changes the wcmd search path.\n\ +"PATH displays or changes the cmd search path.\n\ \n\ Entering PATH will display the current PATH setting (initially this is\n\ the value given in your wine.conf file). To change the setting follow the\n\ @@ -125,14 +125,14 @@ before it scrolls off the screen.\n" "PROMPT sets the command-line prompt.\n\ \n\ The string following the PROMPT command (and the space immediately after)\n\ -appears at the beginning of the line when wcmd is waiting for input.\n\ +appears at the beginning of the line when cmd is waiting for input.\n\ \n\ The following character strings have the special meaning shown:\n\ \n\ $$ Dollar sign $_ Linefeed $b Pipe sign (|)\n\ $d Current date $e Escape $g > sign\n\ $l < sign $n Current drive $p Current path\n\ -$q Equal sign $t Current time $v wcmd version\n\ +$q Equal sign $t Current time $v cmd version\n\ \n\ Note that entering the PROMPT command without a prompt-string resets the\n\ prompt to the default, which is the current directory (which includes the\n\ @@ -152,7 +152,7 @@ action, and can therefore be used as a comment in a batch file.\n" WCMD_RMDIR, "Help about RMDIR\n" WCMD_SET, -"SET displays or changes the wcmd environment variables.\n\ +"SET displays or changes the cmd environment variables.\n\ \n\ SET without parameters shows all of the current environment.\n\ \n\ @@ -167,7 +167,7 @@ have embedded spaces.\n\ Under Wine, the environment of the underlying operating system is\n\ included into the Win32 environment, there will generally therefore be\n\ many more values than in a native Win32 implementation. Note that it is\n\ -not possible to affect the operating system environment from within wcmd.\n" +not possible to affect the operating system environment from within cmd.\n" WCMD_SHIFT, "SHIFT is used in a batch file to remove one parameter from the head of\n\ @@ -176,7 +176,7 @@ if called from the command line.\n" WCMD_TIME, "Help about TIME\n" - WCMD_TITLE, "Sets the window title for the wcmd window, syntax TITLE [string]\n" + WCMD_TITLE, "Sets the window title for the cmd window, syntax TITLE [string]\n" WCMD_TYPE, "TYPE copies to the console device (or elsewhere\n\ @@ -192,15 +192,15 @@ VERIFY Displays ON or OFF as appropriate.\n\ The verify flag has no function in Wine.\n" WCMD_VER, -"VER displays the version of wcmd you are running\n" +"VER displays the version of cmd you are running\n" WCMD_VOL, "Help about VOL\n" WCMD_EXIT, "EXIT terminates the current command session and returns\n\ -to the operating system or shell from which you invoked wcmd.\n" +to the operating system or shell from which you invoked cmd.\n" - 1000, "WCMD built-in commands are:\n\ + 1000, "CMD built-in commands are:\n\ ATTRIB\t\tShow or change DOS file attributes\n\ CALL\t\tInvoke a batch file from inside another\n\ CD (CHDIR)\tChange current default directory\n\ @@ -220,10 +220,10 @@ REN (RENAME)\tRename a file\n\ RD (RMDIR)\tDelete a subdirectory\n\ SET\t\tSet or show environment variables\n\ TIME\t\tSet or show the current system time\n\ -TITLE\t\tSet the window title for the WCMD session\n\ +TITLE\t\tSet the window title for the CMD session\n\ TYPE\t\tType the contents of a text file\n\ -VER\t\tShow the current version of WCMD\n\ +VER\t\tShow the current version of CMD\n\ VOL\t\tShow the volume label of a disk device\n\ -EXIT\t\tClose down WCMD\n\n\ +EXIT\t\tClose down CMD\n\n\ Enter HELP for further information on any of the above commands\n" } diff --git a/programs/wcmd/Es.rc b/programs/cmd/Es.rc similarity index 100% rename from programs/wcmd/Es.rc rename to programs/cmd/Es.rc diff --git a/programs/wcmd/Fr.rc b/programs/cmd/Fr.rc similarity index 100% rename from programs/wcmd/Fr.rc rename to programs/cmd/Fr.rc diff --git a/programs/wcmd/Ja.rc b/programs/cmd/Ja.rc similarity index 100% rename from programs/wcmd/Ja.rc rename to programs/cmd/Ja.rc diff --git a/programs/wcmd/Ko.rc b/programs/cmd/Ko.rc similarity index 100% rename from programs/wcmd/Ko.rc rename to programs/cmd/Ko.rc diff --git a/programs/wcmd/Makefile.in b/programs/cmd/Makefile.in similarity index 93% rename from programs/wcmd/Makefile.in rename to programs/cmd/Makefile.in index be8c339667d..f0c75b3d5a6 100644 --- a/programs/wcmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = wcmd.exe +MODULE = cmd.exe APPMODE = -mconsole IMPORTS = shell32 user32 kernel32 diff --git a/programs/wcmd/Nl.rc b/programs/cmd/Nl.rc similarity index 100% rename from programs/wcmd/Nl.rc rename to programs/cmd/Nl.rc diff --git a/programs/wcmd/No.rc b/programs/cmd/No.rc similarity index 100% rename from programs/wcmd/No.rc rename to programs/cmd/No.rc diff --git a/programs/wcmd/Pl.rc b/programs/cmd/Pl.rc similarity index 100% rename from programs/wcmd/Pl.rc rename to programs/cmd/Pl.rc diff --git a/programs/wcmd/Pt.rc b/programs/cmd/Pt.rc similarity index 100% rename from programs/wcmd/Pt.rc rename to programs/cmd/Pt.rc diff --git a/programs/wcmd/README b/programs/cmd/README similarity index 86% rename from programs/wcmd/README rename to programs/cmd/README index 7041c06a0e8..ee1c542325e 100644 --- a/programs/wcmd/README +++ b/programs/cmd/README @@ -1,4 +1,4 @@ -WCMD - A Command-Line Interface for WINE +CMD - A Command-Line Interface for WINE Copyright (C) 1999 D Pickles (davep@nugate.demon.co.uk) Open Source software published under the Wine Licence and Warranty. @@ -34,13 +34,13 @@ with an absolute or relative path but no wildcards or partial filenames. - Redirection is implemented as a command line is parsed. This means that ">" and "<" symbols cannot appear in command arguments even within quotes. - In many cases parsing and syntax checking is less rigorous than DOS. Thus an -existing DOS batch file will probably run unchanged under Wcmd but the reverse -may not be the case. +existing DOS batch file will probably run unchanged under wine's cmd but the +reverse may not be the case. WINE OR WIN32 BINARY? -Wcmd can be built as a Wine binary, or (using a Win32 compiler) as a Win32 .EXE +cmd can be built as a Wine binary, or (using a Win32 compiler) as a Win32 .EXE image. The Wine binary is simpler to invoke from the U**x command line or from a GUI such as KDE, however it is not possible to invoke a second shell using the -"WCMD /C filename" syntax. Conversely a Win32 application can be invoked from a +"CMD /C filename" syntax. Conversely a Win32 application can be invoked from a Win32 GUI such as Program Manager but that needs starting under Wine first. diff --git a/programs/wcmd/Ru.rc b/programs/cmd/Ru.rc similarity index 100% rename from programs/wcmd/Ru.rc rename to programs/cmd/Ru.rc diff --git a/programs/wcmd/Si.rc b/programs/cmd/Si.rc similarity index 100% rename from programs/wcmd/Si.rc rename to programs/cmd/Si.rc diff --git a/programs/wcmd/Tr.rc b/programs/cmd/Tr.rc similarity index 100% rename from programs/wcmd/Tr.rc rename to programs/cmd/Tr.rc diff --git a/programs/wcmd/batch.c b/programs/cmd/batch.c similarity index 99% rename from programs/wcmd/batch.c rename to programs/cmd/batch.c index 50f648b5799..8beef16f1e5 100644 --- a/programs/wcmd/batch.c +++ b/programs/cmd/batch.c @@ -1,5 +1,5 @@ /* - * WCMD - Wine-compatible command line interface - batch interface. + * CMD - Wine-compatible command line interface - batch interface. * * Copyright (C) 1999 D A Pickles * diff --git a/programs/wcmd/builtins.c b/programs/cmd/builtins.c similarity index 99% rename from programs/wcmd/builtins.c rename to programs/cmd/builtins.c index cd41e99b1f4..3329a0bf837 100644 --- a/programs/wcmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1,5 +1,5 @@ /* - * WCMD - Wine-compatible command line interface - built-in functions. + * CMD - Wine-compatible command line interface - built-in functions. * * Copyright (C) 1999 D A Pickles * diff --git a/programs/wcmd/directory.c b/programs/cmd/directory.c similarity index 99% rename from programs/wcmd/directory.c rename to programs/cmd/directory.c index 31c7ea11b55..9a6b811060b 100644 --- a/programs/wcmd/directory.c +++ b/programs/cmd/directory.c @@ -1,5 +1,5 @@ /* - * WCMD - Wine-compatible command line interface - Directory functions. + * CMD - Wine-compatible command line interface - Directory functions. * * Copyright (C) 1999 D A Pickles * diff --git a/programs/wcmd/wcmd.h b/programs/cmd/wcmd.h similarity index 98% rename from programs/wcmd/wcmd.h rename to programs/cmd/wcmd.h index 73b929f48b6..de9d31723ed 100644 --- a/programs/wcmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -1,5 +1,5 @@ /* - * WCMD - Wine-compatible command line interface. + * CMD - Wine-compatible command line interface. * * Copyright (C) 1999 D A Pickles * diff --git a/programs/wcmd/wcmdmain.c b/programs/cmd/wcmdmain.c similarity index 99% rename from programs/wcmd/wcmdmain.c rename to programs/cmd/wcmdmain.c index c0e09a51358..e2fb45046ce 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1,5 +1,5 @@ /* - * WCMD - Wine-compatible command line interface. + * CMD - Wine-compatible command line interface. * * Copyright (C) 1999 - 2001 D A Pickles * @@ -40,7 +40,7 @@ int echo_mode = 1, verify_mode = 0; static int opt_c, opt_k, opt_s; const char nyi[] = "Not Yet Implemented\n\n"; const char newline[] = "\n"; -const char version_string[] = "WCMD Version " PACKAGE_VERSION "\n\n"; +const char version_string[] = "CMD Version " PACKAGE_VERSION "\n\n"; const char anykey[] = "Press Return key to continue: "; char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; BATCH_CONTEXT *context = NULL; @@ -973,7 +973,7 @@ char *p; char temp_path[MAX_PATH], temp_file[MAX_PATH], temp_file2[MAX_PATH], temp_cmd[1024]; GetTempPath (sizeof(temp_path), temp_path); - GetTempFileName (temp_path, "WCMD", 0, temp_file); + GetTempFileName (temp_path, "CMD", 0, temp_file); p = strchr(command, '|'); *p++ = '\0'; wsprintf (temp_cmd, "%s > %s", command, temp_file); @@ -981,7 +981,7 @@ char temp_path[MAX_PATH], temp_file[MAX_PATH], temp_file2[MAX_PATH], temp_cmd[10 command = p; while ((p = strchr(command, '|'))) { *p++ = '\0'; - GetTempFileName (temp_path, "WCMD", 0, temp_file2); + GetTempFileName (temp_path, "CMD", 0, temp_file2); wsprintf (temp_cmd, "%s < %s > %s", command, temp_file, temp_file2); WCMD_process_command (temp_cmd); DeleteFile (temp_file); diff --git a/programs/wcmd/wcmdrc.rc b/programs/cmd/wcmdrc.rc similarity index 100% rename from programs/wcmd/wcmdrc.rc rename to programs/cmd/wcmdrc.rc diff --git a/programs/make_progs b/programs/make_progs index 10edb18468b..e8cda3b1cb9 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -33,7 +33,6 @@ my %bin_install = "regedit" => 1, "regsvr32" => 1, "uninstaller" => 1, - "wcmd" => 1, "wineboot" => 1, "winebrowser" => 1, "winecfg" => 1, @@ -72,13 +71,13 @@ sub update_file($) if (! -f "configure.ac" && -f "../configure.ac") { chdir(".."); } my @args = @ARGV; -if (!@args) { @args = split /\s/, `find programs -name Makefile.in -print`; } +if (!@args) { @args = map { s/^(.*)\.in/$1/; $_; } split(/\s/,`find programs -name Makefile.in -print`); } foreach my $i (@args) { my $module; - open MAKE,$i; + open MAKE, "$i.in" or die "cannot open $i.in\n"; $module = undef; while () diff --git a/tools/wine.inf b/tools/wine.inf index 9d00b77824b..24bf5c456d1 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -226,7 +226,7 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll" [Environment] -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\wcmd.exe" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\cmd.exe" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",2,"%11%;%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%" @@ -2124,7 +2124,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wintrust.dll,1 [FakeDllsSection] -11,,explorer.exe 10,,notepad.exe 10,,regedit.exe 10,,rundll32.exe @@ -2133,6 +2132,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,command,start.exe 11,,advapi32.dll 11,,advpack.dll +11,,cmd.exe 11,,comctl32.dll 11,,comdlg32.dll 11,,control.exe @@ -2140,6 +2140,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,d3d8.dll 11,,dbghelp.dll 11,,ddraw.dll +11,,explorer.exe 11,,gdi32.dll 11,,hhctrl.ocx 11,,imaadp32.acm @@ -2152,10 +2153,10 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msvcrt.dll 11,,notepad.exe 11,,ntdll.dll -11,,opengl32.dll 11,,ole32.dll 11,,oleaut32.dll 11,,olepro32.dll +11,,opengl32.dll 11,,progman.exe 11,,regsvr32.exe 11,,riched20.dll @@ -2168,7 +2169,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,urlmon.dll 11,,user32.dll 11,,version.dll -11,,wcmd.exe 11,,wininet.dll 11,,winmm.dll 11,,winspool.drv