Rebase against f712a98d12d091c5437159a291857dfb9f0cea7c.

This commit is contained in:
Alistair Leslie-Hughes
2021-10-21 09:41:51 +11:00
parent 164b361be6
commit feb91195ff
31 changed files with 88 additions and 6498 deletions

View File

@@ -1,4 +1,4 @@
From 62fa6a8ef11039fa44cd668ab2fd9964741d5a2b Mon Sep 17 00:00:00 2001
From d823f033345ad18f5deea7530f1b3ad359616eb8 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,10 +14,10 @@ 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 9bf053ff39d..f7dc85cb13d 100644
index f030099941a..dbabb4d5a78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2160,6 +2160,8 @@ AC_CHECK_FUNCS(\
@@ -2060,6 +2060,8 @@ AC_CHECK_FUNCS(\
posix_fallocate \
prctl \
proc_pidinfo \
@@ -152,18 +152,18 @@ index 46037546e6e..7a01e947e13 100644
test_mailslot_name();
}
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 98fcc075c45..6ffa1473199 100644
index eb5c6846a10..9d371f57969 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -36,6 +36,7 @@
@@ -35,6 +35,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <libgen.h>
#include <limits.h>
#include <unistd.h>
#ifdef HAVE_MNTENT_H
#include <mntent.h>
@@ -139,6 +140,7 @@
@@ -135,6 +136,7 @@
#include "wine/list.h"
#include "wine/debug.h"
#include "unix_private.h"
@@ -171,7 +171,7 @@ index 98fcc075c45..6ffa1473199 100644
WINE_DEFAULT_DEBUG_CHANNEL(file);
WINE_DECLARE_DEBUG_CHANNEL(winediag);
@@ -150,6 +152,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
@@ -146,6 +148,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
#undef EXT2_IOC_GETFLAGS
#undef EXT4_CASEFOLD_FL
@@ -182,7 +182,7 @@ index 98fcc075c45..6ffa1473199 100644
#ifdef linux
/* We want the real kernel dirent structure, not the libc one */
@@ -474,6 +480,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
@@ -470,6 +476,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
#endif
}
@@ -215,7 +215,7 @@ index 98fcc075c45..6ffa1473199 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 )
{
@@ -5936,6 +5968,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
@@ -5932,6 +5964,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
}
@@ -332,7 +332,7 @@ index 98fcc075c45..6ffa1473199 100644
/******************************************************************************
* NtFsControlFile (NTDLL.@)
*/
@@ -6018,6 +6160,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
@@ -6014,6 +6156,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
break;
}
@@ -357,10 +357,10 @@ index 98fcc075c45..6ffa1473199 100644
TRACE("FSCTL_SET_SPARSE: Ignoring request\n");
io->Information = 0;
diff --git a/include/Makefile.in b/include/Makefile.in
index eac1c2e0570..25b00f9e52b 100644
index a9a478e5433..3d5c88c041e 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -546,6 +546,7 @@ SOURCES = \
@@ -548,6 +548,7 @@ SOURCES = \
ntdef.h \
ntdsapi.h \
ntgdi.h \