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 8b9f1e12841298591387e2b7590191610a37986e.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-09-04 08:24:36 +10:00
parent 4b48df5032
commit f3b03ce5a1
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From deebd97b531b74f34fd30ab5ef699812c5be1fe1 Mon Sep 17 00:00:00 2001
From 0d7dd662276c859955251d2cbeef0d60195d6574 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,12 +14,12 @@ 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 24bcc7448d2..f80fbd737ef 100644
index 855f0848eec..41ab0c1d8e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2215,6 +2215,8 @@ AC_CHECK_FUNCS(\
prctl \
proc_pidinfo \
pwrite \
readlink \
+ renameat \
+ renameat2 \
@@ -152,7 +152,7 @@ index 46037546e6e..7a01e947e13 100644
test_mailslot_name();
}
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 4e18e229b1a..f6c23f629b8 100644
index 38c03d114ed..683bd67385d 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -36,6 +36,7 @@
@@ -171,7 +171,7 @@ index 4e18e229b1a..f6c23f629b8 100644
WINE_DEFAULT_DEBUG_CHANNEL(file);
WINE_DECLARE_DEBUG_CHANNEL(winediag);
@@ -153,6 +155,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
@@ -150,6 +152,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
#undef EXT2_IOC_GETFLAGS
#undef EXT4_CASEFOLD_FL
@@ -182,7 +182,7 @@ index 4e18e229b1a..f6c23f629b8 100644
#ifdef linux
/* We want the real kernel dirent structure, not the libc one */
@@ -477,6 +483,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
@@ -474,6 +480,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
#endif
}
@@ -215,7 +215,7 @@ index 4e18e229b1a..f6c23f629b8 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 )
{
@@ -5942,6 +5974,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
@@ -5922,6 +5954,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
}
@@ -332,7 +332,7 @@ index 4e18e229b1a..f6c23f629b8 100644
/******************************************************************************
* NtFsControlFile (NTDLL.@)
*/
@@ -6024,6 +6166,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
@@ -6004,6 +6146,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
break;
}
@@ -357,10 +357,10 @@ index 4e18e229b1a..f6c23f629b8 100644
TRACE("FSCTL_SET_SPARSE: Ignoring request\n");
io->Information = 0;
diff --git a/include/Makefile.in b/include/Makefile.in
index 9b397ffa183..ee440a07a94 100644
index 43a4fd98a42..99cab5a18f6 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -543,6 +543,7 @@ SOURCES = \
@@ -545,6 +545,7 @@ SOURCES = \
ntdef.h \
ntdsapi.h \
ntgdi.h \
@@ -417,5 +417,5 @@ index 00000000000..21d42e17325
+
+#endif /* __WINE_NTIFS_H */
--
2.30.2
2.33.0