Updated ntdll-Junction_Points patchset

Changed dependencies to allow ntdll-Junction_Points to be applied
on top of wine.
This commit is contained in:
Alistair Leslie-Hughes
2019-04-23 10:42:19 +10:00
parent 9e53a45319
commit a0708adf42
26 changed files with 319 additions and 222 deletions

View File

@@ -1,4 +1,4 @@
From 7d5dfe000f83054692b919a07f60869bd350be83 Mon Sep 17 00:00:00 2001
From db086c104124f1e6d06c5a492823f5e99c9095fe 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 7c4eb91..c1de955 100644
index 956c98a..c529b70 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3426,14 +3426,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
@@ -3936,14 +3936,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,10 +44,10 @@ index 7c4eb91..c1de955 100644
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 8f986f6..74adf4c 100644
index a3513e2..79ba790 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
@@ -85,6 +85,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*);
@@ -55,7 +55,7 @@ index 8f986f6..74adf4c 100644
static WCHAR fooW[] = {'f','o','o',0};
@@ -4901,6 +4902,86 @@ static void test_flush_buffers_file(void)
@@ -4925,6 +4926,86 @@ static void test_flush_buffers_file(void)
DeleteFileA(buffer);
}
@@ -142,7 +142,7 @@ index 8f986f6..74adf4c 100644
static void test_file_readonly_access(void)
{
static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
@@ -5009,6 +5090,7 @@ START_TEST(file)
@@ -5376,6 +5457,7 @@ START_TEST(file)
pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile");
pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile");
@@ -150,11 +150,13 @@ index 8f986f6..74adf4c 100644
test_read_write();
test_NtCreateFile();
@@ -5039,4 +5121,5 @@ START_TEST(file)
@@ -5405,6 +5487,7 @@ START_TEST(file)
test_query_volume_information_file();
test_query_attribute_information_file();
test_ioctl();
test_flush_buffers_file();
+ test_query_ea();
test_flush_buffers_file();
test_reparse_points();
}
--
1.9.1

View File

@@ -1,2 +1,3 @@
Fixes: Improve stub for NtQueryEaFile
# Depends: ntdll-Syscall_Wrappers
Depends: ntdll-Junction_Points