ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mountmgr: Require at least one of device or mount point to match when looking for an existing volume.

This commit is contained in:
Alexandre Julliard 2011-12-21 10:56:52 +01:00
parent 1ec609670f
commit e85a5b2ee9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/mountmgr.sys/device.c
View File

@ -422,6 +422,8 @@ static struct volume *find_matching_volume( const char *udi, const char *device,
LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry )
{
int match = 0;
/* when we have a udi we only match drives added manually */
if (udi && volume->udi) continue;
/* and when we don't have a udi we only match dynamic drives */
@ -429,8 +431,17 @@ static struct volume *find_matching_volume( const char *udi, const char *device,
disk_device = volume->device;
if (disk_device->type != type) continue;
if (device && disk_device->unix_device && strcmp( device, disk_device->unix_device )) continue;
if (mount_point && disk_device->unix_mount && strcmp( mount_point, disk_device->unix_mount )) continue;
if (device && disk_device->unix_device)
{
if (strcmp( device, disk_device->unix_device )) continue;
match++;
}
if (mount_point && disk_device->unix_mount)
{
if (strcmp( mount_point, disk_device->unix_mount )) continue;
match++;
}
if (!match) continue;
TRACE( "found matching volume %s for device %s mount %s type %u\n",
debugstr_guid(&volume->guid), debugstr_a(device), debugstr_a(mount_point), type );
return grab_volume( volume );