Rebase against 70b735760e2e89db11aa76ab3956ea0d1f6e40d4.

This commit is contained in:
Alistair Leslie-Hughes
2020-08-02 13:39:53 +10:00
parent 6ecb8df033
commit 23ae4e6c7a
11 changed files with 101 additions and 214 deletions

View File

@@ -1,4 +1,4 @@
From a010b05e656e6abc4c0b36f1e75902dbecb5dfdc Mon Sep 17 00:00:00 2001
From b38ef24ec2a84cf8ae1e3d1fcb12c249a0d9c512 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 6 Jun 2015 07:03:33 +0800
Subject: [PATCH] ntdll: Improve stub of NtQueryEaFile.
@@ -10,7 +10,7 @@ Based on a patch by Qian Hong.
2 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 6164b0c4bde..802d7ca71aa 100644
index decfaff638a..acba3540282 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -84,6 +84,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV
@@ -21,7 +21,7 @@ index 6164b0c4bde..802d7ca71aa 100644
static WCHAR fooW[] = {'f','o','o',0};
@@ -4904,6 +4905,86 @@ static void test_flush_buffers_file(void)
@@ -4990,6 +4991,86 @@ static void test_flush_buffers_file(void)
DeleteFileA(buffer);
}
@@ -108,7 +108,7 @@ index 6164b0c4bde..802d7ca71aa 100644
static void test_file_readonly_access(void)
{
static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
@@ -5012,6 +5093,7 @@ START_TEST(file)
@@ -5163,6 +5244,7 @@ START_TEST(file)
pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile");
pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile");
@@ -116,18 +116,19 @@ index 6164b0c4bde..802d7ca71aa 100644
test_read_write();
test_NtCreateFile();
@@ -5041,5 +5123,6 @@ START_TEST(file)
@@ -5192,6 +5274,7 @@ START_TEST(file)
test_query_volume_information_file();
test_query_attribute_information_file();
test_ioctl();
+ test_query_ea();
test_flush_buffers_file();
test_mailslot_name();
}
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 20eb6a05922..75e78a0d004 100644
index 350a42f4249..e54a010855f 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -6440,9 +6440,20 @@ NTSTATUS WINAPI NtQueryEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer,
@@ -6555,9 +6555,20 @@ NTSTATUS WINAPI NtQueryEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer,
BOOLEAN single_entry, void *list, ULONG list_len,
ULONG *index, BOOLEAN restart )
{