Rebase against 30c33c2f982fc8c0ef6d97683c6581ebddd46814.

This commit is contained in:
Alistair Leslie-Hughes
2022-12-01 11:07:36 +11:00
parent d007ef33ee
commit 2f85e74399
5 changed files with 43 additions and 51 deletions

View File

@@ -1,4 +1,4 @@
From 13f6a02494570aea6cda94cb479052bbf3d9bd72 Mon Sep 17 00:00:00 2001
From 281a1753e7a075b7b3bdbba2692a1da5bec081f3 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: [PATCH] mountmgr.sys: Write usable device paths into
@@ -15,10 +15,10 @@ 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 6b2187c0991..b15a8ea8cf7 100644
index 8fd9dc0757e..f40f70b06d7 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -1063,8 +1063,8 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive,
@@ -1045,8 +1045,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 6b2187c0991..b15a8ea8cf7 100644
return STATUS_SUCCESS;
}
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
index b67082229f6..47a71e90325 100644
index 9f72eedb33b..19cb71b4eb6 100644
--- a/dlls/mountmgr.sys/mountmgr.c
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -46,14 +46,21 @@ struct mount_point
@@ -41,9 +41,9 @@ index b67082229f6..47a71e90325 100644
+void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len, int drive )
{
+ WCHAR logicalW[] = {'\\','\\','.','\\','a',':',0};
RtlFreeHeap( GetProcessHeap(), 0, mount->id );
free( mount->id );
mount->id_len = max( MIN_ID_LEN, id_len );
if ((mount->id = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, mount->id_len )))
if ((mount->id = calloc( mount->id_len, 1 )))
{
memcpy( mount->id, id, id_len );
- RegSetValueExW( mount_key, mount->link.Buffer, 0, REG_BINARY, mount->id, mount->id_len );