Eric Pouech : cmd: Use the correct output handle in pipe command.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cec2fd60d2f72138a6749d6d89fd02c6efea18ea
URL:    https://gitlab.winehq.org/wine/wine/-/commit/cec2fd60d2f72138a6749d6d89fd02c...

Author: Eric Pouech 
Date:   Tue Jul  9 11:01:50 2024 +0200

cmd: Use the correct output handle in pipe command.

For commands like '(lhs_command | rhs_command) > foo' run
the rhs_command with the expected output handle.

Signed-off-by: Eric Pouech

---

programs/cmd/wcmdmain.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index b7aec31ee2f..72df7f2567c 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -3728,6 +3728,7 @@ RETURN_CODE node_execute(CMD_NODE *node)
             WCHAR temp_path[MAX_PATH];
             WCHAR filename[MAX_PATH];
             CMD_REDIRECTION *output;
+            HANDLE saved_output;

/* FIXME: a real pipe instead of writing to an intermediate file would be
              * better.
@@ -3742,6 +3743,7 @@ RETURN_CODE node_execute(CMD_NODE *node)
             GetTempFileNameW(temp_path, L"CMD", 0, filename);
             TRACE("Using temporary file of %ls\n", filename);

+            saved_output = GetStdHandle(STD_OUTPUT_HANDLE);
             /* set output for left hand side command */
             output = redirection_create_file(REDIR_WRITE_TO, 1, filename);
             if (set_std_redirections(output))
@@ -3750,7 +3752,7 @@ RETURN_CODE node_execute(CMD_NODE *node)
                 return_code = NO_ERROR;

CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE));
-                SetStdHandle(STD_OUTPUT_HANDLE, old_stdhandles[1]);
+                SetStdHandle(STD_OUTPUT_HANDLE, saved_output);

return_code = temp_fixup_return_code(node->left, return_code, NO_ERROR);
                 if (return_code == NO_ERROR)