Eric Pouech : msvcrt: Don't reset invalid std handle in init.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 233074ded08b326e8049102fdadd81a6187fa073
URL:    https://gitlab.winehq.org/wine/wine/-/commit/233074ded08b326e8049102fdadd81a...

Author: Eric Pouech 
Date:   Wed Nov 15 08:51:43 2023 +0100

msvcrt: Don't reset invalid std handle in init.

Signed-off-by: Eric Pouech

---

dlls/kernel32/tests/process.c |  8 ++++----
 dlls/msvcrt/file.c            | 12 +++++++-----
 dlls/msvcrt/tests/file.c      |  1 -
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index e329f28ac8b..21f1b3b96f6 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -3341,8 +3341,8 @@ static void test_StdHandleInheritance(void)
         {ARG_STD         |                  ARG_HANDLE_PROTECT | H_DISK,      HATTR_TYPE | HATTR_PROTECT | FILE_TYPE_DISK},

/* all others handles type behave as H_DISK */
-        {ARG_STARTUPINFO | ARG_CP_INHERIT |                      H_DISK,      HATTR_DANGLING, .is_todo = 24, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN},
-        {ARG_STD         | ARG_CP_INHERIT |                      H_DISK,      HATTR_DANGLING, .is_todo = 16},
+        {ARG_STARTUPINFO | ARG_CP_INHERIT |                      H_DISK,      HATTR_DANGLING, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN},
+        {ARG_STD         | ARG_CP_INHERIT |                      H_DISK,      HATTR_DANGLING},

/* all others handles type behave as H_DISK */
 /*10*/  {ARG_STARTUPINFO |                                       H_DEVIL,     HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN},
@@ -3369,8 +3369,8 @@ static void test_StdHandleInheritance(void)
         {ARG_STD         |                  ARG_HANDLE_INHERIT | H_DISK,      HATTR_NULL},

/* all others handles type behave as H_DISK */
-/*10*/  {ARG_STARTUPINFO | ARG_CP_INHERIT |                      H_DISK,      HATTR_DANGLING, .is_todo = 24},
-        {ARG_STD         | ARG_CP_INHERIT |                      H_DISK,      HATTR_DANGLING, .is_todo = 16},
+/*10*/  {ARG_STARTUPINFO | ARG_CP_INHERIT |                      H_DISK,      HATTR_DANGLING},
+        {ARG_STD         | ARG_CP_INHERIT |                      H_DISK,      HATTR_DANGLING},

/* all others handles type behave as H_DISK */
         {ARG_STARTUPINFO |                                       H_DISK,      HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN},
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 3c1d9572585..b4e80a4b5d0 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -560,12 +560,14 @@ static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag)
   ioinfo_set_unicode(fdinfo, FALSE);
   ioinfo_set_textmode(fdinfo, TEXTMODE_ANSI);

-  if (hand == MSVCRT_NO_CONSOLE) hand = 0;
-  switch (fdinfo-MSVCRT___pioinfo[0])
+  if (hand != MSVCRT_NO_CONSOLE)
   {
-  case 0: SetStdHandle(STD_INPUT_HANDLE,  hand); break;
-  case 1: SetStdHandle(STD_OUTPUT_HANDLE, hand); break;
-  case 2: SetStdHandle(STD_ERROR_HANDLE,  hand); break;
+    switch (fdinfo-MSVCRT___pioinfo[0])
+    {
+    case 0: SetStdHandle(STD_INPUT_HANDLE,  hand); break;
+    case 1: SetStdHandle(STD_OUTPUT_HANDLE, hand); break;
+    case 2: SetStdHandle(STD_ERROR_HANDLE,  hand); break;
+    }
   }
 }

diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c
index 9357b215cd8..1ac6cfe3182 100644
--- a/dlls/msvcrt/tests/file.c
+++ b/dlls/msvcrt/tests/file.c
@@ -1897,7 +1897,6 @@ static void test_invalid_stdin_child( void )
     ok(handle == (HANDLE)-2, "handle = %p\n", handle);
     ok(errno == 0xdeadbeef, "errno = %d\n", errno);
     handle = GetStdHandle(STD_INPUT_HANDLE);
-    todo_wine
     ok((LONG_PTR)handle > 0, "Expecting passed handle to be untouched\n");

info = &__pioinfo[STDIN_FILENO/MSVCRT_FD_BLOCK_SIZE][STDIN_FILENO%MSVCRT_FD_BLOCK_SIZE];