From 4127a50f6bc7eb56b199d15e1be6f8db1593e0b6 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 7 Sep 2024 08:47:06 +1000 Subject: [PATCH] Rebase against 30c135fe8662e7bcbafaa187914f28fdf9c052ff. --- ...for-sys-eventfd.h-ppoll-and-shm_open.patch | 22 +++++++++---------- ...-support-for-creating-reparse-points.patch | 18 +++++++-------- staging/upstream-commit | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch b/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch index 4949a8d0..820e7514 100644 --- a/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch +++ b/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch @@ -1,4 +1,4 @@ -From d3262875b2ce7d2a6746f2139ca00e3d0f13fb33 Mon Sep 17 00:00:00 2001 +From 3b9e832890ad710eecf08f7901d708cfebb3520c Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 13 Jun 2018 10:44:49 -0500 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open(). @@ -12,10 +12,10 @@ Although perhaps we shouldn't since the server doesn't do this. 2 files changed, 17 insertions(+) diff --git a/configure.ac b/configure.ac -index 3be31e40cf6..0a2cdc0dfcd 100644 +index 4314be5553c..920d8343925 100644 --- a/configure.ac +++ b/configure.ac -@@ -453,6 +453,7 @@ AC_CHECK_HEADERS(\ +@@ -407,6 +407,7 @@ AC_CHECK_HEADERS(\ sys/cdio.h \ sys/epoll.h \ sys/event.h \ @@ -23,15 +23,15 @@ index 3be31e40cf6..0a2cdc0dfcd 100644 sys/extattr.h \ sys/filio.h \ sys/ipc.h \ -@@ -2024,6 +2025,7 @@ AC_CHECK_FUNCS(\ +@@ -2076,6 +2077,7 @@ AC_CHECK_FUNCS(\ port_create \ posix_fadvise \ posix_fallocate \ + ppoll \ prctl \ - proc_pidinfo \ sched_yield \ -@@ -2049,6 +2051,12 @@ case $host_os in + renameat \ +@@ -2100,6 +2102,12 @@ case $host_os in ;; esac @@ -45,10 +45,10 @@ index 3be31e40cf6..0a2cdc0dfcd 100644 AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#include ]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no])) diff --git a/include/config.h.in b/include/config.h.in -index fe2fc36a914..8e8c57d711c 100644 +index 096ecdf94ec..303fb7f2b69 100644 --- a/include/config.h.in +++ b/include/config.h.in -@@ -309,6 +309,9 @@ +@@ -312,6 +312,9 @@ /* Define to 1 if you have the `posix_fallocate' function. */ #undef HAVE_POSIX_FALLOCATE @@ -58,7 +58,7 @@ index fe2fc36a914..8e8c57d711c 100644 /* Define to 1 if you have the `prctl' function. */ #undef HAVE_PRCTL -@@ -375,6 +378,9 @@ +@@ -369,6 +372,9 @@ /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */ #undef HAVE_SG_IO_HDR_T_INTERFACE_ID @@ -68,7 +68,7 @@ index fe2fc36a914..8e8c57d711c 100644 /* Define to 1 if `si_fd' is a member of `siginfo_t'. */ #undef HAVE_SIGINFO_T_SI_FD -@@ -510,6 +516,9 @@ +@@ -498,6 +504,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_EPOLL_H @@ -79,5 +79,5 @@ index fe2fc36a914..8e8c57d711c 100644 #undef HAVE_SYS_EVENT_H -- -2.39.0 +2.45.2 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 26093ec3..697f2cb8 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 4bc218280bf7e0d697b2386ea2f71d5562bc8867 Mon Sep 17 00:00:00 2001 +From bdbc1c90697424373a5248cf6c2bda589785bd37 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,12 +13,12 @@ Signed-off-by: Erich E. Hoover 5 files changed, 451 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac -index 89bc831bb94..0138b5d3b9a 100644 +index d380c66ff40..4314be5553c 100644 --- a/configure.ac +++ b/configure.ac -@@ -2087,6 +2087,8 @@ AC_CHECK_FUNCS(\ +@@ -2078,6 +2078,8 @@ AC_CHECK_FUNCS(\ + posix_fallocate \ prctl \ - proc_pidinfo \ sched_yield \ + renameat \ + renameat2 \ @@ -26,7 +26,7 @@ index 89bc831bb94..0138b5d3b9a 100644 setprogname \ sigprocmask \ diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in -index e17e3f72b92..66cdf11423c 100644 +index 37bd6c86e31..f9a15d28ed2 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -4,7 +4,7 @@ UNIXLIB = ntdll.so @@ -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 b8fb4f19e13..c52377264fe 100644 +index ca95dd347eb..ac4de149455 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -36,6 +36,8 @@ @@ -389,7 +389,7 @@ index b8fb4f19e13..c52377264fe 100644 static BOOL fd_is_mount_point( int fd, const struct stat *st ) { struct stat parent; -@@ -3420,6 +3540,181 @@ done: +@@ -3418,6 +3538,181 @@ done: } @@ -571,7 +571,7 @@ index b8fb4f19e13..c52377264fe 100644 /****************************************************************************** * lookup_unix_name * -@@ -6266,6 +6561,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap +@@ -6249,6 +6544,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap break; } @@ -602,5 +602,5 @@ index 980235abdc9..90248b4897c 100644 { UCHAR DataBuffer[1]; -- -2.43.0 +2.45.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index b92ea674..7a3a6b82 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -8d2977ec12e234880199bc07daf49870d0aa64ec +30c135fe8662e7bcbafaa187914f28fdf9c052ff