Rebase against 750d382f54e494771128c6b331122be2bc747484

This commit is contained in:
Paul Gofman
2019-12-13 02:37:28 +03:00
parent 2326756550
commit 45d69ec48b
4 changed files with 12 additions and 69 deletions

View File

@@ -1,20 +1,20 @@
From db086c104124f1e6d06c5a492823f5e99c9095fe Mon Sep 17 00:00:00 2001
From 1111d9a53405b19b57a4385f7e2815b9c62238fa 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.
Based on a patch by Qian Hong.
---
dlls/ntdll/file.c | 19 ++++++++---
dlls/ntdll/tests/file.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
dlls/ntdll/file.c | 19 ++++++++--
dlls/ntdll/tests/file.c | 83 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 98 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 956c98a..c529b70 100644
index 2269ae311a..bed55c6fe7 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3936,14 +3936,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
* Success: 0. Atrributes read into buffer
@@ -3962,14 +3962,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
* Success: 0. Attributes read into buffer
* Failure: An NTSTATUS error code describing the error.
*/
-NTSTATUS WINAPI NtQueryEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length,
@@ -44,7 +44,7 @@ index 956c98a..c529b70 100644
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index a3513e2..79ba790 100644
index 1c3d0bc9a9..e210cbe9f2 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -85,6 +85,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV
@@ -55,7 +55,7 @@ index a3513e2..79ba790 100644
static WCHAR fooW[] = {'f','o','o',0};
@@ -4925,6 +4926,86 @@ static void test_flush_buffers_file(void)
@@ -4994,6 +4995,86 @@ static void test_flush_buffers_file(void)
DeleteFileA(buffer);
}
@@ -142,7 +142,7 @@ index a3513e2..79ba790 100644
static void test_file_readonly_access(void)
{
static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
@@ -5376,6 +5457,7 @@ START_TEST(file)
@@ -5483,6 +5564,7 @@ START_TEST(file)
pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile");
pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile");
@@ -150,7 +150,7 @@ index a3513e2..79ba790 100644
test_read_write();
test_NtCreateFile();
@@ -5405,6 +5487,7 @@ START_TEST(file)
@@ -5513,6 +5595,7 @@ START_TEST(file)
test_query_volume_information_file();
test_query_attribute_information_file();
test_ioctl();
@@ -159,5 +159,5 @@ index a3513e2..79ba790 100644
test_reparse_points();
}
--
1.9.1
2.23.0