Michael Müller : kernel32: Return correct device type for cd devices without medium.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f556d0e93679a10281430835a6e01ce7f12269bd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f556d0e93679a10281430835a6...

Author: Michael Müller <michael(a)fds-team.de>
Date:   Mon Mar 30 03:03:03 2015 +0200

kernel32: Return correct device type for cd devices without medium.

---

 dlls/kernel32/volume.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c
index 59eda44..38a72c5 100644
--- a/dlls/kernel32/volume.c
+++ b/dlls/kernel32/volume.c
@@ -1610,7 +1610,15 @@ UINT WINAPI GetDriveTypeW(LPCWSTR root) /* [in] String describing drive */
     HANDLE handle;
     UINT ret;
 
-    if (!open_device_root( root, &handle )) return DRIVE_NO_ROOT_DIR;
+    if (!open_device_root( root, &handle ))
+    {
+        /* CD ROM devices do not necessarily have a volume, but a drive type */
+        ret = get_mountmgr_drive_type( root );
+        if (ret == DRIVE_CDROM || ret == DRIVE_REMOVABLE)
+            return ret;
+
+        return DRIVE_NO_ROOT_DIR;
+    }
 
     status = NtQueryVolumeInformationFile( handle, &io, &info, sizeof(info), FileFsDeviceInformation );
     NtClose( handle );