Skip to content

W
wine-winehq
Commit 3fcfbbf5 authored by Erich E. Hoover's avatar Erich E. Hoover Committed by Alexandre Julliard
Browse files
Options

mountmgr.sys: Simplify query_unix_drive.

Signed-off-by: 's avatarErich E. Hoover <erich.e.hoover@gmail.com> Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5a6c82e9
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 47 deletions
dlls/mountmgr.sys/device.c
View file @ 3fcfbbf5
...@@ -1696,62 +1696,38 @@ static enum mountmgr_fs_type get_mountmgr_fs_type(enum fs_type fs_type) ...@@ -1696,62 +1696,38 @@ static enum mountmgr_fs_type get_mountmgr_fs_type(enum fs_type fs_type)
} }
/* query information about an existing dos drive, by letter or udi */ /* query information about an existing dos drive, by letter or udi */
static NTSTATUS query_dos_device( int letter, enum device_type *type, enum mountmgr_fs_type *fs_type, static struct volume *find_volume_by_letter( int letter )
DWORD *serial, char **device, char **mount_point, WCHAR **label )
{ {
NTSTATUS status = STATUS_NO_SUCH_DEVICE; struct volume *volume = NULL;
struct dos_drive *drive; struct dos_drive *drive;
struct disk_device *disk_device;
EnterCriticalSection( &device_section );
LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry )
{ {
if (drive->drive != letter) continue; if (drive->drive != letter) continue;
disk_device = drive->volume->device; volume = grab_volume( drive->volume );
if (type) *type = disk_device->type; TRACE( "found matching volume %s for drive letter %c:\n", debugstr_guid(&volume->guid),
if (fs_type) *fs_type = get_mountmgr_fs_type( drive->volume->fs_type ); 'a' + letter );
if (serial) *serial = drive->volume->serial;
if (device) *device = strdupA( disk_device->unix_device );
if (mount_point) *mount_point = strdupA( disk_device->unix_mount );
if (label) *label = strdupW( drive->volume->label );
status = STATUS_SUCCESS;
break; break;
} }
LeaveCriticalSection( &device_section ); return volume;
return status;
} }
/* query information about an existing unix device, by dev_t */ /* query information about an existing unix device, by dev_t */
static NTSTATUS query_unix_device( ULONGLONG unix_dev, enum device_type *type, static struct volume *find_volume_by_unixdev( ULONGLONG unix_dev )
enum mountmgr_fs_type *fs_type, DWORD *serial, char **device,
char **mount_point, WCHAR **label )
{ {
NTSTATUS status = STATUS_NO_SUCH_DEVICE;
struct volume *volume; struct volume *volume;
struct disk_device *disk_device;
struct stat st; struct stat st;
EnterCriticalSection( &device_section );
LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry )
{ {
disk_device = volume->device; if (!volume->device->unix_device || stat( volume->device->unix_device, &st ) < 0
if (!disk_device->unix_device
|| stat( disk_device->unix_device, &st ) < 0
|| st.st_rdev != unix_dev) || st.st_rdev != unix_dev)
continue; continue;
if (type) *type = disk_device->type; TRACE( "found matching volume %s\n", debugstr_guid(&volume->guid) );
if (fs_type) *fs_type = get_mountmgr_fs_type( volume->fs_type ); return grab_volume( volume );
if (serial) *serial = volume->serial;
if (device) *device = strdupA( disk_device->unix_device );
if (mount_point) *mount_point = strdupA( disk_device->unix_mount );
if (label) *label = strdupW( volume->label );
status = STATUS_SUCCESS;
break;
} }
LeaveCriticalSection( &device_section ); return NULL;
return status;
} }
/* implementation of IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE */ /* implementation of IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE */
...@@ -1761,27 +1737,35 @@ NTSTATUS query_unix_drive( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_ ...@@ -1761,27 +1737,35 @@ NTSTATUS query_unix_drive( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_
struct mountmgr_unix_drive *output = NULL; struct mountmgr_unix_drive *output = NULL;
char *device, *mount_point; char *device, *mount_point;
int letter = tolowerW( input->letter ); int letter = tolowerW( input->letter );
NTSTATUS status;
DWORD size, type = DEVICE_UNKNOWN, serial; DWORD size, type = DEVICE_UNKNOWN, serial;
NTSTATUS status = STATUS_SUCCESS;
enum mountmgr_fs_type fs_type; enum mountmgr_fs_type fs_type;
enum device_type device_type; enum device_type device_type;
struct volume *volume;
char *ptr; char *ptr;
WCHAR *label; WCHAR *label;
if (!letter) if (letter && (letter < 'a' || letter > 'z')) return STATUS_INVALID_PARAMETER;
{
if ((status = query_unix_device( input->unix_dev, &device_type, &fs_type, EnterCriticalSection( &device_section );
&serial, &device, &mount_point, &label ))) if (letter)
return status; volume = find_volume_by_letter( letter - 'a' );
}
else else
volume = find_volume_by_unixdev( input->unix_dev );
if (volume)
{ {
if (letter < 'a' || letter > 'z') return STATUS_INVALID_PARAMETER; device_type = volume->device->type;
fs_type = get_mountmgr_fs_type( volume->fs_type );
if ((status = query_dos_device( letter - 'a', &device_type, &fs_type, &serial, &device, serial = volume->serial;
&mount_point, &label ))) device = strdupA( volume->device->unix_device );
return status; mount_point = strdupA( volume->device->unix_mount );
label = strdupW( volume->label );
release_volume( volume );
} }
LeaveCriticalSection( &device_section );
if (!volume)
return STATUS_NO_SUCH_DEVICE;
switch (device_type) switch (device_type)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment