Doug Lyons : msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 5be7fa7879b189613fae30a02c797baf76e1a86c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5be7fa7879b189613fae30a02...

Author: Doug Lyons 
Date:   Thu Nov 11 17:32:45 2021 -0500

msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51647
Signed-off-by: Doug Lyons 
Signed-off-by: Thomas Faber 
Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit 5a514d3f45472ce1a169f33d14cdcfb07c51441e)
Signed-off-by: Michael Stefaniuc

---

dlls/msvcrt/file.c   | 5 ++---
 dlls/msvcrt/msvcrt.h | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 36b1d637a27..55c79553103 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -519,7 +519,7 @@ static int msvcrt_init_fp(FILE* file, int fd, unsigned stream_flags)
  *      04      char    file flags (wxflag): repeated for each fd
  *      4+NBFD  HANDLE  file handle: repeated for each fd
  */
-unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block)
+BOOL msvcrt_create_io_inherit_block(WORD *size, BYTE **block)
 {
   int         fd, last_fd;
   char*       wxflag_ptr;
@@ -545,7 +545,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block)
   for (fd = 0; fd < last_fd; fd++)
   {
     /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */
-    fdinfo = get_ioinfo(fd);
+    fdinfo = get_ioinfo_nolock(fd);
     if ((fdinfo->wxflag & (WX_OPEN | WX_DONTINHERIT)) == WX_OPEN)
     {
       *wxflag_ptr = fdinfo->wxflag;
@@ -556,7 +556,6 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block)
       *wxflag_ptr = 0;
       *handle_ptr = INVALID_HANDLE_VALUE;
     }
-    release_ioinfo(fdinfo);
     wxflag_ptr++; handle_ptr++;
   } 
   return TRUE;
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index c360943b1f0..adb9248baf0 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -247,7 +247,7 @@ extern void msvcrt_free_scheduler(void) DECLSPEC_HIDDEN;
 extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN;
 #endif

-extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN;
+extern BOOL msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN;

/* run-time error codes */
 #define _RT_STACK       0