From: Paul Gofman <pgofman@codeweavers.com> --- dlls/msvcrt/file.c | 3 ++- dlls/msvcrt/tests/file.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 636e88d9f2f..841894fb9da 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -577,7 +577,7 @@ static void msvcrt_free_fd(int fd) static void msvcrt_set_fdinfo(ioinfo *fdinfo, HANDLE hand, int flag) { fdinfo->handle = hand; - fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_TTY)); + fdinfo->wxflag = WX_OPEN | flag; fdinfo->lookahead[0] = '\n'; fdinfo->lookahead[1] = '\n'; fdinfo->lookahead[2] = '\n'; @@ -587,6 +587,7 @@ static void msvcrt_set_fdinfo(ioinfo *fdinfo, HANDLE hand, int flag) static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag) { + flag &= ~(WX_ATEOF | WX_READNL); msvcrt_set_fdinfo(fdinfo, hand, flag); if (hand != MSVCRT_NO_CONSOLE) { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fc6db0ef07c..e65c910271b 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1944,8 +1944,6 @@ static void test_file_inherit( const char* selfname ) for (i = 1; i < 8; ++i) { mode = WX_OPEN | (1 << i); - if (mode & (WX_ATEOF | WX_READNL)) - continue; winetest_push_context("wxflags %#x", mode); handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11710