Rebase against 6d5659103f49db9e045087dd0093acc3b9a4b919.

patches/eventfd_synchronization/0042-kernel32-tests-Zigzag-test.patch

@@ -1,4 +1,4 @@
-From 5927f6063f981724d8b45031b9bd59aec465cb45 Mon Sep 17 00:00:00 2001
+From 22b05332c3dc04e44327931a307e899d9a59d074 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Tue, 26 Jun 2018 18:44:44 -0500
 Subject: [PATCH] kernel32/tests: Zigzag test.
@@ -9,11 +9,11 @@ The primary function is to check for races. The secondary function is to measure
  1 file changed, 79 insertions(+)
 
 diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
-index 6e4916f6bc3..0f072a5846e 100644
+index 42184d22517..82a236879e7 100644
 --- a/dlls/kernel32/tests/sync.c
 +++ b/dlls/kernel32/tests/sync.c
-@@ -3078,6 +3078,84 @@ static void test_crit_section(void)
-     ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo);
+@@ -3123,6 +3123,84 @@ static void test_QueueUserAPC(void)
+     CloseHandle(thread);
  }
  
 +static int zigzag_state, zigzag_count[2], zigzag_stop;
@@ -97,7 +97,7 @@ index 6e4916f6bc3..0f072a5846e 100644
  START_TEST(sync)
  {
      char **argv;
-@@ -3140,5 +3218,6 @@ START_TEST(sync)
+@@ -3188,5 +3266,6 @@ START_TEST(sync)
      test_srwlock_example();
      test_alertable_wait();
      test_apc_deadlock();
@@ -105,5 +105,5 @@ index 6e4916f6bc3..0f072a5846e 100644
      test_crit_section();
  }
 -- 
-2.28.0
+2.30.1
 

patches/ntdll-NtAlertThreadByThreadId/0009-ntdll-Reimplement-Win32-futexes-on-top-of-thread-ID-.patch

@@ -1,4 +1,4 @@
-From 8ab8ef02e2a7daf9296250c8a1b72a7ee0114cd9 Mon Sep 17 00:00:00 2001
+From 3e0bb8dbe1b283b3af1becbc0d2d669e2706d16d Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Mon, 2 Nov 2020 20:24:07 -0600
 Subject: [PATCH] ntdll: Reimplement Win32 futexes on top of thread-ID alerts.
@@ -14,17 +14,17 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
  6 files changed, 187 insertions(+), 173 deletions(-)
 
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 72340a171c9..baf58ca17eb 100644
+index 0ea8fdd2ce0..bb606fcdddd 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -85,6 +85,8 @@ extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN;
+@@ -86,6 +86,8 @@ extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN;
  
  extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
  
 +extern void addr_wait_free_entry(void) DECLSPEC_HIDDEN;
 +
- /* locale */
- extern LCID user_lcid, system_lcid;
+ 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;
  
 diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
 index f1263ae33fd..d652f55b630 100644
@@ -261,10 +261,10 @@ index 25496609f08..4f395336428 100644
  }
  
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index b7e1432535d..aff4594ab46 100644
+index 3cc4a4ccccb..b2edf9ff710 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
-@@ -1691,9 +1691,6 @@ static struct unix_funcs unix_funcs =
+@@ -1692,9 +1692,6 @@ static struct unix_funcs unix_funcs =
  #endif
      DbgUiIssueRemoteBreakin,
      RtlGetSystemTimePrecise,
@@ -275,10 +275,10 @@ index b7e1432535d..aff4594ab46 100644
      fast_RtlpUnWaitCriticalSection,
      fast_RtlDeleteCriticalSection,
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 7d6423083e1..41005425a90 100644
+index 0fee8f3099d..d68dfbbf6af 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -77,10 +77,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync);
+@@ -78,10 +78,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync);
  
  HANDLE keyed_event = 0;
  
@@ -289,7 +289,7 @@ index 7d6423083e1..41005425a90 100644
  static const char *debugstr_timeout( const LARGE_INTEGER *timeout )
  {
      if (!timeout) return "(infinite)";
-@@ -190,24 +186,6 @@ static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGE
+@@ -191,24 +187,6 @@ static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGE
  #endif
  
  
@@ -314,7 +314,7 @@ index 7d6423083e1..41005425a90 100644
  /* create a struct security_descriptor and contained information in one contiguous piece of memory */
  NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret,
                                    data_size_t *ret_len )
-@@ -2836,71 +2814,6 @@ NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable,
+@@ -2892,71 +2870,6 @@ NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable,
      return STATUS_SUCCESS;
  }
  
@@ -386,7 +386,7 @@ index 7d6423083e1..41005425a90 100644
  #else
  
  NTSTATUS CDECL fast_RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock )
-@@ -2943,79 +2856,4 @@ NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value
+@@ -2999,79 +2912,4 @@ NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value
      return STATUS_NOT_IMPLEMENTED;
  }
  
@@ -491,5 +491,5 @@ index 290379a9310..e84b6052378 100644
      /* fast locks */
      NTSTATUS      (CDECL *fast_RtlpWaitForCriticalSection)( RTL_CRITICAL_SECTION *crit, int timeout );
 -- 
-2.20.1
+2.30.1
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "7fa74fa78e2f8fedeea6fa3c796f0f2eb202825e"
+	echo "6d5659103f49db9e045087dd0093acc3b9a4b919"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-7fa74fa78e2f8fedeea6fa3c796f0f2eb202825e
+6d5659103f49db9e045087dd0093acc3b9a4b919