Rebase against a2f2de1e960d37840bb0df541e31d64941e65197.

This commit is contained in:
Sebastian Lackner
2017-02-17 22:15:05 +01:00
parent 6057508b9b
commit 9c5d1ebec9
5 changed files with 31 additions and 116 deletions

View File

@@ -1,4 +1,4 @@
From c45a1755627f278008043315b5ef9a05b796cbec Mon Sep 17 00:00:00 2001
From 44eb9473fbeb5ce2feb0626286c99e8944d5f297 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,10 +10,10 @@ 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 14715b1..ae3219a 100644
index fc72833e1a4..210c8e385d9 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3367,14 +3367,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
@@ -3397,14 +3397,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
* Success: 0. Atrributes read into buffer
* Failure: An NTSTATUS error code describing the error.
*/
@@ -44,7 +44,7 @@ index 14715b1..ae3219a 100644
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index dfaf4a5..1dbaf30 100644
index 214c51a726a..5f9aab482f0 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -79,6 +79,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV
@@ -55,7 +55,7 @@ index dfaf4a5..1dbaf30 100644
static inline BOOL is_signaled( HANDLE obj )
{
@@ -4288,6 +4289,86 @@ static void test_read_write(void)
@@ -4388,6 +4389,86 @@ static void test_read_write(void)
CloseHandle(hfile);
}
@@ -142,7 +142,7 @@ index dfaf4a5..1dbaf30 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4324,6 +4405,7 @@ START_TEST(file)
@@ -4424,6 +4505,7 @@ START_TEST(file)
pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile");
pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile");
@@ -150,12 +150,12 @@ index dfaf4a5..1dbaf30 100644
test_read_write();
test_NtCreateFile();
@@ -4346,4 +4428,5 @@ START_TEST(file)
test_file_completion_information();
@@ -4447,4 +4529,5 @@ START_TEST(file)
test_file_id_information();
test_query_volume_information_file();
test_query_attribute_information_file();
+ test_query_ea();
}
--
2.9.0
2.11.0