Changeset 8785 for trunk/src

Timestamp:

Jun 26, 2002, 3:35:13 PM (23 years ago)

Author:

sandervl

Message:

IOCTL_DISK_GET_DRIVE_GEOMETRY must fail if no disk is inserted; IOCTL_STORAGE_GET_MEDIA_TYPES/IOCTL_DISK_GET_MEDIA_TYPES shouldn't

File:

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

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.48 2002-06-26 11:08:32 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.49 2002-06-26 13:35:13 sandervl Exp $ */
 
 /*
@@ -784 +784 @@
         if(!pHMHandleData->hHMHandle) {
             pHMHandleData->hHMHandle = OpenDisk(drvInfo);
-            if(!pHMHandleData->hHMHandle) {
+            //IOCTL_DISK_GET_DRIVE_GEOMETRY must fail if no disk inserted
+            //the other two shouldn't
+            if(!pHMHandleData->hHMHandle && dwIoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) {
                 dprintf(("No disk inserted; aborting"));
                 SetLastError(ERROR_NOT_READY);
@@ -796 +798 @@
         //label has changed
         //TODO: Find better way to determine if floppy was removed or switched
-        if(drvInfo->driveType != DRIVE_FIXED) 
+        if(drvInfo->driveType != DRIVE_FIXED && pHMHandleData->hHMHandle) 
         {
             rc = OSLibDosQueryVolumeSerialAndName(1 + drvInfo->driveLetter - 'A', &volumelabel, NULL, 0);