From edb34171243515c6a36f6da4b89237c38cc8e000 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 27 Nov 2021 17:36:06 +1100 Subject: [PATCH] Rebase against f03933fbb73152c7a54383fba411a611af7aaa55. --- ...ys-Write-usable-device-paths-into-HKLM-SYS.patch | 13 ++++++------- patches/patchinstall.sh | 2 +- staging/upstream-commit | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/patches/mountmgr-DosDevices/0001-mountmgr.sys-Write-usable-device-paths-into-HKLM-SYS.patch b/patches/mountmgr-DosDevices/0001-mountmgr.sys-Write-usable-device-paths-into-HKLM-SYS.patch index 3df788b1..d2eddd52 100644 --- a/patches/mountmgr-DosDevices/0001-mountmgr.sys-Write-usable-device-paths-into-HKLM-SYS.patch +++ b/patches/mountmgr-DosDevices/0001-mountmgr.sys-Write-usable-device-paths-into-HKLM-SYS.patch @@ -1,4 +1,4 @@ -From 4a7715a3ef8b71417f049ea8c110ad2f5486d135 Mon Sep 17 00:00:00 2001 +From e6e95fe8edfaa85796f533f3f7a485bc721fe930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 30 Mar 2015 04:01:51 +0200 Subject: [PATCH] mountmgr.sys: Write usable device paths into @@ -15,7 +15,7 @@ Based on a patch by Bernhard Übelacker. 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c -index d14ccfadb05..199f3e90846 100644 +index fc32b57cf70..4d837315311 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1083,8 +1083,8 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, @@ -30,7 +30,7 @@ index d14ccfadb05..199f3e90846 100644 return STATUS_SUCCESS; } diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c -index 0869e96766a..468d7401e4a 100644 +index 2e3ff80c36a..6898bb98c62 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -52,14 +52,21 @@ static HKEY mount_key; @@ -58,10 +58,10 @@ index 0869e96766a..468d7401e4a 100644 else mount->id_len = 0; } diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h -index 520055f3fb8..f51b28e24f9 100644 +index 0297f6f11fe..b347a9cef6a 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h -@@ -113,7 +113,8 @@ extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICOD +@@ -110,6 +110,7 @@ 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; @@ -69,8 +69,7 @@ index 520055f3fb8..f51b28e24f9 100644 + +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 char *unix_name, struct mountmgr_dhcp_request_param *param, - char *buf, ULONG offset, ULONG size ) DECLSPEC_HIDDEN; + #endif /* __WINE_MOUNTMGR_H */ -- 2.33.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 96c9f999..7a1adaf3 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "67d0509f2f523935b0f4dbd3a713125252b37627" + echo "f03933fbb73152c7a54383fba411a611af7aaa55" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 53e1953c..a6fefb05 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -67d0509f2f523935b0f4dbd3a713125252b37627 +f03933fbb73152c7a54383fba411a611af7aaa55