Piotr Caban : msvcrt: Fix close() behaviour on "no console" file descriptors.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 677301a29cffa9474fcad4c284661171092510d5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=677301a29cffa9474fcad4c284...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Wed Nov 15 09:47:29 2017 +0100

msvcrt: Fix close() behaviour on "no console" file descriptors.

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msvcrt/file.c       |  6 +++++-
 dlls/msvcrt/tests/file.c | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 2516570..422e95d 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -1047,7 +1047,11 @@ int CDECL MSVCRT__close(int fd)
   int ret;
 
   TRACE(":fd (%d) handle (%p)\n", fd, info->handle);
-  if (!(info->wxflag & WX_OPEN)) {
+
+  if (fd == MSVCRT_NO_CONSOLE_FD) {
+    *MSVCRT__errno() = MSVCRT_EBADF;
+    ret = -1;
+  } else if (!(info->wxflag & WX_OPEN)) {
     ret = -1;
   } else if (fd == MSVCRT_STDOUT_FILENO &&
           info->handle == get_ioinfo_nolock(MSVCRT_STDERR_FILENO)->handle) {
diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c
index e0b94cf..543eb3f 100644
--- a/dlls/msvcrt/tests/file.c
+++ b/dlls/msvcrt/tests/file.c
@@ -1527,6 +1527,7 @@ static void test_invalid_stdin_child( void )
 {
     HANDLE handle;
     ioinfo *info;
+    int ret;
 
     errno = 0xdeadbeef;
     handle = (HANDLE)_get_osfhandle(STDIN_FILENO);
@@ -1538,6 +1539,21 @@ static void test_invalid_stdin_child( void )
     ok(info->wxflag == 0xc1, "info->wxflag = %x\n", info->wxflag);
 
     ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file);
+
+    errno = 0xdeadbeef;
+    ret = fclose(stdin);
+    ok(ret == -1, "fclose(stdin) returned %d\n", ret);
+    ok(errno == EBADF, "errno = %d\n", errno);
+
+    errno = 0xdeadbeef;
+    ret = close(-2);
+    ok(ret == -1, "close(-2) returned %d\n", ret);
+    ok(errno == EBADF, "errno = %d\n", errno);
+
+    errno = 0xdeadbeef;
+    ret = close(STDIN_FILENO);
+    ok(ret==-1 || !ret, "close(STDIN_FILENO) returned %d\n", ret);
+    ok((ret==-1 && errno==EBADF) || (!ret && errno==0xdeadbeef), "errno = %d\n", errno);
 }
 
 static void test_invalid_stdin( const char* selfname )