Changeset 7202 for trunk/src

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

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (2 diffs)
• hmcomm.cpp (modified) (2 diffs)
• hmdisk.cpp (modified) (4 diffs)
• oslibdos.cpp (modified) (12 diffs)
• oslibdos.h (modified) (2 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.56 2001-10-18 13:27:39 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.57 2001-10-25 13:19:04 sandervl Exp $ */
 
 /*
@@ -82 +82 @@
 //Global Process Unhandled exception filter
 static LPTOP_LEVEL_EXCEPTION_FILTER CurrentUnhExceptionFlt = NULL;
-static UINT                         CurrentErrorMode = SEM_FAILCRITICALERRORS;
+static UINT                         CurrentErrorMode = 0;
 static PEXCEPTION_HANDLER           StartupCodeHandler = NULL;
 

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.10 2001-04-26 13:22:43 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.11 2001-10-25 13:19:05 sandervl Exp $ */
 
 /*
@@ -187 +187 @@
 
   //AH: TODO parse Win32 security handles
-  OSLibDosDisableHardError(TRUE);
+  ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
   pHMHandleData->hHMHandle = OSLibDosOpen(comname,
                                           OSLIB_ACCESS_READWRITE |
                                           OSLIB_ACCESS_SHAREDENYREAD |
                                           OSLIB_ACCESS_SHAREDENYWRITE);
-  OSLibDosDisableHardError(FALSE);
+  SetErrorMode(oldmode);
   if (pHMHandleData->hHMHandle != 0)
   {

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;

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.79 2001-10-15 05:51:34 phaller Exp $ */
+/* $Id: oslibdos.cpp,v 1.80 2001-10-25 13:19:05 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -1550 +1550 @@
 }
 //******************************************************************************
-//******************************************************************************
-void OSLibDosDisableHardError(BOOL fTurnOff)
-{
-   DosError((fTurnOff) ? FERR_DISABLEHARDERR : FERR_ENABLEHARDERR);
-}
-//******************************************************************************
 //Returns time spent in kernel & user mode in milliseconds
 //******************************************************************************
@@ -2190 +2184 @@
   result.achName[0] = 0;
 
-  DosError(FERR_DISABLEHARDERR | FERR_DISABLEEXCEPTION);
+  ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS_W);
   APIRET rc = DosFindFirst((PSZ)lpFileName,&hDir,attrs,&result,sizeof(result),&searchCount,FIL_STANDARD);
-  //PH: DosError(FERR_ENABLEHARDERR | FERR_ENABLEEXCEPTION);
 
   //check root: skip "." and ".." (HPFS, not on FAT)
@@ -2202 +2195 @@
     {
       result.achName[0] = 0;
-      //PH: DosError(FERR_DISABLEHARDERR | FERR_DISABLEEXCEPTION);
       searchCount = 1;
       APIRET rc = DosFindNext(hDir,&result,sizeof(result),&searchCount);
-      //PH: DosError(FERR_ENABLEHARDERR | FERR_ENABLEEXCEPTION);
       if (rc)
       {
@@ -2211 +2202 @@
         SetLastError(error2WinError(rc));
 
-        DosError(FERR_ENABLEHARDERR | FERR_ENABLEEXCEPTION);
+        SetErrorMode(oldmode);
         return INVALID_HANDLE_VALUE_W;
       }
@@ -2218 +2209 @@
 
   // enable i/o kernel exceptions again
-  DosError(FERR_ENABLEHARDERR | FERR_ENABLEEXCEPTION);
+  SetErrorMode(oldmode);
 
   if(rc)
@@ -2243 +2234 @@
   result = (FILEFINDBUF3*)malloc(searchCount*sizeof(FILEFINDBUF3));
 
-  DosError(FERR_DISABLEHARDERR | FERR_DISABLEEXCEPTION);
+  ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS_W);
   APIRET rc = DosFindFirst((PSZ)lpFileName,&hDir,attrs,result,searchCount*sizeof(FILEFINDBUF3),&searchCount,FIL_STANDARD);
-  DosError(FERR_ENABLEHARDERR | FERR_ENABLEEXCEPTION);
+  SetErrorMode(oldmode);
   if (rc)
   {
@@ -2347 +2338 @@
    drv[0] = (char)('A' + drive - 1);
 
-   DosError(FERR_DISABLEHARDERR);
+   ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS_W);
    rc = DosQueryFSAttach(drv, 1, FSAIL_QUERYNAME, fsinfo, &cb);
-   DosError(FERR_ENABLEHARDERR);
+   SetErrorMode(oldmode);
 
    switch(rc) {
@@ -2391 +2382 @@
  APIRET    rc;
 
-   DosError(FERR_DISABLEHARDERR);
+   ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS_W);
    rc = DosQueryFSInfo(drive, FSIL_VOLSER, &fsi, sizeof(fsi));
-   DosError(FERR_ENABLEHARDERR);
+   SetErrorMode(oldmode);
 
    switch(rc) {
@@ -2440 +2431 @@
       diskNum = 0;
 
-   DosError(FERR_DISABLEHARDERR);
+   ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS_W);
    rc = DosQueryFSInfo(diskNum, FSIL_ALLOC, &fsAlloc, sizeof(fsAlloc));
-   DosError(FERR_ENABLEHARDERR);
+   SetErrorMode(oldmode);
 
    if(rc == 0)
@@ -2467 +2458 @@
    APIRET rc;
 
+   dprintf(("OSLibDosGetDiskGeometry %x %d %x", hDisk, cDisk, pdiskgeom));
    param[1] = cDisk - 'A';
    rc = DosDevIOCtl((hDisk) ? hDisk : -1, IOCTL_DISK, DSK_GETDEVICEPARAMS, param, 2, &parsize, &bpb, sizeof(bpb), &datasize);
@@ -2509 +2501 @@
         return TRUE;
    }
+   dprintf(("OSLibDosGetDiskGeometry: error %d -> %d", rc, error2WinError(rc)));
    SetLastError(error2WinError(rc));
    return FALSE;

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.35 2001-07-28 18:03:38 sandervl Exp $ */
+/* $Id: oslibdos.h,v 1.36 2001-10-25 13:19:05 sandervl Exp $ */
 
 /*
@@ -149 +149 @@
 #endif
 
-void OSLibDosDisableHardError(BOOL fTurnOff);
 BOOL OSLibDosQueryProcTimes(DWORD procid, ULONG *kerneltime, ULONG *usertime);