Rebase against bc5f39ebf5fa3e936ad8fea726441b88716724c4.

patches/ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch

@@ -1,4 +1,4 @@
-From 0c71b9c48afdc0478941417595998ab21fcf12ae Mon Sep 17 00:00:00 2001
+From 898a258576725ac62bbcafb3a7f0e86b1aeff37a Mon Sep 17 00:00:00 2001
 From: Alex Henrie <alexhenrie24@gmail.com>
 Date: Tue, 29 Dec 2015 00:48:02 -0700
 Subject: [PATCH] mountmgr.sys: Do a device check before returning a default
@@ -12,20 +12,20 @@ Fixes https://bugs.winehq.org/show_bug.cgi?id=39793
  3 files changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
-index 328b0b2f344..0757036c8e3 100644
+index 2280ac82123..39aa6d37ce0 100644
 --- a/dlls/mountmgr.sys/device.c
 +++ b/dlls/mountmgr.sys/device.c
-@@ -1884,7 +1884,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p
-     UNICODE_STRING nt_name, symlink_name, default_name;
+@@ -1920,7 +1920,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p
      DEVICE_OBJECT *dev_obj;
      NTSTATUS status;
+     const WCHAR *windows_ports_key_name;
 -    struct set_dosdev_symlink_params params = { dosdevices_path, unix_path };
 +    struct set_dosdev_symlink_params params = { dosdevices_path, unix_path, driver == serial_driver };
  
      /* create DOS device */
      if (MOUNTMGR_CALL( set_dosdev_symlink, &params )) return FALSE;
 diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c
-index 13f6fbecf09..0332f6f6018 100644
+index bcc36383834..007db05d883 100644
 --- a/dlls/mountmgr.sys/unixlib.c
 +++ b/dlls/mountmgr.sys/unixlib.c
 @@ -36,6 +36,7 @@
@@ -36,7 +36,7 @@ index 13f6fbecf09..0332f6f6018 100644
  #include <unistd.h>
  
  #include "unixlib.h"
-@@ -304,6 +305,27 @@ static NTSTATUS set_dosdev_symlink( void *args )
+@@ -298,6 +299,27 @@ static NTSTATUS set_dosdev_symlink( void *args )
      char *path;
      NTSTATUS status = STATUS_SUCCESS;
  
@@ -65,10 +65,10 @@ index 13f6fbecf09..0332f6f6018 100644
  
      if (params->dest && params->dest[0])
 diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h
-index d70371876fa..ef5b10732f6 100644
+index c17e5f70638..dd29a70c8a8 100644
 --- a/dlls/mountmgr.sys/unixlib.h
 +++ b/dlls/mountmgr.sys/unixlib.h
-@@ -90,6 +90,7 @@ struct set_dosdev_symlink_params
+@@ -91,6 +91,7 @@ struct set_dosdev_symlink_params
  {
      const char *dev;
      const char *dest;
@@ -77,5 +77,5 @@ index d70371876fa..ef5b10732f6 100644
  
  struct get_volume_dos_devices_params
 -- 
-2.37.2
+2.51.0
 

staging/upstream-commit

@@ -1 +1 @@
-38938bdb6f752cb68d13d833be97d0c524fe827e
+bc5f39ebf5fa3e936ad8fea726441b88716724c4