diff --git a/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch b/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch index 48fb0232..0ada1ea2 100644 --- a/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch +++ b/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch @@ -1,4 +1,4 @@ -From 2ce47e07be60a3306855c625f4ffc75d039085ec Mon Sep 17 00:00:00 2001 +From e1057892b7256a8c48b4abaa1b34fb11b6735973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 4 Feb 2017 16:20:37 +0100 Subject: [PATCH] kernel32: Implement some processor group functions. @@ -38,7 +38,7 @@ index 4998af04d9b..5ce8e24713b 100644 @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec -index d14bf010383..d7eb984c0cd 100644 +index 0312e044a86..06f524a8080 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -719,7 +719,7 @@ @@ -103,10 +103,10 @@ index 41a5b34af19..dc136365f50 100644 * GetFirmwareEnvironmentVariableA (KERNEL32.@) */ diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c -index 762e114a988..4bf68401268 100644 +index 433c12ff1fb..5049265684f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c -@@ -4327,6 +4327,26 @@ static void test_dead_process(void) +@@ -4297,6 +4297,26 @@ static void test_dead_process(void) CloseHandle(pi.hThread); } @@ -133,14 +133,14 @@ index 762e114a988..4bf68401268 100644 START_TEST(process) { HANDLE job, hproc, h, h2; -@@ -4443,6 +4463,7 @@ START_TEST(process) - test_GetNumaProcessorNode(); +@@ -4414,6 +4434,7 @@ START_TEST(process) test_session_info(); test_GetLogicalProcessorInformationEx(); + test_GetSystemCpuSetInformation(); + test_GetActiveProcessorCount(); test_largepages(); test_ProcThreadAttributeList(); test_SuspendProcessState(); -- -2.30.1 +2.30.2 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 04fea1d5..5452f573 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 65673c61b09de27189b5f319073e6807d8dbed9e Mon Sep 17 00:00:00 2001 +From b41fc553cecc9ba5c81cda41bb85e2ee1937586e 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. @@ -261,10 +261,10 @@ index 25496609f08..4f395336428 100644 } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c -index 438ff474a92..a962eb46ead 100644 +index 4c76865019b..d7fc60cad2f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -1757,9 +1757,6 @@ static struct unix_funcs unix_funcs = +@@ -1753,9 +1753,6 @@ static struct unix_funcs unix_funcs = #endif DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, @@ -467,19 +467,19 @@ index 7d6423083e1..41005425a90 100644 - mutex_unlock( &addr_mutex ); -} diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h -index 80e4eaefc75..72d115a556b 100644 +index 04ae8230b1a..21e34842778 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h -@@ -37,7 +37,7 @@ enum loadorder - }; +@@ -26,7 +26,7 @@ + struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ --#define NTDLL_UNIXLIB_VERSION 119 -+#define NTDLL_UNIXLIB_VERSION 120 +-#define NTDLL_UNIXLIB_VERSION 120 ++#define NTDLL_UNIXLIB_VERSION 121 struct unix_funcs { -@@ -49,10 +49,6 @@ struct unix_funcs +@@ -38,10 +38,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 c2bd2b66..487ef059 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 fd2100138729eece59f3af37c59ee6b166085cc6 Mon Sep 17 00:00:00 2001 +From 7ac2eff4652e8ce16550c27b2378e2dc64d54122 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 a962eb46ead..6748c89ccac 100644 +index d7fc60cad2f..fe710e9d1f5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -1757,9 +1757,6 @@ static struct unix_funcs unix_funcs = +@@ -1753,9 +1753,6 @@ static struct unix_funcs unix_funcs = #endif DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, @@ -217,7 +217,7 @@ 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 8d80b824d28..8141554a7cd 100644 +index 923b888ce68..1524a532a88 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -105,9 +105,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON @@ -231,19 +231,19 @@ index 8d80b824d28..8141554a7cd 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 72d115a556b..d7c880eda04 100644 +index 21e34842778..c67daa389a3 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h -@@ -37,7 +37,7 @@ enum loadorder - }; +@@ -26,7 +26,7 @@ + struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ --#define NTDLL_UNIXLIB_VERSION 120 -+#define NTDLL_UNIXLIB_VERSION 121 +-#define NTDLL_UNIXLIB_VERSION 121 ++#define NTDLL_UNIXLIB_VERSION 122 struct unix_funcs { -@@ -51,9 +51,6 @@ struct unix_funcs +@@ -40,9 +40,6 @@ struct unix_funcs LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); /* fast locks */ 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 c9085723..708fd99c 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 6409c2d12ba290c5bb8c4335988bc144d08b35b7 Mon Sep 17 00:00:00 2001 +From 65b24120d7a4bb05712bcb559d55a30d5a498002 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 6748c89ccac..81d8476e4c6 100644 +index fe710e9d1f5..36899ba57e3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -1763,8 +1763,6 @@ static struct unix_funcs unix_funcs = +@@ -1759,8 +1759,6 @@ static struct unix_funcs unix_funcs = fast_RtlAcquireSRWLockShared, fast_RtlReleaseSRWLockExclusive, fast_RtlReleaseSRWLockShared, @@ -187,7 +187,7 @@ index 6b97028fb68..d4092438644 100644 - #endif diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h -index 8141554a7cd..a22e7bdd4f4 100644 +index 1524a532a88..91b6451ade1 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -111,10 +111,7 @@ extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLS @@ -202,19 +202,19 @@ index 8141554a7cd..a22e7bdd4f4 100644 extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h -index d7c880eda04..8518c7fba13 100644 +index c67daa389a3..b0914d3f97e 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h -@@ -37,7 +37,7 @@ enum loadorder - }; +@@ -26,7 +26,7 @@ + struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ --#define NTDLL_UNIXLIB_VERSION 121 -+#define NTDLL_UNIXLIB_VERSION 122 +-#define NTDLL_UNIXLIB_VERSION 122 ++#define NTDLL_UNIXLIB_VERSION 123 struct unix_funcs { -@@ -57,9 +57,6 @@ struct unix_funcs +@@ -46,9 +46,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 ); 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 748b47c4..e835f7b1 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 cf50bc7987a6449ada2c801a78697c6299ffb07c Mon Sep 17 00:00:00 2001 +From ddc8ae251a344ad7e7e11844b03fe0eaaa553084 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 81d8476e4c6..575cc38d5f9 100644 +index 36899ba57e3..6a7eb5d7af1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -1757,12 +1757,6 @@ static struct unix_funcs unix_funcs = +@@ -1753,12 +1753,6 @@ static struct unix_funcs unix_funcs = #endif DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, @@ -747,7 +747,7 @@ index d4092438644..b67f5fc8f10 100644 - -#endif diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h -index a22e7bdd4f4..cf7b194a14b 100644 +index 91b6451ade1..ffce7328600 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -105,12 +105,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON @@ -764,19 +764,19 @@ index a22e7bdd4f4..cf7b194a14b 100644 extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h -index 8518c7fba13..650efb7f5e0 100644 +index b0914d3f97e..fd6c1198e99 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h -@@ -37,7 +37,7 @@ enum loadorder - }; +@@ -26,7 +26,7 @@ + struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ --#define NTDLL_UNIXLIB_VERSION 122 -+#define NTDLL_UNIXLIB_VERSION 123 +-#define NTDLL_UNIXLIB_VERSION 123 ++#define NTDLL_UNIXLIB_VERSION 124 struct unix_funcs { -@@ -50,14 +50,6 @@ struct unix_funcs +@@ -39,14 +39,6 @@ struct unix_funcs NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); diff --git a/patches/ntdll-SystemCodeIntegrityInformation/0001-ntdll-NtQuerySystemInformation-support-SystemCodeInt.patch b/patches/ntdll-SystemCodeIntegrityInformation/0001-ntdll-NtQuerySystemInformation-support-SystemCodeInt.patch index 070abb58..14147465 100644 --- a/patches/ntdll-SystemCodeIntegrityInformation/0001-ntdll-NtQuerySystemInformation-support-SystemCodeInt.patch +++ b/patches/ntdll-SystemCodeIntegrityInformation/0001-ntdll-NtQuerySystemInformation-support-SystemCodeInt.patch @@ -1,4 +1,4 @@ -From c65ffcf059cf2768a9ca6ee7a7e38d8a6a25fc44 Mon Sep 17 00:00:00 2001 +From d0f1e23c56e0c4b1fa01f73dc0ed8fa4b6141710 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 22 May 2020 16:37:37 +1000 Subject: [PATCH] ntdll: NtQuerySystemInformation support @@ -8,14 +8,14 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49192 Signed-off-by: Alistair Leslie-Hughes --- dlls/ntdll/unix/system.c | 22 ++++++++++++++++++++++ - include/winternl.h | 22 ++++++++++++++++++++++ - 2 files changed, 44 insertions(+) + include/winternl.h | 21 +++++++++++++++++++++ + 2 files changed, 43 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c -index 6fa71ddfb91..fad1d072962 100644 +index 56f31e4147f..be8f1d74fe3 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c -@@ -2714,6 +2714,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, +@@ -2809,6 +2809,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, ret = STATUS_SUCCESS; break; @@ -45,16 +45,10 @@ index 6fa71ddfb91..fad1d072962 100644 FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); diff --git a/include/winternl.h b/include/winternl.h -index fcdedaec8aa..618fab7d7c2 100644 +index 9e6bde25569..6bbf7fdbe99 100644 --- a/include/winternl.h +++ b/include/winternl.h -@@ -1550,11 +1550,33 @@ typedef enum _SYSTEM_INFORMATION_CLASS { - SystemMemoryListInformation = 80, - SystemFileCacheInformationEx = 81, - SystemDynamicTimeZoneInformation = 102, -+ SystemCodeIntegrityInformation = 103, - SystemLogicalProcessorInformationEx = 107, - SystemHypervisorSharedPageInformation = 197, +@@ -1696,6 +1696,27 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1c89de26..29e6369f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "6ca1a92684fcbaa1c569b60411a8036b6d11dc99" + echo "7c62e6b169f18f4a5d5809490f8aebdb5a9375eb" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 6fbd16af..8b18cc62 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -6ca1a92684fcbaa1c569b60411a8036b6d11dc99 +7c62e6b169f18f4a5d5809490f8aebdb5a9375eb