Module: wine Branch: master Commit: 4c3c2b121e09efa83eafcd33289f4ccae7b191b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3c2b121e09efa83eafcd3328...
Author: Frédéric Delanoy frederic.delanoy@gmail.com Date: Fri Sep 9 01:48:04 2011 +0200
cmd: Backup echo mode before running external batch file.
---
programs/cmd/wcmdmain.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 117565b..108d411 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1228,7 +1228,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, CMD_LIST **cmdList) { WCHAR *cmd, *p, *redir; - int status, i; + int status, i, prev_echo_mode; DWORD count, creationDisposition; HANDLE h; WCHAR *whichcmd; @@ -1581,7 +1581,9 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_exit (cmdList); break; default: + prev_echo_mode = echo_mode; WCMD_run_program (whichcmd, 0); + echo_mode = prev_echo_mode; } HeapFree( GetProcessHeap(), 0, cmd ); HeapFree( GetProcessHeap(), 0, new_redir ); @@ -1594,6 +1596,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, } } } + /************************************************************************* * WCMD_LoadMessage * Load a string from the resource file, handling any error