Rebase against 0cb79db12ac7c48477518dcff269ccc5d6b745e0

This commit is contained in:
Alistair Leslie-Hughes
2019-04-12 09:17:34 +10:00
parent d0190e3ade
commit 8f56ffcf57
6 changed files with 25 additions and 446 deletions

View File

@@ -1,4 +1,4 @@
From 89af577ac4db5a48ed30bcf06703a2e7ef05fa7a Mon Sep 17 00:00:00 2001
From 7d5dfe000f83054692b919a07f60869bd350be83 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,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 a2cc839..4c7f1b2 100644
index 7c4eb91..c1de955 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3415,14 +3415,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
@@ -3426,14 +3426,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 a2cc839..4c7f1b2 100644
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 7554187..e9a0d79 100644
index 8f986f6..74adf4c 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
@@ -55,7 +55,7 @@ index 7554187..e9a0d79 100644
static WCHAR fooW[] = {'f','o','o',0};
@@ -4796,6 +4797,86 @@ static void test_flush_buffers_file(void)
@@ -4901,6 +4902,86 @@ static void test_flush_buffers_file(void)
DeleteFileA(buffer);
}
@@ -139,10 +139,10 @@ index 7554187..e9a0d79 100644
+ #undef EA_BUFFER_SIZE
+}
+
START_TEST(file)
static void test_file_readonly_access(void)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4836,6 +4917,7 @@ START_TEST(file)
static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
@@ -5009,6 +5090,7 @@ START_TEST(file)
pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile");
pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile");
@@ -150,7 +150,7 @@ index 7554187..e9a0d79 100644
test_read_write();
test_NtCreateFile();
@@ -4865,4 +4947,5 @@ START_TEST(file)
@@ -5039,4 +5121,5 @@ START_TEST(file)
test_query_attribute_information_file();
test_ioctl();
test_flush_buffers_file();