From 9763d6e2954e4734d4b2278869946261f2cfaf7c Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 2 Sep 2023 08:36:03 +1000 Subject: [PATCH] Rebase against 0cea9c78fa89366e3dbeb0629179f359cbf17b92. --- ...el32-Advertise-reparse-point-support.patch | 20 ++++++++++--------- staging/upstream-commit | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/patches/ntdll-Junction_Points/0012-kernel32-Advertise-reparse-point-support.patch b/patches/ntdll-Junction_Points/0012-kernel32-Advertise-reparse-point-support.patch index c0ea9444..92cdcc42 100644 --- a/patches/ntdll-Junction_Points/0012-kernel32-Advertise-reparse-point-support.patch +++ b/patches/ntdll-Junction_Points/0012-kernel32-Advertise-reparse-point-support.patch @@ -1,4 +1,4 @@ -From eb6cc70e5e7fe6f9500b7fc632064aa71bc64fe3 Mon Sep 17 00:00:00 2001 +From 09318135fc87cd27e9df660958dcda6fe7d6f997 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Sat, 12 Dec 2020 17:28:31 -0700 Subject: [PATCH] kernel32: Advertise reparse point support. @@ -11,10 +11,10 @@ Signed-off-by: Erich E. Hoover 3 files changed, 137 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c -index 0757036c8e3..6b2187c0991 100644 +index 6c62ac78c76..1ee82e92c97 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 ) +@@ -177,6 +177,36 @@ static void get_filesystem_serial( struct volume *volume ) volume->serial = strtoul( buffer, NULL, 16 ); } @@ -51,7 +51,7 @@ index 0757036c8e3..6b2187c0991 100644 /****************************************************************** * VOLUME_FindCdRomDataBestVoldesc -@@ -1716,7 +1746,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) +@@ -1704,7 +1734,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) break; default: fsname = L"NTFS"; @@ -62,7 +62,7 @@ index 0757036c8e3..6b2187c0991 100644 break; } diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c -index 0332f6f6018..93ec6f266c5 100644 +index 80e7c850854..55489d9965b 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -38,6 +38,21 @@ @@ -175,14 +175,16 @@ index 0332f6f6018..93ec6f266c5 100644 static NTSTATUS match_unixdev( void *args ) { const struct match_unixdev_params *params = args; -@@ -607,4 +703,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = +@@ -607,6 +703,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = write_credential, delete_credential, enumerate_credentials, + get_volume_filesystem, }; + + C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h -index 56b460862fa..01993b3baec 100644 +index 7a3d0038512..ac7e6a553c7 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -107,6 +107,13 @@ struct read_volume_file_params @@ -204,9 +206,9 @@ index 56b460862fa..01993b3baec 100644 unix_delete_credential, unix_enumerate_credentials, + unix_get_volume_filesystem, + unix_funcs_count }; - #define MOUNTMGR_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) -- -2.38.1 +2.40.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index 18fbbab0..68f1d3c9 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -4c2c896af92c5fccd6313e292dcda548927cddf1 +0cea9c78fa89366e3dbeb0629179f359cbf17b92