wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 3d62cd26d1b988b373efae0b9c4a0a988985d45f.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-02-22 06:50:16 +01:00
parent dc52cbef3c
commit 2ae8a0be02
11 changed files with 141 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 9976a678df5baaa8722f5be1b49962de5bbad9bb Mon Sep 17 00:00:00 2001
From 7c4549646538a8643b4b269af12691a49cbf59be 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: ntdll: Add support for junction point creation.
@@ -12,10 +12,10 @@ Subject: ntdll: Add support for junction point creation.
create mode 100644 include/ntifs.h
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 93863ac..8c44514 100644
index 210c8e385d9..79a85044fb8 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -103,12 +103,14 @@
@@ -108,12 +108,14 @@
#include "winioctl.h"
#include "ddk/ntddk.h"
#include "ddk/ntddser.h"
@@ -30,7 +30,7 @@ index 93863ac..8c44514 100644
#define SECSPERDAY 86400
#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY)
@@ -1652,6 +1654,76 @@ NTSTATUS WINAPI SYSCALL(NtDeviceIoControlFile)(HANDLE handle, HANDLE event,
@@ -1671,6 +1673,76 @@ NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE handle, HANDLE event,
}
@@ -107,7 +107,7 @@ index 93863ac..8c44514 100644
/**************************************************************************
* NtFsControlFile [NTDLL.@]
* ZwFsControlFile [NTDLL.@]
@@ -1805,11 +1877,30 @@ NTSTATUS WINAPI SYSCALL(NtFsControlFile)(HANDLE handle, HANDLE event, PIO_APC_RO
@@ -1823,11 +1895,30 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc
}
break;
}
@@ -139,7 +139,7 @@ index 93863ac..8c44514 100644
default:
status = server_ioctl_file( handle, event, apc, apc_context, io, code,
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index fcbf8df..644065f 100644
index c523bcfe0ab..08150850c76 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -37,6 +37,7 @@
@@ -150,7 +150,7 @@ index fcbf8df..644065f 100644
#ifndef IO_COMPLETION_ALL_ACCESS
#define IO_COMPLETION_ALL_ACCESS 0x001F0003
@@ -4240,6 +4241,98 @@ static void test_query_ea(void)
@@ -4494,6 +4495,98 @@ static void test_query_ea(void)
#undef EA_BUFFER_SIZE
}
@@ -249,17 +249,17 @@ index fcbf8df..644065f 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4299,4 +4392,5 @@ START_TEST(file)
test_query_volume_information_file();
@@ -4557,4 +4650,5 @@ START_TEST(file)
test_query_attribute_information_file();
test_ioctl();
test_query_ea();
+ test_junction_points();
}
diff --git a/include/Makefile.in b/include/Makefile.in
index ac10691..03c3776 100644
index 80fa362a160..c4bf4b21ad4 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -508,6 +508,7 @@ HEADER_SRCS = \
@@ -521,6 +521,7 @@ HEADER_SRCS = \
ntddstor.h \
ntdef.h \
ntdsapi.h \
@@ -269,7 +269,7 @@ index ac10691..03c3776 100644
ntsecpkg.h \
diff --git a/include/ntifs.h b/include/ntifs.h
new file mode 100644
index 0000000..db07c28
index 00000000000..db07c28a5df
--- /dev/null
+++ b/include/ntifs.h
@@ -0,0 +1,52 @@
@@ -326,5 +326,5 @@ index 0000000..db07c28
+
+#endif /* __WINE_NTIFS_H */
--
2.7.1
2.11.0