From: Akihiro Sagawa sagawa.aki@gmail.com
Based on patch by Eric Pouech. --- programs/cmd/batch.c | 5 +++-- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 456c221f20a..8bc3b5cb84b 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -206,7 +206,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, }
/**************************************************************************** - * WCMD_fgets + * WCMD_fgets_helper * * Gets one line from a file/console and puts it into buffer buf * Pre: buf has size noChars @@ -278,7 +278,8 @@ static WCHAR *WCMD_fgets_helper(WCHAR *buf, DWORD noChars, HANDLE h, UINT code_p
static UINT get_current_code_page(void) { - return GetOEMCP(); + UINT code_page = GetConsoleOutputCP(); + return code_page ? code_page : GetOEMCP(); }
WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 46d045f3eb0..ff6f944cffb 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -2123,7 +2123,7 @@ Success @todo_wine@Success ---- Testing nasty bits ---- ------------ Testing updated code page execution ------------ -@todo_wine@Success +Success ------------ Testing combined CALLs/GOTOs ------------ world cheball