Changeset 2572 for trunk/src

Timestamp:

Jan 30, 2000, 3:48:52 PM (26 years ago)

Author:

sandervl

Message:

fixed error messages for images without fixups

Location:

trunk/src/peldr

Files:

• initterm.cpp (deleted)
• makefile (modified) (2 diffs)
• pe.cpp (modified) (5 diffs)
• pe.h (modified) (3 diffs)
• peldr.def (deleted)

trunk/src/peldr/makefile

@@ -1 @@
-# $Id: makefile,v 1.11 1999-11-13 15:40:51 sandervl Exp $
+# $Id: makefile,v 1.12 2000-01-30 14:48:51 sandervl Exp $
 
 #
@@ -14 +14 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-
-CFLAGS = $(CFLAGS) /Ge+ -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) /Ge+ -I$(PDWIN32_INCLUDE)
-LDFLAGSEXE = $(LDFLAGS) /Ge+ /B"/pmtype:pm /stack:0x100000 /NOBASE /Map" \
-             $(PDWIN32_LIB)\peldr.lib os2386.lib $(PDWIN32_LIB)\odincrt.lib $(RTLLIB_O)
+CFLAGS   = $(CFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
+CXXFLAGS = $(CXXFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
+LDFLAGS  = $(LDFLAGS_ODINCRT) /Ge+ /B"/pmtype:pm /stack:0x100000 /NOBASE /Map" \
+             os2386.lib
 
 
 TARGET = pe
-TARGETDLL = peldr
 
 OBJS =  pe.obj
-OBJSDLL =  initterm.obj
 
-all: $(TARGETDLL).dll $(TARGETDLL).lib $(TARGET).exe
+all: $(TARGET).exe
 
 
 $(TARGET).exe: $(OBJS) makefile
-        $(LD) $(LDFLAGSEXE) -Fe$@ $(OBJS)
+        $(LD) $(LDFLAGS) -Fe$@ $(OBJS)
         $(CP) $(TARGET).exe $(PDWIN32_BIN)
         $(CP) $@ $(PDWIN32_BIN)
 
-$(TARGETDLL).dll: $(OBJSDLL) $(TARGETDLL).def 
-        $(LD) $(LDFLAGS) -Fe$@ $(OBJSDLL) sbsstub.obj $(TARGETDLL).def OS2386.LIB $(RTLLIB)
-        $(CP) $@ $(PDWIN32_BIN)
 
-$(TARGETDLL).lib: $(TARGETDLL).dll
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGETDLL).dll
-        $(CP) $@ $(PDWIN32_LIB)
-
-
-initterm.obj: initterm.cpp
-misc.obj: misc.cpp
-pe.obj: pe.cpp pe.h $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winexebase.h $(PDWIN32_INCLUDE)\exceptions.h ..\kernel32\exceptutil.h
+pe.obj: pe.cpp pe.h $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winexebase.h
 
 clean:
         $(RM) *.obj *.lib *.dll *.map *.pch *.exe
         $(RM) $(PDWIN32_BIN)\$(TARGET).exe
-        $(RM) $(PDWIN32_BIN)\$(TARGETDLL).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGETDLL).lib

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.12 1999-11-24 19:33:04 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.13 2000-01-30 14:48:51 sandervl Exp $ */
 
 /*
@@ -63 +63 @@
 WIN32CTOR              CreateWin32Exe       = 0;
 
+ULONG                  reservedMemory       = 0;
+
+void AllocateExeMem(char *filename);
+
+//******************************************************************************
+//******************************************************************************
 int main(int argc, char *argv[])
 {
@@ -71 +77 @@
  HMODULE hmodPMWin = 0, hmodKernel32 = 0;
 
+  if(argc >= 2) {
+        strcpy(exeName, argv[1]);
+        strupr(exeName);
+        AllocateExeMem(exeName);
+  }
+
   rc = DosLoadModule(exeName, sizeof(exeName), "PMWIN.DLL", &hmodPMWin);
   rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32INITIALIZE, NULL, (PFN *)&MyWinInitialize);
@@ -97 +109 @@
   strcpy(exeName, argv[1]);
   strupr(exeName);
-  if(CreateWin32Exe(exeName, ReserveMem()) == FALSE) {
+  if(CreateWin32Exe(exeName, reservedMemory) == FALSE) {
         goto fail;
   }
@@ -117 +129 @@
 }
 //******************************************************************************
-//******************************************************************************
+//SvL: Reserve memory for win32 exes without fixups
+//     This is done before any Odin or PMWIN dll is loaded, so we'll get
+//     a very low virtual address. (which is exactly what we want)
+//******************************************************************************
+void AllocateExeMem(char *filename)
+{
+ HFILE  dllfile = 0;
+ char   szFileName[CCHMAXPATH], *tmp;
+ ULONG  action, ulRead, signature;
+ APIRET rc;
+ IMAGE_DOS_HEADER doshdr;
+ IMAGE_OPTIONAL_HEADER oh;
+ IMAGE_FILE_HEADER     fh;
+ ULONG  address = 0;
+ ULONG  *memallocs;
+ ULONG  alloccnt = 0;
+ ULONG  diff, i, baseAddress;
+ ULONG  ulSysinfo, flAllocMem = 0;
+
+  strcpy(szFileName, filename);
+  tmp = szFileName;
+  while(*tmp != ' ' && *tmp != 0)
+        tmp++;
+  *tmp = 0;
+
+  if(!strchr(szFileName, '.')) {
+        strcat(szFileName,".EXE");
+  }
+  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 != 0) {
+        if(!strstr(szFileName, ".EXE")) {
+                strcat(szFileName,".EXE");
+        }
+  }
+  else  DosClose(dllfile);
+
+  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) {
+        goto end; //oops
+  }
+
+  //read dos header
+  if(DosRead(dllfile, (LPVOID)&doshdr, sizeof(doshdr), &ulRead)) {
+        goto end;
+  }
+  if(DosSetFilePtr(dllfile, doshdr.e_lfanew, FILE_BEGIN, &ulRead)) {
+        goto end;
+  }
+  //read signature dword
+  if(DosRead(dllfile, (LPVOID)&signature, sizeof(signature), &ulRead)) {
+        goto end;
+  }
+  //read pe header
+  if(DosRead(dllfile, (LPVOID)&fh, sizeof(fh), &ulRead)) {
+        goto end;
+  }
+  //read optional header
+  if(DosRead(dllfile, (LPVOID)&oh, sizeof(oh), &ulRead)) {
+        goto end;
+  }
+  if(doshdr.e_magic != IMAGE_DOS_SIGNATURE || signature != IMAGE_NT_SIGNATURE) {
+        goto end;
+  }
+  if(!(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)) {
+        goto end; //no need to allocate anything now
+  }
+
+  // check for high memory support
+  rc = DosQuerySysInfo(QSV_VIRTUALADDRESSLIMIT, QSV_VIRTUALADDRESSLIMIT, &ulSysinfo, sizeof(ulSysinfo));
+  if (rc == 0 && ulSysinfo > 512)   //VirtualAddresslimit is in MB
+  {
+        flAllocMem = PAG_ANY;      // high memory support. Let's use it!
+  }
+
+  //Reserve enough space to store 4096 pointers to 1MB memory chunks
+  memallocs = (ULONG *)alloca(4096*sizeof(ULONG *));
+  if(memallocs == NULL) {
+        goto end; //oops
+  }
+
+  if(oh.ImageBase < 512*1024*1024) {
+        flAllocMem = 0;
+  }
+  else {
+        if(flAllocMem == 0) {
+                goto end; //no support for > 512 MB
+        }
+  }
+  while(TRUE) {
+        rc = DosAllocMem((PPVOID)&address, FALLOC_SIZE, PAG_READ | flAllocMem);
+        if(rc) break;
+
+        if(address + FALLOC_SIZE >= oh.ImageBase) {
+                if(address > oh.ImageBase) {//we've passed it!
+                        DosFreeMem((PVOID)address);
+                        break;
+                }
+                //found the right address
+                DosFreeMem((PVOID)address);
+
+                diff = oh.ImageBase - address;
+                if(diff) {
+                        rc = DosAllocMem((PPVOID)&address, diff, PAG_READ | flAllocMem);
+                        if(rc) break;
+                }
+                rc = DosAllocMem((PPVOID)&baseAddress, oh.SizeOfImage, PAG_READ | PAG_WRITE | flAllocMem);
+                if(rc) break;
+
+                if(diff) DosFreeMem((PVOID)address);
+
+                reservedMemory = baseAddress;
+                break;
+        }
+        memallocs[alloccnt++] = address;
+  }
+  for(i=0;i<alloccnt;i++) {
+        DosFreeMem((PVOID)memallocs[i]);
+  }
+end:
+  if(dllfile) DosClose(dllfile);
+  return;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/peldr/pe.h

@@ -1 @@
-/* $Id: pe.h,v 1.4 1999-08-16 13:54:07 sandervl Exp $ */
+/* $Id: pe.h,v 1.5 2000-01-30 14:48:51 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #define __PE_H__
 
+#ifndef PAG_ANY
+    #define PAG_ANY    0x00000400
+#endif
+
+#ifndef QSV_VIRTUALADDRESSLIMIT
+    #define QSV_VIRTUALADDRESSLIMIT 30
+#endif
+
+#define FALLOC_SIZE (1024*1024)
+
 extern char szErrorTitle[];
 extern char szMemErrorMsg[];
@@ -23 +33 @@
 extern char szInteralErrorMsg[];
 
-ULONG SYSTEM ReserveMem();
-
 #endif // NOIMAGE