Changeset 1914 for trunk/src

Timestamp:

Dec 1, 1999, 11:47:51 AM (26 years ago)

Author:

sandervl

Message:

max open files fix + EB's mmap fix

Location:

trunk/src/kernel32

Files:

• hmmmap.cpp (modified) (2 diffs)
• oslibdos.cpp (modified) (5 diffs)

trunk/src/kernel32/hmmmap.cpp

@@ -1 @@
-/* $Id: hmmmap.cpp,v 1.7 1999-10-24 22:51:21 sandervl Exp $ */
+/* $Id: hmmmap.cpp,v 1.8 1999-12-01 10:47:51 sandervl Exp $ */
 
 /*
@@ -60 +60 @@
      protect & ~(PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|SEC_COMMIT|SEC_IMAGE|SEC_RESERVE|SEC_NOCACHE) ||
      (protect & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY)) == 0 ||
-     (hFile == -1 && (protect & SEC_COMMIT)) ||
+//     (hFile == -1 && (protect & SEC_COMMIT)) ||
      ((protect & SEC_COMMIT) && (protect & SEC_RESERVE))) 
   {

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.10 1999-11-26 00:05:18 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.11 1999-12-01 10:47:51 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #define INCL_DOSMEMMGR
 #define INCL_DOSPROCESS
+#define INCL_DOSERRORS
 #include <os2wrap.h>                     //Odin32 OS/2 api wrappers
 #include <stdlib.h>
@@ -200 +201 @@
         os2flags |= OPEN_SHARE_DENYWRITE;
 
+tryopen:
   rc = DosOpen(lpszFileName,                     /* File path name */
                &hFile,                   /* File handle */
@@ -211 +213 @@
 
   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;
+        }
         return 0;
   }
@@ -529 +543 @@
 //******************************************************************************
 //******************************************************************************
+void OSLibDosDisableHardError(BOOL fTurnOff)
+{
+  DosError((fTurnOff) ? FERR_DISABLEHARDERR : FERR_ENABLEHARDERR);
+}
+//******************************************************************************
+//******************************************************************************