Changeset 7474 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Nov 29, 2001, 12:33:37 AM (24 years ago)

Author:

phaller

Message:

Fixes in HandleManager and Device Handlers

File:

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

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.85 2001-11-19 13:02:58 phaller Exp $ */
+/* $Id: oslibdos.cpp,v 1.86 2001-11-28 23:33:37 phaller Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -178 +178 @@
     case ERROR_WRITE_PROTECT: //19
         return ERROR_WRITE_PROTECT_W;
+  
+    case ERROR_BAD_UNIT: //20
+        return ERROR_BAD_UNIT_W;
 
     case ERROR_NOT_READY: //21
@@ -604 +607 @@
                os2flags,
                0L);                            /* No extended attribute */
-
-  if(rc) {
-        if(rc == ERROR_TOO_MANY_OPEN_FILES) {
-         ULONG CurMaxFH;
-         LONG  ReqCount = 32;
-
-                rc = DosSetRelMaxFH(&ReqCount, &CurMaxFH);
-                if(rc) {
-                        dprintf(("DosSetRelMaxFH returned %d", rc));
-                        return 0;
-                }
-                dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
-                goto tryopen;
-        }
+  if(rc) 
+  {
+    if(rc == ERROR_TOO_MANY_OPEN_FILES) 
+    {
+      ULONG CurMaxFH;
+      LONG  ReqCount = 32;
+
+      rc = DosSetRelMaxFH(&ReqCount, &CurMaxFH);
+      if(rc) 
+      {
+        dprintf(("DosSetRelMaxFH returned %d", rc));
         return 0;
-  }
-  else  return hFile;
+      }
+      dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
+      goto tryopen;
+    }
+    
+    SetLastError(error2WinError(rc));
+    return 0;
+  }
+  
+  // OK, file was opened
+  SetLastError(ERROR_SUCCESS_W);
+  return hFile;
 }
 //******************************************************************************