evenfd_synchronization: Fix rebase, again.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48069

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

@@ -1,4 +1,4 @@
-From ac0e8624e1fc33859e2ea753da05728ac82f8a1b Mon Sep 17 00:00:00 2001
+From 74673086285abb335d58cecf4327bf08034210a6 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] ntdll: Use shared memory segments to store semaphore and
@@ -12,9 +12,8 @@ since now we don't have to allocate separate structures.
 ---
  dlls/ntdll/esync.c  | 349 +++++++++++++++++++-------------------------
  dlls/ntdll/esync.h  |   1 +
- dlls/ntdll/loader.c |   3 +
- dlls/ntdll/thread.c |   1 +
- 4 files changed, 155 insertions(+), 199 deletions(-)
+ dlls/ntdll/loader.c |   4 +
+ 3 files changed, 155 insertions(+), 199 deletions(-)
 
 diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
 index c1d8882d8..e8ee1cbc9 100644
@@ -671,30 +670,26 @@ index f79b9a06c..88f491e5a 100644
  
  extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 9972d680e..2f66065e3 100644
+index 9972d680e..f9c529357 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -4407,6 +4407,9 @@ void __wine_process_init(void)
-     init_directories();
-     init_user_process_params( info_size );
+@@ -44,6 +44,7 @@
+ #include "wine/server.h"
+ #include "ntdll_misc.h"
+ #include "ddk/wdm.h"
++#include "esync.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(module);
+ WINE_DECLARE_DEBUG_CHANNEL(relay);
+@@ -4404,6 +4405,9 @@ void __wine_process_init(void)
+     peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL );
+     peb->LoaderLock = &loader_section;
  
 +    if (do_esync())
 +        esync_init();
 +
-     NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
- 
-     /* retrieve current umask */
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index f699d01d6..c86e02424 100644
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -51,6 +51,7 @@
- #include "ntdll_misc.h"
- #include "ddk/wdm.h"
- #include "wine/exception.h"
-+#include "esync.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(thread);
+     init_directories();
+     init_user_process_params( info_size );
  
 -- 
 2.23.0

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

@@ -1,4 +1,4 @@
-From ab72938e7aa2b3355f24a72c019ab3d0c77689da Mon Sep 17 00:00:00 2001
+From 4293d1e7797b999611ecc410b24052a1566715b6 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] ntdll, server: Abort if esync is enabled for the server but
@@ -61,19 +61,19 @@ index 8255810a9..fb1953fb9 100644
      pagesize = sysconf( _SC_PAGESIZE );
  
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 2f66065e3..98cd95055 100644
+index f9c529357..80f1304a3 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -4407,8 +4407,7 @@ void __wine_process_init(void)
-     init_directories();
-     init_user_process_params( info_size );
+@@ -4405,8 +4405,7 @@ void __wine_process_init(void)
+     peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL );
+     peb->LoaderLock = &loader_section;
  
 -    if (do_esync())
 -        esync_init();
 +    esync_init();
  
-     NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
- 
+     init_directories();
+     init_user_process_params( info_size );
 diff --git a/server/esync.c b/server/esync.c
 index 1fc9316b1..cb4de2daa 100644
 --- a/server/esync.c