Changeset 2219 for trunk/src

Timestamp:

Dec 27, 1999, 10:21:33 PM (26 years ago)

Author:

sandervl

Message:

Enable write access for code sections which have this flag set

Location:

trunk/src/kernel32

Files:

• makefile (modified) (2 diffs)
• winimagepeldr.cpp (modified) (17 diffs)

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.72 1999-12-27 18:42:25 sandervl Exp $
+# $Id: makefile,v 1.73 1999-12-27 21:20:48 sandervl Exp $
 
 #
@@ -197 +197 @@
     $(PDWIN32_INCLUDE)\winimagebase.h \
     $(PDWIN32_INCLUDE)\winfakepeldr.h \
+    $(PDWIN32_INCLUDE)\winimagepeldr.h \
     $(PDWIN32_INCLUDE)\versionos2.h \
     $(PDWIN32_INCLUDE)\wprocess.h \

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.25 1999-12-19 17:41:15 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.26 1999-12-27 21:20:48 sandervl Exp $ */
 
 /*
@@ -9 +9 @@
  * Project Odin Software License can be found in LICENSE.TXT
  *
+ * TODO: Check psh[i].Characteristics for more than only the code section
  *
  * NOTE: RSRC_LOAD is a special flag to only load the resource directory
@@ -313 +314 @@
             addSection(SECTION_RELOC, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -320 +321 @@
             addSection(SECTION_EXPORT, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -327 +328 @@
             addSection(SECTION_RESOURCE, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -336 +337 @@
                         addSection(SECTION_TLS, psh[i].PointerToRawData,
                                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                                   psh[i].Misc.VirtualSize);
+                                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
                 }
                 continue;
@@ -345 +346 @@
             addSection(SECTION_DEBUG,  psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -358 +359 @@
             addSection(type, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -371 +372 @@
             addSection(SECTION_CODE, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -378 +379 @@
             addSection(SECTION_READONLYDATA, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -385 +386 @@
             addSection(SECTION_UNINITDATA, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -392 +393 @@
             addSection(SECTION_INITDATA, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -399 +400 @@
             addSection(SECTION_UNINITDATA, psh[i].PointerToRawData,
                    psh[i].SizeOfRawData, psh[i].VirtualAddress + oh.ImageBase,
-                   psh[i].Misc.VirtualSize);
+                   psh[i].Misc.VirtualSize, psh[i].Characteristics);
             continue;
         }
@@ -412 +413 @@
             addSection(SECTION_RESOURCE, sh.PointerToRawData,
                        sh.SizeOfRawData, sh.VirtualAddress + oh.ImageBase,
-                       sh.Misc.VirtualSize);
+                       sh.Misc.VirtualSize, sh.Characteristics);
         }
   }
@@ -659 +660 @@
 //******************************************************************************
 //******************************************************************************
-void Win32PeLdrImage::addSection(ULONG type, ULONG rawoffset, ULONG rawsize, ULONG virtaddress, ULONG virtsize)
+void Win32PeLdrImage::addSection(ULONG type, ULONG rawoffset, ULONG rawsize, ULONG virtaddress, ULONG virtsize, ULONG flags)
 {
   virtsize = max(rawsize, virtsize);
@@ -667 +668 @@
   section[nrsections].rawsize        = rawsize;
   section[nrsections].virtaddr       = virtaddress;
+  section[nrsections].flags          = flags;
 
   virtsize   = ((virtsize - 1) & ~0xFFF) + PAGE_SIZE;
@@ -846 +848 @@
         case (SECTION_CODE | SECTION_IMPORT):
                 section[i].pageflags = PAG_EXECUTE | PAG_READ;
+                if(section[i].flags & IMAGE_SCN_MEM_WRITE) 
+                        section[i].pageflags |= PAG_WRITE;
                 break;
         case SECTION_INITDATA: