wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 0cb79db12ac7c48477518dcff269ccc5d6b745e0

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch
View File

@@ -1,16 +1,16 @@
From 524983ccd0ecbca845c0d54688b64e729fff9ed3 Mon Sep 17 00:00:00 2001
From b68ba9df8489f913125e1aaaaf1203986f1ff346 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Thu, 16 Jan 2014 20:56:49 -0700
Subject: [PATCH] ntdll: Add support for junction point creation.
---
dlls/ntdll/file.c | 91 +++++++++++++++++++++++++++++++++++++++
dlls/ntdll/tests/file.c | 94 +++++++++++++++++++++++++++++++++++++++++
include/ddk/ntifs.h | 26 ++++++++++++
dlls/ntdll/file.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++
dlls/ntdll/tests/file.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++
include/ddk/ntifs.h | 26 ++++++++++++++
3 files changed, 211 insertions(+)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 1a935430..7e5ab211 100644
index c1de955..c1075cf 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -108,12 +108,14 @@
@@ -28,7 +28,7 @@ index 1a935430..7e5ab211 100644
#define SECSPERDAY 86400
#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY)
@@ -1645,6 +1647,76 @@ NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE handle, HANDLE event,
@@ -1746,6 +1748,76 @@ NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE handle, HANDLE event,
}
@@ -105,7 +105,7 @@ index 1a935430..7e5ab211 100644
/**************************************************************************
* NtFsControlFile [NTDLL.@]
* ZwFsControlFile [NTDLL.@]
@@ -1724,11 +1796,30 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc
@@ -1825,11 +1897,30 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc
}
break;
}
@@ -137,7 +137,7 @@ index 1a935430..7e5ab211 100644
return server_ioctl_file( handle, event, apc, apc_context, io, code,
in_buffer, in_size, out_buffer, out_size );
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 45c8ef0f..167463dc 100644
index 74adf4c..ed3ddea 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -38,6 +38,7 @@
@@ -148,7 +148,7 @@ index 45c8ef0f..167463dc 100644
#ifndef IO_COMPLETION_ALL_ACCESS
#define IO_COMPLETION_ALL_ACCESS 0x001F0003
@@ -4767,6 +4768,98 @@ static void test_query_ea(void)
@@ -4982,6 +4983,98 @@ static void test_query_ea(void)
#undef EA_BUFFER_SIZE
}
@@ -244,17 +244,17 @@ index 45c8ef0f..167463dc 100644
+ RemoveDirectoryW(path);
+}
+
START_TEST(file)
static void test_file_readonly_access(void)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4837,4 +4930,5 @@ START_TEST(file)
static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
@@ -5122,4 +5215,5 @@ START_TEST(file)
test_ioctl();
test_flush_buffers_file();
test_query_ea();
+ test_junction_points();
}
diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h
index abe357fb..3cba319d 100644
index abe357f..3cba319 100644
--- a/include/ddk/ntifs.h
+++ b/include/ddk/ntifs.h
@@ -133,4 +133,30 @@ BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN
@@ -289,5 +289,5 @@ index abe357fb..3cba319d 100644
+
#endif
--
2.20.1
1.9.1