Changeset 7777 for trunk/src

Timestamp:

Jan 18, 2002, 5:23:35 PM (24 years ago)

Author:

sandervl

Message:

VP: GetDriveType fix for detection cdrom drives under certain circumstances (when cdrom is not the last drive letter)

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (3 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.93 2002-01-08 22:34:10 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.94 2002-01-18 16:23:35 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2648 +2648 @@
         {
             // this is a CDROM/DVD drive
-            if(cdinfo.first <= DriveIndex && DriveIndex < cdinfo.first + cdinfo.count)
-                device.fsDeviceAttr |= CDType;
+            // CDROM detection fix
+            // when cdrom is not last drive letter that sometimes 
+            // reports wrong index, have to check that device type 
+            // can be a CDROM one
+            if(device.bDeviceType == 7 || device.bDeviceType == 8) // Other or RW optical
+            // /CDROM detection fix
+                if(cdinfo.first <= DriveIndex && DriveIndex < cdinfo.first + cdinfo.count)
+                    device.fsDeviceAttr |= CDType;
         }
         DosClose(handle);
@@ -2688 +2694 @@
                         else device.fsDeviceAttr |= OpticalType;
                     }
+                    // CDROM detection fix
+                    else
+                    {
+                        // device is removable non-FAT, maybe it is CD?
+                        if (device.bDeviceType == 7 && 
+                            device.bMedia == 5 && 
+                            device.usBytesPerSector > 512)
+                        {
+                            device.fsDeviceAttr |= CDType;
+                        }
+                    }
+                    // CDROM detection fix
                  }
             }