Rebase against e918c6fd8b426e8298eca5951d917960e4236d95.

This commit is contained in:
Sebastian Lackner
2017-03-03 05:40:34 +01:00
parent 04a8307d45
commit 88c85f01c3
6 changed files with 22 additions and 86 deletions

View File

@@ -1,4 +1,4 @@
From 7c4549646538a8643b4b269af12691a49cbf59be Mon Sep 17 00:00:00 2001
From 1b04ab2a2725ab5f5f4afafbc4c0ea05b15368af 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,7 +12,7 @@ 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 210c8e385d9..79a85044fb8 100644
index b3f4f234107..51a623d1eea 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -108,12 +108,14 @@
@@ -139,7 +139,7 @@ index 210c8e385d9..79a85044fb8 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 c523bcfe0ab..08150850c76 100644
index ba28782107d..07328b62414 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -37,6 +37,7 @@
@@ -150,7 +150,7 @@ index c523bcfe0ab..08150850c76 100644
#ifndef IO_COMPLETION_ALL_ACCESS
#define IO_COMPLETION_ALL_ACCESS 0x001F0003
@@ -4494,6 +4495,98 @@ static void test_query_ea(void)
@@ -4534,6 +4535,98 @@ static void test_query_ea(void)
#undef EA_BUFFER_SIZE
}
@@ -249,17 +249,17 @@ index c523bcfe0ab..08150850c76 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4557,4 +4650,5 @@ START_TEST(file)
test_query_attribute_information_file();
@@ -4599,4 +4692,5 @@ START_TEST(file)
test_ioctl();
test_flush_buffers_file();
test_query_ea();
+ test_junction_points();
}
diff --git a/include/Makefile.in b/include/Makefile.in
index 80fa362a160..c4bf4b21ad4 100644
index 4fbfd16bf58..7d64aafcab3 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -521,6 +521,7 @@ HEADER_SRCS = \
@@ -522,6 +522,7 @@ HEADER_SRCS = \
ntddstor.h \
ntdef.h \
ntdsapi.h \