Rebase against 6dd6c76299f02a311e37d20a4cef3a0f917f7076.

[ntdll-FileNamesInformation]
Removed patch to implement FileNamesInformation class support for
NtQueryDirectoryFile (fixed upstream).
This commit is contained in:
Sebastian Lackner
2016-05-06 00:46:55 +02:00
parent 96068c4fe2
commit cecff04cad
7 changed files with 76 additions and 120 deletions

View File

@@ -1,4 +1,4 @@
From 2c7eba8922e51d745c46b19971e0e8764a4052b5 Mon Sep 17 00:00:00 2001
From a39228203e7fd6d24ac9cae794fc4903e2d67ad7 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 4 Jun 2015 00:02:13 +0200
Subject: ntdll: Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe
@@ -10,10 +10,10 @@ Subject: ntdll: Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 3b0a06c..62033e1 100644
index c1f5a7a..00b3ccd 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -2893,8 +2893,12 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io,
@@ -2625,8 +2625,12 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io,
if (!server_get_unix_fd( hFile, FILE_READ_DATA, &fd, &needs_close, NULL, NULL ))
{
@@ -28,12 +28,12 @@ index 3b0a06c..62033e1 100644
}
}
diff --git a/include/winternl.h b/include/winternl.h
index 28b9e29..88bcdab 100644
index 0489395..41abff8 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -668,6 +668,11 @@ typedef struct _FILE_PIPE_LOCAL_INFORMATION {
ULONG NamedPipeEnd;
} FILE_PIPE_LOCAL_INFORMATION, *PFILE_PIPE_LOCAL_INFORMATION;
@@ -713,6 +713,11 @@ typedef struct _FILE_REPARSE_POINT_INFORMATION {
ULONG Tag;
} FILE_REPARSE_POINT_INFORMATION, *PFILE_REPARSE_POINT_INFORMATION;
+#define FILE_PIPE_DISCONNECTED_STATE 0x01
+#define FILE_PIPE_LISTENING_STATE 0x02
@@ -44,5 +44,5 @@ index 28b9e29..88bcdab 100644
FILE_BASIC_INFORMATION BasicInformation;
FILE_STANDARD_INFORMATION StandardInformation;
--
2.4.2
2.8.0