Changeset 2066 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Dec 13, 1999, 8:28:15 PM (26 years ago)

Author:

sandervl

Message:

Fixes for the on-demand page loader; disabled by default for debugging

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (5 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.22 1999-12-12 14:32:38 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.23 1999-12-13 19:28:15 sandervl Exp $ */
 
 /*
@@ -49 +49 @@
 #include "mmap.h"
 #include <wprocess.h>
+
+//Define COMMIT_ALL to let the pe loader commit all sections of the image
+//This is very useful during debugging as you'll get lots of exceptions
+//otherwise.
+#define COMMIT_ALL
 
 char szErrorTitle[]     = "Odin";
@@ -478 +483 @@
         commitPage((ULONG)pFixups, FALSE);
    }
-//   if(fh.Characteristics & IMAGE_FILE_DLL) {
-        if(processExports((char *)win32file) == FALSE) {
-                dprintf((LOG, "Failed to process exported apis" ));
-                goto failure;
-        }
-//   }
-  }
-
-  for (i=0; i<nSections; i++) {
+#ifdef COMMIT_ALL
+   for (i=0; i<nSections; i++) {
         commitPage((ULONG)section[i].realvirtaddr, FALSE, COMPLETE_SECTION);
-  }
+   }
+#else
+   for (i=0; i<nSections; i++) {
+        switch(section[i].type)
+        {
+        case SECTION_IMPORT:
+        case SECTION_RELOC:
+        case SECTION_EXPORT:
+                commitPage((ULONG)section[i].realvirtaddr, FALSE, COMPLETE_SECTION);
+                break;
+        }
+   }
+#endif
+   if(processExports((char *)win32file) == FALSE) {
+        dprintf((LOG, "Failed to process exported apis" ));
+        goto failure;
+   }
+  }
+#ifdef COMMIT_ALL
+  else {
+   for (i=0; i<nSections; i++) {
+        commitPage((ULONG)section[i].realvirtaddr, FALSE, COMPLETE_SECTION);
+   }
+  }
+#endif
 
   //SvL: Use pointer to image header as module handle now. Some apps needs this
@@ -895 +917 @@
                                 }
                                 //SvL: Read page from disk
-                                commitPage(newpage, TRUE, SINGLE_PAGE);
+                                commitPage(newpage, FALSE, SINGLE_PAGE);
 
                                 //SvL: Enable write access
@@ -1414 +1436 @@
         j++;
         if((ulCurFixup & 0xfff) == 0) {
-                commitPage(ulCurFixup & ~0xfff, TRUE, SINGLE_PAGE);
+                commitPage(ulCurFixup & ~0xfff, FALSE, SINGLE_PAGE);
                 DosSetMem((PVOID)(ulCurFixup & ~0xfff), PAGE_SIZE, PAG_READ|PAG_WRITE);
                 nrPages++;