From 3f86dff407f1f1b3c622186b537cd5b5cc61163b Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 15 Nov 2024 11:13:11 +1100 Subject: [PATCH] Rebase against ab40b7fd8686345bf77a27ceb12d4dfbaa753829. --- ...-support-for-creating-reparse-points.patch | 28 +++++++++---------- staging/upstream-commit | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch index 697f2cb8..eaa5a30e 100644 --- a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch +++ b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch @@ -1,4 +1,4 @@ -From bdbc1c90697424373a5248cf6c2bda589785bd37 Mon Sep 17 00:00:00 2001 +From a6d2b52c9461723c39982237512d29de0154b5ff Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 16 Jan 2014 20:56:49 -0700 Subject: [PATCH] ntdll: Add support for creating reparse points. @@ -13,10 +13,10 @@ Signed-off-by: Erich E. Hoover 5 files changed, 451 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac -index d380c66ff40..4314be5553c 100644 +index 3bde1e448be..52537e7056c 100644 --- a/configure.ac +++ b/configure.ac -@@ -2078,6 +2078,8 @@ AC_CHECK_FUNCS(\ +@@ -2081,6 +2081,8 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ sched_yield \ @@ -39,7 +39,7 @@ index 37bd6c86e31..f9a15d28ed2 100644 EXTRADLLFLAGS = -nodefaultlibs i386_EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c -index 7d3618a3804..148b6058cee 100644 +index 95bd1c37cac..25cac61317b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -38,6 +38,7 @@ @@ -50,7 +50,7 @@ index 7d3618a3804..148b6058cee 100644 #ifndef IO_COMPLETION_ALL_ACCESS #define IO_COMPLETION_ALL_ACCESS 0x001F0003 -@@ -5863,32 +5864,154 @@ static void test_mailslot_name(void) +@@ -5906,32 +5907,154 @@ static void test_mailslot_name(void) CloseHandle( device ); } @@ -221,8 +221,8 @@ index 7d3618a3804..148b6058cee 100644 + RemoveDirectoryW(path); } - START_TEST(file) -@@ -5969,6 +6092,6 @@ START_TEST(file) + static void test_set_io_completion_ex(void) +@@ -6071,6 +6194,6 @@ START_TEST(file) test_ioctl(); test_query_ea(); test_flush_buffers_file(); @@ -231,7 +231,7 @@ index 7d3618a3804..148b6058cee 100644 + test_mailslot_name(); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c -index ca95dd347eb..ac4de149455 100644 +index 9da53339ff0..34121c7d08a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -36,6 +36,8 @@ @@ -243,7 +243,7 @@ index ca95dd347eb..ac4de149455 100644 #include #include #ifdef HAVE_MNTENT_H -@@ -124,6 +126,7 @@ +@@ -121,6 +123,7 @@ #include "wine/list.h" #include "wine/debug.h" #include "unix_private.h" @@ -251,7 +251,7 @@ index ca95dd347eb..ac4de149455 100644 WINE_DEFAULT_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(winediag); -@@ -135,6 +138,12 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); +@@ -132,6 +135,12 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #undef EXT2_IOC_GETFLAGS #undef EXT4_CASEFOLD_FL @@ -264,7 +264,7 @@ index ca95dd347eb..ac4de149455 100644 #ifdef linux /* We want the real kernel dirent structure, not the libc one */ -@@ -246,6 +255,95 @@ static const BOOL is_case_sensitive = FALSE; +@@ -243,6 +252,95 @@ static const BOOL is_case_sensitive = FALSE; static pthread_mutex_t dir_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t mnt_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -360,7 +360,7 @@ index ca95dd347eb..ac4de149455 100644 /* check if a given Unicode char is OK in a DOS short name */ static inline BOOL is_invalid_dos_char( WCHAR ch ) { -@@ -1644,6 +1742,28 @@ static int parse_samba_dos_attrib_data( char *data, int len ) +@@ -1641,6 +1739,28 @@ static int parse_samba_dos_attrib_data( char *data, int len ) } @@ -389,7 +389,7 @@ index ca95dd347eb..ac4de149455 100644 static BOOL fd_is_mount_point( int fd, const struct stat *st ) { struct stat parent; -@@ -3418,6 +3538,181 @@ done: +@@ -3415,6 +3535,181 @@ done: } @@ -571,7 +571,7 @@ index ca95dd347eb..ac4de149455 100644 /****************************************************************************** * lookup_unix_name * -@@ -6249,6 +6544,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap +@@ -6250,6 +6545,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap break; } diff --git a/staging/upstream-commit b/staging/upstream-commit index 2eb76d64..a937908c 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -6303163af0c8e1c245e45fe2efea8f664431d26c +ab40b7fd8686345bf77a27ceb12d4dfbaa753829