Rebase against 83e481fee20bc5c6598e65f8295be1b3f11fb70b

This commit is contained in:
Alistair Leslie-Hughes
2018-08-22 09:09:03 +10:00
parent 110a6f6016
commit 8cf0e5c285
11 changed files with 110 additions and 578 deletions

View File

@@ -1,42 +0,0 @@
From 652431398236beda32c5d3239451dbc46fbf1937 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 9 Apr 2017 02:01:25 +0200
Subject: ntdll: Do not require unix fd for
FileIoCompletionNotificationInformation.
---
dlls/ntdll/file.c | 3 ++-
dlls/ntdll/tests/pipe.c | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 4e6051a42d..5e21ecc662 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -2440,7 +2440,8 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io,
if (len < info_sizes[class])
return io->u.Status = STATUS_INFO_LENGTH_MISMATCH;
- if (class != FilePipeInformation && class != FilePipeLocalInformation)
+ if (class != FilePipeInformation && class != FilePipeLocalInformation &&
+ class != FileIoCompletionNotificationInformation)
{
if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL )))
{
diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c
index fa0ca2da00..013eb2b39f 100644
--- a/dlls/ntdll/tests/pipe.c
+++ b/dlls/ntdll/tests/pipe.c
@@ -380,9 +380,7 @@ static void test_completion(void)
info.Flags = 0;
status = pNtQueryInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- todo_wine
ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- todo_wine
ok((info.Flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS) != 0, "got %08x\n", info.Flags);
ret = WriteFile(client, buf, sizeof(buf), &num_bytes, &ov);
--
2.11.0