Rebase against 447924a6d68f7919bd451661314a52aa99cab709.

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

@@ -1,4 +1,4 @@
-From d81e8108c6c13eb865b9588eca19a777b6e22986 Mon Sep 17 00:00:00 2001
+From b5c84083ecc13c2911928a881b25d2924d8ca967 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.
@@ -14,20 +14,20 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  create mode 100644 include/ntifs.h
 
 diff --git a/configure.ac b/configure.ac
-index cf3df03cc9..ed2ebcd653 100644
+index fec43bcb194..10b6a2778c3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2210,6 +2210,8 @@ AC_CHECK_FUNCS(\
+@@ -2215,6 +2215,8 @@ AC_CHECK_FUNCS(\
+ 	proc_pidinfo \
  	pwrite \
- 	readdir \
  	readlink \
 +	renameat \
 +	renameat2 \
  	sched_yield \
- 	select \
  	setproctitle \
+ 	setprogname \
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 1492797b0c..10bdef5d81 100644
+index 8cfdb72ae97..6359c5bcd48 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
 @@ -38,6 +38,7 @@
@@ -38,7 +38,7 @@ index 1492797b0c..10bdef5d81 100644
  
  #ifndef IO_COMPLETION_ALL_ACCESS
  #define IO_COMPLETION_ALL_ACCESS 0x001F0003
-@@ -5141,6 +5142,105 @@ static void test_mailslot_name(void)
+@@ -5153,6 +5154,105 @@ static void test_mailslot_name(void)
      CloseHandle( device );
  }
  
@@ -144,7 +144,7 @@ index 1492797b0c..10bdef5d81 100644
  START_TEST(file)
  {
      HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
-@@ -5213,5 +5313,6 @@ START_TEST(file)
+@@ -5225,5 +5325,6 @@ START_TEST(file)
      test_ioctl();
      test_query_ea();
      test_flush_buffers_file();
@@ -152,7 +152,7 @@ index 1492797b0c..10bdef5d81 100644
      test_mailslot_name();
  }
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 290e18e54c..c0a3dee181 100644
+index 4d96a327f90..7390e7b9187 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
 @@ -36,6 +36,7 @@
@@ -163,7 +163,7 @@ index 290e18e54c..c0a3dee181 100644
  #include <limits.h>
  #ifdef HAVE_MNTENT_H
  #include <mntent.h>
-@@ -132,6 +133,7 @@
+@@ -139,6 +140,7 @@
  #include "wine/list.h"
  #include "wine/debug.h"
  #include "unix_private.h"
@@ -171,7 +171,7 @@ index 290e18e54c..c0a3dee181 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(file);
  WINE_DECLARE_DEBUG_CHANNEL(winediag);
-@@ -146,6 +148,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
+@@ -153,6 +155,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
  #undef EXT2_IOC_GETFLAGS
  #undef EXT4_CASEFOLD_FL
  
@@ -182,7 +182,7 @@ index 290e18e54c..c0a3dee181 100644
  #ifdef linux
  
  /* We want the real kernel dirent structure, not the libc one */
-@@ -457,6 +463,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
+@@ -467,6 +473,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
  #endif
  }
  
@@ -215,7 +215,7 @@ index 290e18e54c..c0a3dee181 100644
  /* get space from the current directory data buffer, allocating a new one if necessary */
  static void *get_dir_data_space( struct dir_data *data, unsigned int size )
  {
-@@ -5731,6 +5763,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
+@@ -5748,6 +5780,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
  }
  
  
@@ -332,7 +332,7 @@ index 290e18e54c..c0a3dee181 100644
  /******************************************************************************
   *              NtFsControlFile   (NTDLL.@)
   */
-@@ -5813,6 +5955,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
+@@ -5830,6 +5972,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
          break;
      }
  
@@ -357,10 +357,10 @@ index 290e18e54c..c0a3dee181 100644
          TRACE("FSCTL_SET_SPARSE: Ignoring request\n");
          io->Information = 0;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 91a02645c3..9345b75c00 100644
+index 468ee5edf47..8e8ffc26615 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -523,6 +523,7 @@ SOURCES = \
+@@ -531,6 +531,7 @@ SOURCES = \
  	ntddvdeo.h \
  	ntdef.h \
  	ntdsapi.h \
@@ -370,7 +370,7 @@ index 91a02645c3..9345b75c00 100644
  	ntsecapi.h \
 diff --git a/include/ntifs.h b/include/ntifs.h
 new file mode 100644
-index 0000000000..21d42e1732
+index 00000000000..21d42e17325
 --- /dev/null
 +++ b/include/ntifs.h
 @@ -0,0 +1,42 @@
@@ -417,5 +417,5 @@ index 0000000000..21d42e1732
 +
 +#endif /* __WINE_NTIFS_H */
 -- 
-2.28.0
+2.29.2