wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 13c43cf3d06178dc39d98981f55d27e3cbd79ad0.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2023-11-25 13:08:00 +11:00
parent 52219e1eef
commit 234289ffd8
3 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/mountmgr-DosDevices/0001-mountmgr.sys-Write-usable-device-paths-into-HKLM-SYS.patch
View File

@@ -1,4 +1,4 @@
From 281a1753e7a075b7b3bdbba2692a1da5bec081f3 Mon Sep 17 00:00:00 2001
From b98e363f0809d5f5092854eb3ab207a908bf6bd8 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
@@ -11,14 +11,14 @@ Based on a patch by Bernhard Übelacker.
---
dlls/mountmgr.sys/device.c | 4 ++--
dlls/mountmgr.sys/mountmgr.c | 11 +++++++++--
dlls/mountmgr.sys/mountmgr.h | 3 ++-
3 files changed, 13 insertions(+), 5 deletions(-)
dlls/mountmgr.sys/mountmgr.h | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index 8fd9dc0757e..f40f70b06d7 100644
index 1ee82e92c97..58db9284ff3 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -1045,8 +1045,8 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive,
@@ -1051,8 +1051,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,10 +30,10 @@ index 8fd9dc0757e..f40f70b06d7 100644
return STATUS_SUCCESS;
}
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
index 9f72eedb33b..19cb71b4eb6 100644
index ad3c034fe0f..52bc6536693 100644
--- a/dlls/mountmgr.sys/mountmgr.c
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -46,14 +46,21 @@ struct mount_point
@@ -44,14 +44,21 @@ struct mount_point
static struct list mount_points_list = LIST_INIT(mount_points_list);
static HKEY mount_key;
@@ -58,18 +58,17 @@ index 9f72eedb33b..19cb71b4eb6 100644
else mount->id_len = 0;
}
diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h
index 143401e3b9b..bad875dd9bc 100644
index b1de312dffb..d7b7fad5c76 100644
--- a/dlls/mountmgr.sys/mountmgr.h
+++ b/dlls/mountmgr.sys/mountmgr.h
@@ -108,6 +108,7 @@ extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICOD
@@ -108,6 +108,6 @@ 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;
-extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) DECLSPEC_HIDDEN;
+
+extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len, int drive ) DECLSPEC_HIDDEN;
const GUID *guid );
extern void delete_mount_point( struct mount_point *mount );
-extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len );
+extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len, int drive );
#endif /* __WINE_MOUNTMGR_H */
--
2.38.1
2.42.0