Rebase against 7546b4a63d437c2f7f8673cae9341d358f84f1a5.

patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch

@@ -1,7 +1,7 @@
-From 7a2585477f90f5e88a7745eea20f517a00b2175b Mon Sep 17 00:00:00 2001
+From 34e53ddfbd8c65e37d0cc3e68793833e733eb107 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Sat, 12 Dec 2020 17:28:31 -0700
-Subject: kernel32: Advertise junction point support.
+Subject: [PATCH] kernel32: Advertise junction point support.
 
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
@@ -12,7 +12,7 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  4 files changed, 144 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
-index d4f77012bbe..6131e236e3a 100644
+index 0757036c8e3..6b2187c0991 100644
 --- a/dlls/mountmgr.sys/device.c
 +++ b/dlls/mountmgr.sys/device.c
 @@ -197,6 +197,36 @@ static void get_filesystem_serial( struct volume *volume )
@@ -52,7 +52,7 @@ index d4f77012bbe..6131e236e3a 100644
  
  /******************************************************************
   *		VOLUME_FindCdRomDataBestVoldesc
-@@ -1695,7 +1725,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
+@@ -1716,7 +1746,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
              break;
          default:
              fsname = L"NTFS";
@@ -63,12 +63,12 @@ index d4f77012bbe..6131e236e3a 100644
              break;
          }
 diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c
-index 52a3fce66d6..73735c22d13 100644
+index 0332f6f6018..93ec6f266c5 100644
 --- a/dlls/mountmgr.sys/unixlib.c
 +++ b/dlls/mountmgr.sys/unixlib.c
-@@ -31,6 +31,21 @@
- #include <stdlib.h>
- #include <sys/stat.h>
+@@ -38,6 +38,21 @@
+ #endif
+ #include <termios.h>
  #include <unistd.h>
 +#ifdef HAVE_SYS_STATFS_H
 +# include <sys/statfs.h>
@@ -87,8 +87,8 @@ index 52a3fce66d6..73735c22d13 100644
 +#endif
  
  #include "unixlib.h"
- 
-@@ -311,6 +326,87 @@ static NTSTATUS read_volume_file( void *args )
+ #include "wine/debug.h"
+@@ -463,6 +478,87 @@ static NTSTATUS read_volume_file( void *args )
      return STATUS_SUCCESS;
  }
  
@@ -176,17 +176,17 @@ index 52a3fce66d6..73735c22d13 100644
  static NTSTATUS match_unixdev( void *args )
  {
      const struct match_unixdev_params *params = args;
-@@ -454,4 +550,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
+@@ -607,4 +703,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
      write_credential,
      delete_credential,
      enumerate_credentials,
 +    get_volume_filesystem,
  };
 diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h
-index e7846a764da..188cf93b091 100644
+index ef5b10732f6..6d3902173b4 100644
 --- a/dlls/mountmgr.sys/unixlib.h
 +++ b/dlls/mountmgr.sys/unixlib.h
-@@ -91,6 +91,13 @@ struct read_volume_file_params
+@@ -107,6 +107,13 @@ struct read_volume_file_params
      ULONG *size;
  };
  
@@ -200,7 +200,7 @@ index e7846a764da..188cf93b091 100644
  struct match_unixdev_params
  {
      const char *device;
-@@ -156,6 +163,7 @@ enum mountmgr_funcs
+@@ -173,6 +180,7 @@ enum mountmgr_funcs
      unix_write_credential,
      unix_delete_credential,
      unix_enumerate_credentials,
@@ -209,10 +209,10 @@ index e7846a764da..188cf93b091 100644
  
  extern unixlib_handle_t mountmgr_handle;
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index c5b3b83802e..084398ba83d 100644
+index ce8c37a7337..177151832a8 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -5351,8 +5351,8 @@ static INT build_reparse_buffer(const WCHAR *filename, REPARSE_DATA_BUFFER **pbu
+@@ -5355,8 +5355,8 @@ static INT build_reparse_buffer(const WCHAR *filename, REPARSE_DATA_BUFFER **pbu
  
  static void test_reparse_points(void)
  {
@@ -222,7 +222,7 @@ index c5b3b83802e..084398ba83d 100644
      static const WCHAR targetW[] = {'\\','t','a','r','g','e','t',0};
      INT buffer_len, string_len, path_len, total_len;
      FILE_BASIC_INFORMATION old_attrib, new_attrib;
-@@ -5381,7 +5381,12 @@ static void test_reparse_points(void)
+@@ -5385,7 +5385,12 @@ static void test_reparse_points(void)
      pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL);
      volW[0] = nameW.Buffer[4];
      pRtlFreeUnicodeString( &nameW );
@@ -237,5 +237,5 @@ index c5b3b83802e..084398ba83d 100644
      {
          skip("File system does not support reparse points.\n");
 -- 
-2.17.1
+2.37.2
 

patches/ntdll-Junction_Points/definition

@@ -2,3 +2,4 @@ Fixes: [12401] NET Framework 2.0, 3.0, 4.0 installers and other apps that make u
 Fixes: [44948] Multiple apps (Spine (Mod starter for Gothic), MS Office 365 installer) need CreateSymbolicLinkW implementation
 Depends: ntdll-DOS_Attributes
 Depends: ntdll-NtQueryEaFile
+Depends: ntdll-Serial_Port_Detection