Changeset 7202 for trunk/src/kernel32/oslibdos.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/oslibdos.cpp (modified) (12 diffs)

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;