Rebase against 88d30985ddd534e8bafed531e619846bc8d10839

patches/eventfd_synchronization/0042-ntdll-Use-shared-memory-segments-to-store-semaphore-.patch

@@ -1,8 +1,8 @@
-From 48e622c107b931be17b6b4c424e71e1dea6ef86f Mon Sep 17 00:00:00 2001
+From 7103ff251691b420248ff8ddb80d544f06cc8b3a Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Mon, 11 Jun 2018 13:10:36 -0500
-Subject: [PATCH 42/83] ntdll: Use shared memory segments to store semaphore
- and mutex state.
+Subject: [PATCH] ntdll: Use shared memory segments to store semaphore and
+ mutex state.
 
 This patch is pretty big, because it restructures the underlying esync
 objects. Instead of wrapping a struct esync, the semaphore and mutex structs
@@ -16,7 +16,7 @@ since now we don't have to allocate separate structures.
  3 files changed, 155 insertions(+), 199 deletions(-)
 
 diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
-index 9d9d767c4..ce62446e6 100644
+index c1d8882d817..e8ee1cbc9ff 100644
 --- a/dlls/ntdll/esync.c
 +++ b/dlls/ntdll/esync.c
 @@ -32,6 +32,7 @@
@@ -658,7 +658,7 @@ index 9d9d767c4..ce62446e6 100644
                      }
                  }
 diff --git a/dlls/ntdll/esync.h b/dlls/ntdll/esync.h
-index f79b9a06c..88f491e5a 100644
+index f79b9a06c90..88f491e5ab4 100644
 --- a/dlls/ntdll/esync.h
 +++ b/dlls/ntdll/esync.h
 @@ -19,6 +19,7 @@
@@ -670,10 +670,10 @@ index f79b9a06c..88f491e5a 100644
  
  extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
 diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 87134db09..04aa8dff8 100644
+index e59cd2a5073..18f73b4911c 100644
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
-@@ -48,6 +48,7 @@
+@@ -51,6 +51,7 @@
  #include "ntdll_misc.h"
  #include "ddk/wdm.h"
  #include "wine/exception.h"
@@ -681,7 +681,7 @@ index 87134db09..04aa8dff8 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(thread);
  
-@@ -349,6 +350,9 @@ void thread_init(void)
+@@ -366,6 +367,9 @@ TEB *thread_init(void)
      __wine_user_shared_data();
      fill_cpu_info();
  
@@ -689,8 +689,8 @@ index 87134db09..04aa8dff8 100644
 +        esync_init();
 +
      NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
- }
  
+     return teb;
 -- 
-2.20.1
+2.17.1
 

patches/eventfd_synchronization/0074-ntdll-server-Abort-if-esync-is-enabled-for-the-serve.patch

@@ -1,8 +1,8 @@
-From 6887c3ae33f8304d5a038c7f9d2dac5d29ad8821 Mon Sep 17 00:00:00 2001
+From 4dabc377ea54ea04652677aa5ff4e7a2d8b37c33 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Sat, 4 Aug 2018 15:15:12 -0500
-Subject: [PATCH 74/83] ntdll, server: Abort if esync is enabled for the server
- but not the client, and vice versa.
+Subject: [PATCH] ntdll, server: Abort if esync is enabled for the server but
+ not the client, and vice versa.
 
 ---
  dlls/ntdll/esync.c  | 28 +++++++++++++++++++++++++++-
@@ -11,7 +11,7 @@ Subject: [PATCH 74/83] ntdll, server: Abort if esync is enabled for the server
  3 files changed, 40 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
-index 3ab069da9..1dd96c8e6 100644
+index 8255810a924..fb1953fb90c 100644
 --- a/dlls/ntdll/esync.c
 +++ b/dlls/ntdll/esync.c
 @@ -115,10 +115,29 @@ static void **shm_addrs;
@@ -61,10 +61,10 @@ index 3ab069da9..1dd96c8e6 100644
      pagesize = sysconf( _SC_PAGESIZE );
  
 diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index d146b9e00..2c8777e13 100644
+index 192186299db..6c652d9fdf2 100644
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
-@@ -351,8 +351,7 @@ void thread_init(void)
+@@ -368,8 +368,7 @@ TEB *thread_init(void)
      __wine_user_shared_data();
      fill_cpu_info();
  
@@ -73,9 +73,9 @@ index d146b9e00..2c8777e13 100644
 +    esync_init();
  
      NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
- }
+ 
 diff --git a/server/esync.c b/server/esync.c
-index 1fc9316b1..cb4de2daa 100644
+index 1fc9316b1b5..cb4de2daa77 100644
 --- a/server/esync.c
 +++ b/server/esync.c
 @@ -395,6 +395,18 @@ DECL_HANDLER(create_esync)
@@ -98,5 +98,5 @@ index 1fc9316b1..cb4de2daa 100644
  
      if ((esync = create_esync( root, &name, objattr->attributes, req->initval, req->flags, req->type, sd )))
 -- 
-2.20.1
+2.17.1