Rebase against a9c4b309f6af82b624604bd0df898ad88d59ab5a

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

@@ -1,4 +1,4 @@
-From 74673086285abb335d58cecf4327bf08034210a6 Mon Sep 17 00:00:00 2001
+From 430aff7c0693c5529ce4af2d515bf48d6ba49e15 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
@@ -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 c1d8882d8..e8ee1cbc9 100644
+index c1d8882d817..e8ee1cbc9ff 100644
 --- a/dlls/ntdll/esync.c
 +++ b/dlls/ntdll/esync.c
 @@ -32,6 +32,7 @@
@@ -658,7 +658,7 @@ index c1d8882d8..e8ee1cbc9 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,7 +670,7 @@ 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..f9c529357 100644
+index 119d35731f4..2ac4ef6a23b 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -44,6 +44,7 @@
@@ -688,9 +688,9 @@ index 9972d680e..f9c529357 100644
 +    if (do_esync())
 +        esync_init();
 +
+     init_unix_codepage();
      init_directories();
      init_user_process_params( info_size );
- 
 -- 
-2.23.0
+2.24.0
 

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

@@ -1,4 +1,4 @@
-From 4293d1e7797b999611ecc410b24052a1566715b6 Mon Sep 17 00:00:00 2001
+From ba4c80e2a7abe2ba265f949312c78045bef5695c 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
@@ -11,7 +11,7 @@ Subject: [PATCH] ntdll, server: Abort if esync is enabled for the server but
  3 files changed, 40 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
-index 8255810a9..fb1953fb9 100644
+index 8255810a924..fb1953fb90c 100644
 --- a/dlls/ntdll/esync.c
 +++ b/dlls/ntdll/esync.c
 @@ -115,10 +115,29 @@ static void **shm_addrs;
@@ -61,7 +61,7 @@ index 8255810a9..fb1953fb9 100644
      pagesize = sysconf( _SC_PAGESIZE );
  
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index f9c529357..80f1304a3 100644
+index 2ac4ef6a23b..6df24c076c5 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -4405,8 +4405,7 @@ void __wine_process_init(void)
@@ -72,10 +72,10 @@ index f9c529357..80f1304a3 100644
 -        esync_init();
 +    esync_init();
  
+     init_unix_codepage();
      init_directories();
-     init_user_process_params( info_size );
 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.23.0
+2.24.0
 

patches/mountmgr-DosDevices/0001-mountmgr.sys-Write-usable-device-paths-into-HKLM-SYS.patch

@@ -1,7 +1,7 @@
-From 3cd8b757e42ef9de84dacaa57c2e6d1557c4f5fc Mon Sep 17 00:00:00 2001
+From 63e6c0777437ce33d4a73a4b99581ca10f86b941 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 30 Mar 2015 04:01:51 +0200
-Subject: mountmgr.sys: Write usable device paths into
+Subject: [PATCH] mountmgr.sys: Write usable device paths into
  HKLM\SYSTEM\MountedDevices.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -11,14 +11,14 @@ Based on a patch by Bernhard Übelacker.
 ---
  dlls/mountmgr.sys/device.c   |  4 ++--
  dlls/mountmgr.sys/mountmgr.c | 11 +++++++++--
- dlls/mountmgr.sys/mountmgr.h |  2 +-
- 3 files changed, 12 insertions(+), 5 deletions(-)
+ dlls/mountmgr.sys/mountmgr.h |  3 +--
+ 3 files changed, 12 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
-index 5003d4d..2722663 100644
+index e77f8904040..87609bf3de2 100644
 --- a/dlls/mountmgr.sys/device.c
 +++ b/dlls/mountmgr.sys/device.c
-@@ -511,8 +511,8 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive,
+@@ -516,8 +516,8 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive,
          id = disk_device->unix_mount;
          id_len = strlen( disk_device->unix_mount ) + 1;
      }
@@ -30,7 +30,7 @@ index 5003d4d..2722663 100644
      return STATUS_SUCCESS;
  }
 diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
-index 10286dc..ba803f3 100644
+index bc2b776a92f..e9dc04fe551 100644
 --- a/dlls/mountmgr.sys/mountmgr.c
 +++ b/dlls/mountmgr.sys/mountmgr.c
 @@ -47,14 +47,21 @@ struct mount_point
@@ -58,15 +58,18 @@ index 10286dc..ba803f3 100644
      else mount->id_len = 0;
  }
 diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h
-index 2f0db62..dd6ddc5 100644
+index 95386a44f84..2a7bf41b475 100644
 --- a/dlls/mountmgr.sys/mountmgr.h
 +++ b/dlls/mountmgr.sys/mountmgr.h
-@@ -67,4 +67,4 @@ extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICOD
+@@ -69,7 +69,6 @@ extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICOD
  extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name,
                                                     const GUID *guid ) DECLSPEC_HIDDEN;
  extern void delete_mount_point( struct mount_point *mount ) DECLSPEC_HIDDEN;
 -extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) DECLSPEC_HIDDEN;
+-
 +extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len, int drive ) DECLSPEC_HIDDEN;
+ extern ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf,
+                                      ULONG offset, ULONG size ) DECLSPEC_HIDDEN;
 -- 
-2.3.3
+2.24.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "288a6625ad0177e258a0db1da166d292ff420b1e"
+	echo "a9c4b309f6af82b624604bd0df898ad88d59ab5a"
 }
 
 # Show version information