Changeset 2570 for trunk/src/peldr/initterm.cpp

Timestamp:

Jan 30, 2000, 1:56:02 PM (26 years ago)

Author:

sandervl

Message:

Some bugfixes

File:

• trunk/src/peldr/initterm.cpp (modified) (6 diffs)

trunk/src/peldr/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.5 2000-01-26 11:26:36 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.6 2000-01-30 12:56:02 sandervl Exp $ */
 
 /*
@@ -124 +124 @@
 void AllocateExeMem(char *filename)
 {
- HFILE  dllfile;
+ HFILE  dllfile = 0;
  char   szFileName[CCHMAXPATH], *tmp;
  ULONG  action, ulRead, signature;
@@ -135 +135 @@
  ULONG  alloccnt = 0;
  ULONG  diff, i, baseAddress;
- ULONG  ulSysinfo, flAllocMem;
+ ULONG  ulSysinfo, flAllocMem = 0;
 
   strcpy(szFileName, filename);
@@ -156 +156 @@
   rc = DosOpen(szFileName, &dllfile, &action, 0, FILE_READONLY, OPEN_ACTION_OPEN_IF_EXISTS|OPEN_ACTION_FAIL_IF_NEW, OPEN_SHARE_DENYNONE|OPEN_ACCESS_READONLY, NULL);
   if(rc) {
-        return; //oops
+        goto end; //oops
   }
 
@@ -198 +198 @@
   }
 
-  if(oh.ImageBase < 512*1024*124) {
+  if(oh.ImageBase < 512*1024*1024) {
         flAllocMem = 0;
+  }
+  else {
+        if(flAllocMem == 0) {
+                goto end; //no support for > 512 MB
+        }
   }
   while(TRUE) {
@@ -233 +238 @@
 
 end:
-  DosClose(dllfile);
+  if(dllfile) DosClose(dllfile);
   return;
 }