Rebase against e918c6fd8b426e8298eca5951d917960e4236d95.

This commit is contained in:
Sebastian Lackner
2017-03-03 05:40:34 +01:00
parent 04a8307d45
commit 88c85f01c3
6 changed files with 22 additions and 86 deletions

View File

@@ -1,4 +1,4 @@
From edebe1491e64c5bbb8a148486233bdee9fbfcd59 Mon Sep 17 00:00:00 2001
From 02bef2f484ca326c8e99db32f0882cefe886fb4b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 6 Jun 2015 07:03:33 +0800
Subject: ntdll: Improve stub of NtQueryEaFile.
@@ -10,7 +10,7 @@ Based on a patch by Qian Hong.
2 files changed, 98 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index fc72833e1a4..210c8e385d9 100644
index cfc85e5dd05..b3f4f234107 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3397,14 +3397,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
@@ -44,19 +44,19 @@ index fc72833e1a4..210c8e385d9 100644
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 0c056ce4e28..c523bcfe0ab 100644
index dd8830c9ce1..ba28782107d 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -80,6 +80,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV
PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN);
@@ -81,6 +81,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV
static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS);
static NTSTATUS (WINAPI *pNtQueryFullAttributesFile)(const OBJECT_ATTRIBUTES*, FILE_NETWORK_OPEN_INFORMATION*);
static NTSTATUS (WINAPI *pNtFlushBuffersFile)(HANDLE, IO_STATUS_BLOCK*);
+static NTSTATUS (WINAPI *pNtQueryEaFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PULONG,BOOLEAN);
static inline BOOL is_signaled( HANDLE obj )
{
@@ -4413,6 +4414,86 @@ static void test_ioctl(void)
CloseHandle(file);
@@ -4453,6 +4454,86 @@ static void test_flush_buffers_file(void)
DeleteFileA(buffer);
}
+static void test_query_ea(void)
@@ -142,18 +142,18 @@ index 0c056ce4e28..c523bcfe0ab 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4450,6 +4531,7 @@ START_TEST(file)
pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile");
@@ -4491,6 +4572,7 @@ START_TEST(file)
pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile");
pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile");
+ pNtQueryEaFile = (void *)GetProcAddress(hntdll, "NtQueryEaFile");
test_read_write();
test_NtCreateFile();
@@ -4474,4 +4556,5 @@ START_TEST(file)
test_query_volume_information_file();
@@ -4516,4 +4598,5 @@ START_TEST(file)
test_query_attribute_information_file();
test_ioctl();
test_flush_buffers_file();
+ test_query_ea();
}
--