Changeset 7202 for trunk/src/kernel32/hmdisk.cpp

Timestamp:

Oct 25, 2001, 3:19:05 PM (24 years ago)

Author:

sandervl

Message:

No longer use DosError; IOCTL_DISK_GET_DRIVE_GEOMETRY must return ERROR_MEDIA_CHANGED when floppy has been changed

File:

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

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.17 2001-10-10 15:06:06 phaller Exp $ */
+/* $Id: hmdisk.cpp,v 1.18 2001-10-25 13:19:05 sandervl Exp $ */
 
 /*
@@ -104 +104 @@
     //Disable error popus. NT allows an app to open a cdrom/dvd drive without a disk inside
     //OS/2 fails in that case with error ERROR_NOT_READY
-    OSLibDosDisableHardError(TRUE);
+    ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
     hFile = OSLibDosCreateFile((LPSTR)lpFileName,
                                pHMHandleData->dwAccess,
@@ -112 +112 @@
                                pHMHandleData->dwFlags,
                                hTemplate);
-    OSLibDosDisableHardError(FALSE);
+    SetErrorMode(oldmode);
 
     if (hFile != INVALID_HANDLE_ERROR || GetLastError() == ERROR_NOT_READY)
@@ -503 +503 @@
             *lpBytesReturned = 0;
         }
+
+        char   temp;
+        ULONG  bytesread, oldmode;
+        APIRET rc;
+
+        //Applications can use this IOCTL to check if the floppy has been changed
+        //OSLibDosGetDiskGeometry won't fail when that happens so we read one
+        //byte from the disk and return ERROR_MEDIA_CHANGED if it fails with
+        //ERROR_WRONG_DISK
+        oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
+        rc = OSLibDosRead(pHMHandleData->hHMHandle, (PVOID)&temp,
+                          1, &bytesread);
+        SetErrorMode(oldmode);
+        if(rc == FALSE) {
+            dprintf(("IOCTL_DISK_GET_DRIVE_GEOMETRY: DosRead failed with rc %d", GetLastError()));
+            if(GetLastError() == ERROR_WRONG_DISK) {
+                SetLastError(ERROR_MEDIA_CHANGED);
+                return FALSE;
+            }
+        }
+        else OSLibDosSetFilePtr(pHMHandleData->hHMHandle, -1, OSLIB_SETPTR_FILE_CURRENT);
+
         if(OSLibDosGetDiskGeometry(pHMHandleData->hHMHandle, drvInfo->driveLetter, pGeom) == FALSE) {
             return FALSE;