diff --git a/patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch b/patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch index 18405b99..6e7619ac 100644 --- a/patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch +++ b/patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch @@ -1,4 +1,4 @@ -From 19ec5223ae49b6862ca6fc420a2c41f94befc0df Mon Sep 17 00:00:00 2001 +From bdc4be1fa3a5fca212eb8d146d114214399b9bd7 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 6 Jul 2020 12:09:22 -0500 Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores. @@ -16,17 +16,17 @@ Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores. create mode 100644 dlls/ntdll/unix/esync.h diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in -index b2f63d9f63a..5dc4ebb07fc 100644 +index 179d00b29ef..1de3490d4f0 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in -@@ -46,6 +46,7 @@ C_SRCS = \ +@@ -45,6 +45,7 @@ C_SRCS = \ unix/cdrom.c \ unix/debug.c \ unix/env.c \ + unix/esync.c \ unix/file.c \ unix/loader.c \ - unix/process.c \ + unix/loadorder.c \ diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c new file mode 100644 index 00000000000..7c409c7a9ca @@ -348,7 +348,7 @@ index 00000000000..a50a755149a + +extern int receive_fd( obj_handle_t *handle ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c -index c4f897f3d0d..0012d8d08af 100644 +index 20f614f59f1..afbb0e391f3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -89,6 +89,7 @@ @@ -359,7 +359,7 @@ index c4f897f3d0d..0012d8d08af 100644 #include "wine/list.h" #include "wine/debug.h" -@@ -1649,6 +1650,7 @@ static void start_main_thread(void) +@@ -1602,6 +1603,7 @@ static void start_main_thread(void) signal_init_thread( teb ); dbg_init(); startup_info_size = server_init_process(); @@ -368,7 +368,7 @@ index c4f897f3d0d..0012d8d08af 100644 init_cpu_info(); syscall_dispatcher = signal_init_syscalls(); diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c -index 6af8effe9e1..401d439b363 100644 +index 4f149c0f644..59f409ead8c 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -112,7 +112,7 @@ timeout_t server_start_time = 0; /* time of server startup */ @@ -380,7 +380,7 @@ index 6af8effe9e1..401d439b363 100644 /* atomically exchange a 64-bit value */ static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val ) -@@ -832,7 +832,7 @@ void CDECL wine_server_send_fd( int fd ) +@@ -835,7 +835,7 @@ void CDECL wine_server_send_fd( int fd ) * * Receive a file descriptor passed from the server. */ @@ -424,5 +424,5 @@ index a571855c70a..e41bbbf9349 100644 int do_esync(void) { -- -2.20.1 +2.30.1 diff --git a/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch b/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch index ba879117..d80f1729 100644 --- a/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch +++ b/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch @@ -1,4 +1,4 @@ -From b9815e86e026c431050253146177f5c624a28756 Mon Sep 17 00:00:00 2001 +From 5d866aebeeb7760eed0f35a206d43ef32bafbffe Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 5 Aug 2017 03:38:38 +0200 Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection / @@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection / 1 file changed, 34 insertions(+) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 67696f80db3..f25d8adc217 100644 +index b8f9dc28e63..444feb5d152 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -26,6 +26,7 @@ @@ -20,7 +20,7 @@ index 67696f80db3..f25d8adc217 100644 #include "wine/asm.h" #define DECLARE_CRITICAL_SECTION(cs) \ -@@ -96,6 +97,39 @@ extern int ntdll_wcstoumbs( const WCHAR* src, DWORD srclen, char* dst, DWORD dst +@@ -88,6 +89,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN; @@ -59,7 +59,7 @@ index 67696f80db3..f25d8adc217 100644 + /* load order */ - enum loadorder + #ifndef _WIN64 -- -2.30.0 +2.30.1 diff --git a/patches/ntdll-NtAlertThreadByThreadId/0009-ntdll-Reimplement-Win32-futexes-on-top-of-thread-ID-.patch b/patches/ntdll-NtAlertThreadByThreadId/0009-ntdll-Reimplement-Win32-futexes-on-top-of-thread-ID-.patch index 2aa6ed05..a4b5ca39 100644 --- a/patches/ntdll-NtAlertThreadByThreadId/0009-ntdll-Reimplement-Win32-futexes-on-top-of-thread-ID-.patch +++ b/patches/ntdll-NtAlertThreadByThreadId/0009-ntdll-Reimplement-Win32-futexes-on-top-of-thread-ID-.patch @@ -1,4 +1,4 @@ -From 3e0bb8dbe1b283b3af1becbc0d2d669e2706d16d Mon Sep 17 00:00:00 2001 +From 6f06e976d6775538cf323f04951d4c46ff599d98 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 2 Nov 2020 20:24:07 -0600 Subject: [PATCH] ntdll: Reimplement Win32 futexes on top of thread-ID alerts. @@ -14,7 +14,7 @@ Signed-off-by: Zebediah Figura 6 files changed, 187 insertions(+), 173 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 0ea8fdd2ce0..bb606fcdddd 100644 +index 29566c22f17..39bb0c1ff6f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -86,6 +86,8 @@ extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN; @@ -261,10 +261,10 @@ index 25496609f08..4f395336428 100644 } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c -index 3cc4a4ccccb..b2edf9ff710 100644 +index af04c1b2057..10de9ce307a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -1692,9 +1692,6 @@ static struct unix_funcs unix_funcs = +@@ -1552,9 +1552,6 @@ static struct unix_funcs unix_funcs = #endif DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, @@ -467,19 +467,19 @@ index 0fee8f3099d..d68dfbbf6af 100644 - mutex_unlock( &addr_mutex ); -} diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h -index 290379a9310..e84b6052378 100644 +index 71cc4177c06..7d5bfa8e249 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h -@@ -26,7 +26,7 @@ - struct _DISPATCHER_CONTEXT; +@@ -37,7 +37,7 @@ enum loadorder + }; /* increment this when you change the function table */ --#define NTDLL_UNIXLIB_VERSION 115 -+#define NTDLL_UNIXLIB_VERSION 116 +-#define NTDLL_UNIXLIB_VERSION 118 ++#define NTDLL_UNIXLIB_VERSION 119 struct unix_funcs { -@@ -38,10 +38,6 @@ struct unix_funcs +@@ -49,10 +49,6 @@ struct unix_funcs /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); diff --git a/patches/ntdll-NtAlertThreadByThreadId/0011-ntdll-Reimplement-the-critical-section-fast-path-on-.patch b/patches/ntdll-NtAlertThreadByThreadId/0011-ntdll-Reimplement-the-critical-section-fast-path-on-.patch index 35cae271..63dc90ef 100644 --- a/patches/ntdll-NtAlertThreadByThreadId/0011-ntdll-Reimplement-the-critical-section-fast-path-on-.patch +++ b/patches/ntdll-NtAlertThreadByThreadId/0011-ntdll-Reimplement-the-critical-section-fast-path-on-.patch @@ -1,4 +1,4 @@ -From aae4ecb64fea01acde1b44c95f063acd29f74a7e Mon Sep 17 00:00:00 2001 +From badd87317d22d40c86b646d03ca60e69a0258bb1 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 31 Aug 2020 23:38:09 -0500 Subject: [PATCH] ntdll: Reimplement the critical section fast path on top of @@ -83,10 +83,10 @@ index 09975ac3d45..97a5ce7fffa 100644 return ret; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c -index aff4594ab46..38a18d9c949 100644 +index 10de9ce307a..ef9f160dc00 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -1691,9 +1691,6 @@ static struct unix_funcs unix_funcs = +@@ -1552,9 +1552,6 @@ static struct unix_funcs unix_funcs = #endif DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, @@ -97,10 +97,10 @@ index aff4594ab46..38a18d9c949 100644 fast_RtlAcquireSRWLockExclusive, fast_RtlTryAcquireSRWLockShared, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c -index 41005425a90..6b97028fb68 100644 +index d68dfbbf6af..48bddbbcea3 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c -@@ -2409,115 +2409,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG +@@ -2465,115 +2465,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG } @@ -217,10 +217,10 @@ index 41005425a90..6b97028fb68 100644 /* Futex-based SRW lock implementation: diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h -index d056b1500c9..4033d8fee76 100644 +index d37dd001655..5458bf47374 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h -@@ -98,9 +98,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON +@@ -101,9 +101,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; @@ -231,19 +231,19 @@ index d056b1500c9..4033d8fee76 100644 extern NTSTATUS CDECL fast_RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h -index e84b6052378..f9c024d2e78 100644 +index 7d5bfa8e249..ad2f1760ebd 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h -@@ -26,7 +26,7 @@ - struct _DISPATCHER_CONTEXT; +@@ -37,7 +37,7 @@ enum loadorder + }; /* increment this when you change the function table */ --#define NTDLL_UNIXLIB_VERSION 116 -+#define NTDLL_UNIXLIB_VERSION 117 +-#define NTDLL_UNIXLIB_VERSION 119 ++#define NTDLL_UNIXLIB_VERSION 120 struct unix_funcs { -@@ -40,9 +40,6 @@ struct unix_funcs +@@ -51,9 +51,6 @@ struct unix_funcs LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); /* fast locks */ @@ -254,5 +254,5 @@ index e84b6052378..f9c024d2e78 100644 NTSTATUS (CDECL *fast_RtlAcquireSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlTryAcquireSRWLockShared)( RTL_SRWLOCK *lock ); -- -2.20.1 +2.30.1 diff --git a/patches/ntdll-NtAlertThreadByThreadId/0012-ntdll-Get-rid-of-the-direct-futex-path-for-condition.patch b/patches/ntdll-NtAlertThreadByThreadId/0012-ntdll-Get-rid-of-the-direct-futex-path-for-condition.patch index 8f7a5417..56f89f87 100644 --- a/patches/ntdll-NtAlertThreadByThreadId/0012-ntdll-Get-rid-of-the-direct-futex-path-for-condition.patch +++ b/patches/ntdll-NtAlertThreadByThreadId/0012-ntdll-Get-rid-of-the-direct-futex-path-for-condition.patch @@ -1,4 +1,4 @@ -From 2ab71fb4253f099683b9a9c8974643b505f001e1 Mon Sep 17 00:00:00 2001 +From 6c945e17dea09b64ecaf870a29c36cbfbc6507e4 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 31 Aug 2020 23:55:29 -0500 Subject: [PATCH] ntdll: Get rid of the direct futex path for condition @@ -80,10 +80,10 @@ index 97a5ce7fffa..1e6afc4cfc8 100644 if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c -index 38a18d9c949..58616212f15 100644 +index ef9f160dc00..96aa2142ebb 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -1697,8 +1697,6 @@ static struct unix_funcs unix_funcs = +@@ -1558,8 +1558,6 @@ static struct unix_funcs unix_funcs = fast_RtlAcquireSRWLockShared, fast_RtlReleaseSRWLockExclusive, fast_RtlReleaseSRWLockShared, @@ -93,10 +93,10 @@ index 38a18d9c949..58616212f15 100644 ntdll_ceil, ntdll_cos, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c -index 6b97028fb68..d4092438644 100644 +index 48bddbbcea3..c99fa004513 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c -@@ -166,23 +166,6 @@ static int *get_futex(void **ptr) +@@ -167,23 +167,6 @@ static int *get_futex(void **ptr) return NULL; } @@ -120,7 +120,7 @@ index 6b97028fb68..d4092438644 100644 #endif -@@ -2661,50 +2644,6 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) +@@ -2717,50 +2700,6 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) return STATUS_SUCCESS; } @@ -171,7 +171,7 @@ index 6b97028fb68..d4092438644 100644 #else NTSTATUS CDECL fast_RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) -@@ -2737,14 +2676,4 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) +@@ -2793,14 +2732,4 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) return STATUS_NOT_IMPLEMENTED; } @@ -187,10 +187,10 @@ index 6b97028fb68..d4092438644 100644 - #endif diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h -index 4033d8fee76..3ccb51e155c 100644 +index 5458bf47374..12f3efc9846 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h -@@ -104,10 +104,7 @@ extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLS +@@ -107,10 +107,7 @@ extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLS extern NTSTATUS CDECL fast_RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; @@ -202,19 +202,19 @@ index 4033d8fee76..3ccb51e155c 100644 extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h -index f9c024d2e78..ed9c6584939 100644 +index ad2f1760ebd..767234fc6d3 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h -@@ -26,7 +26,7 @@ - struct _DISPATCHER_CONTEXT; +@@ -37,7 +37,7 @@ enum loadorder + }; /* increment this when you change the function table */ --#define NTDLL_UNIXLIB_VERSION 117 -+#define NTDLL_UNIXLIB_VERSION 118 +-#define NTDLL_UNIXLIB_VERSION 120 ++#define NTDLL_UNIXLIB_VERSION 121 struct unix_funcs { -@@ -46,9 +46,6 @@ struct unix_funcs +@@ -57,9 +57,6 @@ struct unix_funcs NTSTATUS (CDECL *fast_RtlAcquireSRWLockShared)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlReleaseSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlReleaseSRWLockShared)( RTL_SRWLOCK *lock ); @@ -225,5 +225,5 @@ index f9c024d2e78..ed9c6584939 100644 /* math functions */ double (CDECL *atan)( double d ); -- -2.20.1 +2.30.1 diff --git a/patches/ntdll-NtAlertThreadByThreadId/0013-ntdll-Reimplement-SRW-locks-on-top-of-Win32-futexes.patch b/patches/ntdll-NtAlertThreadByThreadId/0013-ntdll-Reimplement-SRW-locks-on-top-of-Win32-futexes.patch index aa569fb3..381a0342 100644 --- a/patches/ntdll-NtAlertThreadByThreadId/0013-ntdll-Reimplement-SRW-locks-on-top-of-Win32-futexes.patch +++ b/patches/ntdll-NtAlertThreadByThreadId/0013-ntdll-Reimplement-SRW-locks-on-top-of-Win32-futexes.patch @@ -1,4 +1,4 @@ -From a85907faa73aef081c908fa48b3262301d105f22 Mon Sep 17 00:00:00 2001 +From f51e61d33f38a050b018107f1615e6cd8a41b1d0 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sun, 22 Nov 2020 20:51:10 -0600 Subject: [PATCH] ntdll: Reimplement SRW locks on top of Win32 futexes. @@ -392,10 +392,10 @@ index 1e6afc4cfc8..93a6a5fd7de 100644 /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c -index 58616212f15..45fe4259d19 100644 +index 96aa2142ebb..18857f8f7ac 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -1691,12 +1691,6 @@ static struct unix_funcs unix_funcs = +@@ -1552,12 +1552,6 @@ static struct unix_funcs unix_funcs = #endif DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, @@ -409,10 +409,10 @@ index 58616212f15..45fe4259d19 100644 ntdll_ceil, ntdll_cos, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c -index d4092438644..b67f5fc8f10 100644 +index c99fa004513..e64d0853382 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c -@@ -114,8 +114,6 @@ static inline ULONGLONG monotonic_counter(void) +@@ -115,8 +115,6 @@ static inline ULONGLONG monotonic_counter(void) #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 @@ -421,7 +421,7 @@ index d4092438644..b67f5fc8f10 100644 static int futex_private = 128; -@@ -129,16 +127,6 @@ static inline int futex_wake( const int *addr, int val ) +@@ -130,16 +128,6 @@ static inline int futex_wake( const int *addr, int val ) return syscall( __NR_futex, addr, FUTEX_WAKE | futex_private, val, NULL, 0, 0 ); } @@ -438,7 +438,7 @@ index d4092438644..b67f5fc8f10 100644 static inline int use_futexes(void) { static int supported = -1; -@@ -156,16 +144,6 @@ static inline int use_futexes(void) +@@ -157,16 +145,6 @@ static inline int use_futexes(void) return supported; } @@ -455,7 +455,7 @@ index d4092438644..b67f5fc8f10 100644 #endif -@@ -2390,290 +2368,3 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG +@@ -2446,290 +2424,3 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG return NtWaitForSingleObject( ntdll_get_thread_data()->tid_alert_event, FALSE, timeout ); #endif } @@ -747,10 +747,10 @@ index d4092438644..b67f5fc8f10 100644 - -#endif diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h -index 3ccb51e155c..313244e5e59 100644 +index 12f3efc9846..0449535c414 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h -@@ -98,12 +98,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON +@@ -101,12 +101,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; @@ -764,19 +764,19 @@ index 3ccb51e155c..313244e5e59 100644 extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h -index ed9c6584939..090a694bb40 100644 +index 767234fc6d3..70339c24474 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h -@@ -26,7 +26,7 @@ - struct _DISPATCHER_CONTEXT; +@@ -37,7 +37,7 @@ enum loadorder + }; /* increment this when you change the function table */ --#define NTDLL_UNIXLIB_VERSION 118 -+#define NTDLL_UNIXLIB_VERSION 119 +-#define NTDLL_UNIXLIB_VERSION 121 ++#define NTDLL_UNIXLIB_VERSION 122 struct unix_funcs { -@@ -39,14 +39,6 @@ struct unix_funcs +@@ -50,14 +50,6 @@ struct unix_funcs NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); @@ -792,5 +792,5 @@ index ed9c6584939..090a694bb40 100644 double (CDECL *atan)( double d ); double (CDECL *ceil)( double d ); -- -2.20.1 +2.30.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 74cb1ee3..f1c8ab0f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "23ffd0a7986421958c23cffce138afa389209920" + echo "4d5824112e13160e538013a25f1c13a124565180" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 1172964f..4aff49d0 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -23ffd0a7986421958c23cffce138afa389209920 +4d5824112e13160e538013a25f1c13a124565180