[PATCH v2 2/2] kernelbase: Create std handles from passed pseudo-console.

[Eric Pouech]

From: Eric Pouech

Partial fix for
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58967

Signed-off-by: Eric Pouech 
---
 dlls/kernel32/tests/process.c |  9 ---------
 dlls/kernelbase/console.c     |  7 +++++++
 dlls/kernelbase/process.c     | 12 ++++++++++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 51733bc5f5d..56b152a7f31 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -3669,25 +3669,16 @@ static void test_StdHandleInheritance(void)
             {
                 unsigned startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_INVALID : std_tests[i].expected;

-                todo_wine_if(j == 4 && (i == 2 || i == 4 || i == 6 || i == 10 || i == 12 || i == 14 || i == 16 || i == 18))
-                {
                 okChildHexInt("StartupInfoA", "hStdInputEncode", startup_expected, std_tests[i].is_broken);
                 okChildHexInt("StartupInfoA", "hStdOutputEncode", startup_expected, std_tests[i].is_broken);
-                }

startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_UNTOUCHED : std_tests[i].expected;

-                todo_wine_if(j == 4 && (i == 2 || i == 4 || i == 6 || i == 10 || i == 12 || i == 14 || i == 16 || i == 18))
-                {
                 okChildHexInt("StartupInfoW", "hStdInputEncode", startup_expected, std_tests[i].is_broken);
                 okChildHexInt("StartupInfoW", "hStdOutputEncode", startup_expected, std_tests[i].is_broken);
-                }

-                todo_wine_if(j == 4 && (i == 2 || i == 4 || i == 6 || (i >= 10 && i <= 19)))
-                {
                 okChildHexInt("TEB", "hStdInputEncode", std_tests[i].expected, std_tests[i].is_broken);
                 okChildHexInt("TEB", "hStdOutputEncode", std_tests[i].expected, std_tests[i].is_broken);
-                }
             }

release_memory();
diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c
index 83bec6c9878..4a0f96076b5 100644
--- a/dlls/kernelbase/console.c
+++ b/dlls/kernelbase/console.c
@@ -2390,5 +2390,12 @@ void init_console( void )
             alloc_console( no_window );
     }
     else if (params->ConsoleHandle && params->ConsoleHandle != CONSOLE_HANDLE_SHELL_NO_WINDOW)
+    {
         create_console_connection( params->ConsoleHandle );
+        if (params->ConsoleFlags & 2)
+        {
+            init_console_std_handles( FALSE );
+            params->ConsoleFlags &= ~2;
+        }
+    }
 }
diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index d89b2f1405a..92c9fd511d8 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -606,6 +606,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
                             TRACE( "PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE %p reference %p\n",
                                    console, console->reference );
                             params->ConsoleHandle = console->reference;
+                            if (!(flags & DETACHED_PROCESS))
+                            {
+                                params->ConsoleFlags |= 2;
+                                /* don't inherit standard handles bound to parent console (but inherit the others) */
+                                if (!(startup_info->dwFlags & STARTF_USESTDHANDLES))
+                                {
+                                    DWORD mode;
+                                    if (GetConsoleMode(params->hStdInput, &mode))  params->hStdInput = NULL;
+                                    if (GetConsoleMode(params->hStdOutput, &mode)) params->hStdOutput = NULL;
+                                    if (GetConsoleMode(params->hStdError, &mode))  params->hStdError = NULL;
+                                }
+                            }
                             break;
                         }
                     case PROC_THREAD_ATTRIBUTE_JOB_LIST: