[PATCH 0/1] MR1986: mountmgr.sys: Dont attempt to read from invalid media

[Alistair Leslie-Hughes (＠alesliehughes)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49615

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1986

[PATCH 1/1] mountmgr.sys: Dont attempt to read from invalid media

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49615
---
 dlls/mountmgr.sys/device.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index 22c17025e87..c8cf81e08b2 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -899,8 +899,12 @@ static BOOL get_volume_device_info( struct volume *volume )
     }
     else
     {
-        volume->fs_type = VOLUME_ReadFATSuperblock( handle, superblock );
-        if (volume->fs_type == FS_UNKNOWN) volume->fs_type = VOLUME_ReadCDSuperblock( handle, superblock );
+        /* If a CDROM isn't inserted, don't attempt to read from the invalid media. */
+        if(GetLastError() != ERROR_NOT_READY)
+        {
+            volume->fs_type = VOLUME_ReadFATSuperblock( handle, superblock );
+            if (volume->fs_type == FS_UNKNOWN) volume->fs_type = VOLUME_ReadCDSuperblock( handle, superblock );
+        }
     }
 
     TRACE( "%s: found fs type %d\n", debugstr_a(unix_device), volume->fs_type );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1986