Changeset 550 for trunk/src/kernel32/winimage.cpp

Timestamp:

Aug 18, 1999, 7:18:01 PM (26 years ago)

Author:

sandervl

Message:

PE loader changes

File:

• trunk/src/kernel32/winimage.cpp (modified) (25 diffs)

trunk/src/kernel32/winimage.cpp

@@ -1 @@
-/* $Id: winimage.cpp,v 1.10 1999-08-18 12:24:16 sandervl Exp $ */
+/* $Id: winimage.cpp,v 1.11 1999-08-18 17:18:01 sandervl Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 1998-1999 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 1998 Knut St. Osmundsen
- *
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -35 +34 @@
 #include "unicode.h"
 #include "winres.h"
+#include "os2util.h"
 
 char szErrorTitle[]     = "Win32 for OS/2";
@@ -58 +58 @@
 Win32Image::Win32Image(char *szFileName) :
     errorState(NO_ERROR), entryPoint(0), nrsections(0), imageSize(0),
-    imageVirtBase(-1), baseAddress(0), realBaseAddress(0), imageVirtEnd(0),
+    imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
     szFileName(NULL), NameTable(NULL), Win32Table(NULL), fullpath(NULL),
@@ -73 +73 @@
     foutInit = TRUE;
   }
-  hinstance = (HINSTANCE)this;
   this->szFileName = szFileName;
+
+  strcpy(szModule, StripPath(szFileName));
+  strupr(szModule);
+  char *dot = strstr(szModule, ".");
+  while(dot) {
+        char *newdot = strstr(dot+1, ".");
+        if(newdot == NULL)      break;
+        dot = newdot;
+  }
+  if(dot)
+        *dot = 0;
+
 #ifdef DEBUG
   magic = MAGIC_WINIMAGE;
@@ -83 +94 @@
 Win32Image::Win32Image(HINSTANCE hinstance, int NameTableId, int Win32TableId) :
     errorState(NO_ERROR), entryPoint(0), nrsections(0), imageSize(0),
-    imageVirtBase(-1), baseAddress(0), realBaseAddress(0), imageVirtEnd(0),
+    imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
     szFileName(NULL), NameTable(NULL), Win32Table(NULL), fullpath(NULL),
@@ -93 +104 @@
 #endif
   OS2ImageInit(hinstance, NameTableId, Win32TableId);
+
+  char *name = OS2GetDllName(hinstance);
+  strcpy(szModule, name);
+  strupr(szModule);
+  char *dot = strstr(szModule, ".");
+  while(dot) {
+        char *newdot = strstr(dot+1, ".");
+        if(newdot == NULL)      break;
+        dot = newdot;
+  }
+  if(dot)
+        *dot = 0;
 }
 //******************************************************************************
@@ -378 +401 @@
   }
   fout << "*************************PE SECTIONS END **************************" << endl;
-  imageSize += (imageVirtBase - oh.ImageBase);
+  imageSize += imageVirtBase - oh.ImageBase;
   fout << "Total size of Image " << imageSize << endl;
   fout << "imageVirtBase       " << imageVirtBase << endl;
   fout << "imageVirtEnd        " << imageVirtEnd << endl;
 
+  //In case there are any gaps between sections, adjust size
   if(imageSize != imageVirtEnd - oh.ImageBase) {
         fout << "imageSize != imageVirtEnd - oh.ImageBase!" << endl;
@@ -391 +415 @@
         return(FALSE);
   }
-  fout << "OS/2 base address " << baseAddress << endl;
-  if(storeSections() == FALSE) {
+  fout << "OS/2 base address " << realBaseAddress << endl;
+  if(storeSections((char *)win32file) == FALSE) {
         fout << "Failed to store sections, rc " << errorState << endl;
         return(FALSE);
   }
-  entryPoint = baseAddress + oh.AddressOfEntryPoint;
+  entryPoint = realBaseAddress + oh.AddressOfEntryPoint;
 
   if(tlsDir != NULL) {
@@ -447 +471 @@
         pResDir = (PIMAGE_RESOURCE_DIRECTORY)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_RESOURCE);
   }
+
+  //SvL: Use pointer to image header as module handle now. Some apps needs this
+  hinstance = (HINSTANCE)realBaseAddress;
+
   //set final memory protection flags (storeSections sets them to read/write)
   if(setMemFlags() == FALSE) {
@@ -474 +502 @@
   virtsize   = ((virtsize - 1) & ~0xFFF) + PAGE_SIZE;
   imageSize += virtsize;
-  section[nrsections].virtualsize    = virtsize;
+  section[nrsections].virtualsize = virtsize;
 
   if(virtaddress < imageVirtBase)
         imageVirtBase = virtaddress;
   if(virtaddress + virtsize > imageVirtEnd)
-        imageVirtEnd = virtaddress + virtsize;
+        imageVirtEnd  = virtaddress + virtsize;
 
   nrsections++;
@@ -488 +516 @@
 {
  APIRET rc;
+ ULONG  baseAddress;
 
   if(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) {
@@ -525 +554 @@
 //******************************************************************************
 #define FALLOC_SIZE (1024*1024)
+//NOTE: Needs testing (while loop)
+//TODO: Free unused (parts of) reservedMem
 //******************************************************************************
 BOOL Win32Image::allocFixedMem(ULONG reservedMem)
 {
  ULONG  address = 0;
- ULONG  lastaddress = 0;
- ULONG  firstaddress = 0;
- ULONG  diff, i;
+ ULONG  *memallocs;
+ ULONG  alloccnt = 0;
+ ULONG  diff, i, baseAddress;
  APIRET rc;
 
-  baseAddress = realBaseAddress = 0;
+  realBaseAddress = 0;
   
   if(reservedMem && reservedMem <= oh.ImageBase && 
@@ -541 +572 @@
         //ok, it fits perfectly
         realBaseAddress = oh.ImageBase;
-        baseAddress = oh.ImageBase;
         return TRUE;
+  }
+
+  //Reserve enough space to store 4096 pointers to 1MB memory chunks
+  memallocs = (ULONG *)malloc(4096*sizeof(ULONG *));
+  if(memallocs == NULL) {
+        fout << "allocFixedMem: MALLOC FAILED for memallocs" << endl;
+        return FALSE;
   }
 
@@ -548 +585 @@
         rc = DosAllocMem((PPVOID)&address, FALLOC_SIZE, PAG_READ);
         if(rc) break;
-
-        if(firstaddress == 0)
-                firstaddress = address;
 
         fout << "DosAllocMem returned " << address << endl;
@@ -556 +590 @@
                 if(address > oh.ImageBase) {//we've passed it!
                         DosFreeMem((PVOID)address);
-                        return(FALSE);
+                        break;
                 }
                 //found the right address
                 DosFreeMem((PVOID)address);
-                //align at 64 kb boundary
-                realBaseAddress = oh.ImageBase & 0xFFFF0000;
-                diff = realBaseAddress - address;
+
+                diff = address - oh.ImageBase;
                 if(diff) {
                         rc = DosAllocMem((PPVOID)&address, diff, PAG_READ);
@@ -570 +603 @@
                 if(rc) break;
 
-                if(baseAddress != realBaseAddress) {
-                        fout << "baseAddress != realBaseAddress!!" << endl;
-                        break;
-                }
                 if(diff) DosFreeMem((PVOID)address);
 
-                address = realBaseAddress;
                 realBaseAddress = baseAddress;
-                baseAddress = oh.ImageBase;
                 break;
         }
-        lastaddress = address;
-  }
-  while(firstaddress <= lastaddress) {
-        DosFreeMem((PVOID)firstaddress);
-        firstaddress += FALLOC_SIZE;
-  }
-  if(baseAddress == 0) //Let me guess.. MS Office app?
+        memallocs[alloccnt++] = address;
+  }
+  for(i=0;i<alloccnt;i++) {
+        DosFreeMem((PVOID)memallocs[i]);
+  }
+  free(memallocs);
+
+  if(realBaseAddress == 0) //Let me guess.. MS Office app?
         return(FALSE);
 
@@ -594 +622 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32Image::storeSections()
+BOOL Win32Image::storeSections(char *win32file)
 {
  int i;
  APIRET rc;
  ULONG  pagFlags = PAG_COMMIT;
-
+ ULONG  headersize;
+ WINIMAGE_LOOKUP *imgLookup;
+
+  //Commit memory for image header
+  headersize = sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS) + 
+               sizeof(IMAGE_SECTION_HEADER) * fh.NumberOfSections;
+
+  if(headersize + sizeof(WINIMAGE_LOOKUP) < PAGE_SIZE) {
+        headersize = PAGE_SIZE;
+  }
+  else {//ooops, just in case this doesn't work
+        fout << "ERROR: storeSections: header too big!!!!!! Fatal error" << endl;
+        return FALSE;
+  }
+
+  rc = DosSetMem((PVOID)realBaseAddress, headersize, pagFlags | PAG_WRITE | PAG_READ);
+  if(rc) {
+        fout << "DosSetMem failed for Image header! " << rc << endl;
+        return FALSE;
+  }
+  // Store the NT header at the load addr 
+  memcpy((char *)realBaseAddress, win32file, sizeof(IMAGE_DOS_HEADER));
+  memcpy((char *)PE_HEADER(realBaseAddress), PE_HEADER(win32file), sizeof(IMAGE_NT_HEADERS));
+  memcpy(PE_SECTIONS(realBaseAddress), PE_SECTIONS(win32file),
+         sizeof(IMAGE_SECTION_HEADER) * fh.NumberOfSections );
+
+  imgLookup = WINIMAGE_LOOKUPADDR(realBaseAddress);
+  imgLookup->image = this;
+  imgLookup->magic = MAGIC_WINIMAGE;
+
+  // Process all the image sections
   for(i=0;i<nrsections;i++) {
-        section[i].realvirtaddr = baseAddress + (section[i].virtaddr - oh.ImageBase);
+        section[i].realvirtaddr = realBaseAddress + (section[i].virtaddr - oh.ImageBase);
   }
   for(i=0;i<nrsections;i++) {
@@ -735 +793 @@
  ULONG *fixup;
 
-  fixup   = (ULONG *)(fixupaddr - oh.ImageBase + baseAddress);
+  fixup   = (ULONG *)(fixupaddr - oh.ImageBase + realBaseAddress);
   orgaddr = *fixup;
-  *fixup  = baseAddress + (*fixup - oh.ImageBase);
+  *fixup  = realBaseAddress + (*fixup - oh.ImageBase);
 }
 //******************************************************************************
@@ -746 +804 @@
  USHORT *fixup;
 
-  fixup   = (USHORT *)(fixupaddr - oh.ImageBase + baseAddress);
+  fixup   = (USHORT *)(fixupaddr - oh.ImageBase + realBaseAddress);
   orgaddr = *fixup;
   if(fHighFixup) {
-        *fixup  += (USHORT)((baseAddress - oh.ImageBase) >> 16);
+        *fixup  += (USHORT)((realBaseAddress - oh.ImageBase) >> 16);
   }
   else {
-        *fixup  += (USHORT)((baseAddress - oh.ImageBase) & 0xFFFF);
+        *fixup  += (USHORT)((realBaseAddress - oh.ImageBase) & 0xFFFF);
   }
 }
@@ -762 +820 @@
  ULONG  apiaddr;
 
-  import  = (ULONG *)(impaddr - oh.ImageBase + baseAddress);
+  import  = (ULONG *)(impaddr - oh.ImageBase + realBaseAddress);
   apiaddr = WinDll->getApi(ordinal);
   if(apiaddr == 0) {
@@ -777 +835 @@
  ULONG  apiaddr;
 
-  import = (ULONG *)(impaddr - oh.ImageBase + baseAddress);
+  import = (ULONG *)(impaddr - oh.ImageBase + realBaseAddress);
   apiaddr = WinDll->getApi(impname);
   if(apiaddr == 0) {
@@ -893 +951 @@
         free(tmp);
   }
-  curnameexport->virtaddr = baseAddress + (virtaddr - oh.ImageBase);
+  curnameexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
   curnameexport->ordinal  = ordinal;
   *(ULONG *)curnameexport->name = 0;
@@ -912 +970 @@
         curordexport = ordexports;
   }
-  curordexport->virtaddr = baseAddress + (virtaddr - oh.ImageBase);
+  curordexport->virtaddr = realBaseAddress + (virtaddr - oh.ImageBase);
   curordexport->ordinal  = ordinal;
   curordexport++;
@@ -1241 +1299 @@
   return(0);
 }
-//******************************************************************************
-//******************************************************************************
+/******************************************************************************/
+/******************************************************************************/
 /*heximal(decimal) KSO Sun 24.05.1998*/
 char szHexBuffer[30];