Changeset 6975 for trunk/src

Timestamp:

Oct 9, 2001, 10:25:21 PM (24 years ago)

Author:

sandervl

Message:

Image header page must be readonly + disabled high memory usage for heap

Location:

trunk/src/kernel32

Files:

• os2heap.cpp (modified) (2 diffs)
• oslibdebug.cpp (modified) (5 diffs)
• virtual.cpp (modified) (2 diffs)
• winimagebase.h (modified) (2 diffs)
• winimagepeldr.cpp (modified) (6 diffs)

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.25 2001-10-06 19:08:03 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.26 2001-10-09 20:25:20 sandervl Exp $ */
 
 /*
@@ -325 +325 @@
   *size = (*size / 65536) * 65536 + 65536;
 
-  rc = DosAllocMem(&newblock, *size, flAllocMem|PAG_READ|PAG_WRITE|PAG_COMMIT|PAG_EXECUTE);
+  rc = DosAllocMem(&newblock, *size, PAG_READ|PAG_WRITE|PAG_COMMIT|PAG_EXECUTE);
+////  rc = DosAllocMem(&newblock, *size, flAllocMem|PAG_READ|PAG_WRITE|PAG_COMMIT|PAG_EXECUTE);
   if(rc != 0) {
         dprintf(("getmoreHeapMem: DosAllocMem failed with %d", rc));

trunk/src/kernel32/oslibdebug.cpp

@@ -1 @@
-/* $Id: oslibdebug.cpp,v 1.5 2000-11-20 09:52:37 sandervl Exp $ */
+/* $Id: oslibdebug.cpp,v 1.6 2001-10-09 20:25:20 sandervl Exp $ */
 
 /*
@@ -173 +173 @@
         lpde->u.LoadDll.hFile = 0;
         // TODO: make a pe fakeheader in our DLL's (kernel32,...)
-        lpde->u.LoadDll.lpBaseOfDll = WINIMAGE_LOOKUPADDR(winmod);
+        lpde->u.LoadDll.lpBaseOfDll = (PVOID)winmod->getInstanceHandle();
         lpde->u.LoadDll.dwDebugInfoFileOffset = 0;
         lpde->u.LoadDll.nDebugInfoSize = 0;
@@ -281 +281 @@
         lpde->dwProcessId = *pid;
         lpde->dwThreadId = 0;
-        lpde->u.UnloadDll.lpBaseOfDll = WINIMAGE_LOOKUPADDR(winmod);
+        lpde->u.UnloadDll.lpBaseOfDll = (PVOID)winmod->getInstanceHandle();
         DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
         break;
@@ -414 +414 @@
     lpde->dwThreadId = 0;
     lpde->u.LoadDll.hFile = 0;
-    lpde->u.LoadDll.lpBaseOfDll = WINIMAGE_LOOKUPADDR(winmod);
+    lpde->u.LoadDll.lpBaseOfDll = (PVOID)winmod->getInstanceHandle();
     lpde->u.LoadDll.dwDebugInfoFileOffset = 0;
     lpde->u.LoadDll.nDebugInfoSize = 0;
@@ -427 +427 @@
     lpde->dwProcessId = getpid(); // debuggee pid
     lpde->dwThreadId = 0;
-    lpde->u.UnloadDll.lpBaseOfDll = WINIMAGE_LOOKUPADDR(winmod);
+    lpde->u.UnloadDll.lpBaseOfDll = (PVOID)winmod->getInstanceHandle();
     DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
   }

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.39 2001-09-10 11:03:13 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.40 2001-10-09 20:25:20 sandervl Exp $ */
 
 /*
@@ -652 +652 @@
       pmbiBuffer->State = MEM_RESERVE;
 
+  //TODO: MEM_MAPPED & MEM_IMAGE (==SEC_IMAGE)
   if(!(dAttr & PAG_SHARED))
         pmbiBuffer->Type = MEM_PRIVATE;

trunk/src/kernel32/winimagebase.h

@@ -1 @@
-/* $Id: winimagebase.h,v 1.19 2001-06-10 22:32:17 sandervl Exp $ */
+/* $Id: winimagebase.h,v 1.20 2001-10-09 20:25:20 sandervl Exp $ */
 
 /*
@@ -175 +175 @@
 };
 
-//SvL: This structure is placed at the end of the first page of the image (header
-//     page), so we can determine the Win32Image pointer from a HINSTANCE variable
-//     (which is actually the address of the win32 module)
-typedef struct
-{
-  ULONG           magic1;
-  Win32ImageBase *image;
-  ULONG           magic2;
-} WINIMAGE_LOOKUP;
-
-#define WINIMAGE_LOOKUPADDR(a)  (WINIMAGE_LOOKUP *)((ULONG)a + PAGE_SIZE - sizeof(WINIMAGE_LOOKUP))
-
 #endif //__WINIMAGEBASE_H__

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.89 2001-07-03 06:53:39 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.90 2001-10-09 20:25:21 sandervl Exp $ */
 
 /*
@@ -293 +293 @@
             for (i=0; i<nSections; i++)
             {
+                dprintf((LOG, "Section:              %-8s", psh[i].Name ));
                 dprintf((LOG, "Raw data size:        %x", psh[i].SizeOfRawData ));
                 dprintf((LOG, "Virtual Address:      %x", psh[i].VirtualAddress ));
@@ -749 +750 @@
         size        = 4096;
         sectionsize = 4096;
-        protflags   = PAG_READ|PAG_WRITE; //readonly?
+        //Header page must be readonly (same as in NT)
+        protflags   = PAG_READ;
         section = findPreviousSectionByOS2Addr(virtAddress);
         if(section == NULL) {//access to header
@@ -779 +781 @@
         }
     }
-    if(fPageCmd == COMPLETE_SECTION && section->type == SECTION_DEBUG) {//ignore
+    if(fPageCmd == COMPLETE_SECTION && (section && section->type == SECTION_DEBUG)) {//ignore
         return TRUE;
     }
@@ -970 +972 @@
 {
  ULONG lowestAddr = 0xffffffff;
- ULONG index = -1;
+ LONG  index = -1;
 
     for(int i=0;i<nrsections;i++) {
-        if(section[i].realvirtaddr > addr) {
+        if(section[i].realvirtaddr <= addr) {
             if(section[i].realvirtaddr < lowestAddr) {
                 lowestAddr = section[i].realvirtaddr;
@@ -1052 +1054 @@
 {
  int i;
- WINIMAGE_LOOKUP *imgLookup;
-
-  imgLookup = WINIMAGE_LOOKUPADDR(realBaseAddress);
-  imgLookup->magic1 = MAGIC_WINIMAGE;
-  imgLookup->image  = this;
-  imgLookup->magic2 = MAGIC_WINIMAGE;
 
   // Process all the image sections