Changeset 2513 for trunk/src

Timestamp:

Jan 25, 2000, 9:27:58 PM (26 years ago)

Author:

sandervl

Message:

Allocate low memory at right address and with right size in peldr.dll (fixes install of Windows Media Player)

Location:

trunk/src

Files:

• kernel32/initterm.cpp (modified) (2 diffs)
• kernel32/winimagepeldr.cpp (modified) (2 diffs)
• peldr/initterm.cpp (modified) (8 diffs)

trunk/src/kernel32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.32 1999-12-29 18:49:50 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.33 2000-01-25 20:27:16 sandervl Exp $ */
 
 /*
@@ -121 +121 @@
 
             PROFILE_LoadOdinIni();
-//            if(RegisterLxDll(hModule, 0, 0) == FALSE)
             if(RegisterLxDll(hModule, 0, (PVOID)&_Resource_PEResTab) == FALSE)
                 return 0UL;

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.28 2000-01-21 22:38:53 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.29 2000-01-25 20:27:17 sandervl Exp $ */
 
 /*
@@ -770 +770 @@
   realBaseAddress = 0;
 
+#if 1
+  //Allocated in peldr.dll
+  if(reservedMem && reservedMem == oh.ImageBase) {
+        realBaseAddress = oh.ImageBase;
+        return TRUE;
+  }
+#else
   if(reservedMem && reservedMem <= oh.ImageBase &&
      ((oh.ImageBase - reservedMem) + imageSize < PELDR_RESERVEDMEMSIZE))
   {
-        //ok, it fits perfectly
-        realBaseAddress = oh.ImageBase;
-        return TRUE;
-  }
+        //ok, it fits perfectly; free it now and allocate it below
+        DosFreeMem((PVOID)reservedMem);
+//              realBaseAddress = oh.ImageBase;
+//      return TRUE;
+  }
+#endif
 
   //Reserve enough space to store 4096 pointers to 1MB memory chunks

trunk/src/peldr/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.3 1999-09-15 23:26:08 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.4 2000-01-25 20:27:58 sandervl Exp $ */
 
 /*
@@ -26 +26 @@
 #define  INCL_DOSMODULEMGR
 #define  INCL_DOSPROCESS
+#define  INCL_DOSMISC
 #include <os2.h>
 #include <stdlib.h>
@@ -34 +35 @@
 #include <winimagepeldr.h>
 
+#ifndef PAG_ANY
+    #define PAG_ANY    0x00000400
+#endif
+
+#ifndef QSV_VIRTUALADDRESSLIMIT
+    #define QSV_VIRTUALADDRESSLIMIT 30
+#endif
+
+#define FALLOC_SIZE (1024*1024)
+
 /*-------------------------------------------------------------------*/
 /* A clean up routine registered with DosExitList must be used if    */
@@ -43 +54 @@
 
 ULONG reservedMemory = 0;
+
+void AllocateExeMem(char *filename);
 
 /****************************************************************************/
@@ -65 +78 @@
 
    switch (ulFlag) {
-      case 0 :
+   case 0 :
+   {
+        PTIB ptib;
+        PPIB ppib;
+        char *win32app;
 
          /*******************************************************************/
@@ -73 +90 @@
          /*******************************************************************/
 
-         //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)
-         rc = DosAllocMem((PPVOID)&reservedMemory, PELDR_RESERVEDMEMSIZE, PAG_WRITE | PAG_READ);
+         DosGetInfoBlocks(&ptib, &ppib);
+         win32app = ppib->pib_pchcmd + strlen(ppib->pib_pchcmd) + 1;
+         AllocateExeMem(win32app);
 
          /*******************************************************************/
@@ -83 +99 @@
          /*******************************************************************/
          break;
-      case 1 :
+   }
+   case 1 :
          break;
-      default  :
+   default  :
          return 0UL;
    }
@@ -94 +111 @@
    return 1UL;
 }
-
+//******************************************************************************
+//******************************************************************************
 ULONG SYSTEM ReserveMem()
 {
    return reservedMemory;
 }
+//******************************************************************************
+//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;
+ 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;
+
+  tmp = filename;
+  while(*tmp != ' ' && *tmp != 0)
+        tmp++;
+  *tmp = 0;
+
+  strcpy(szFileName, filename);
+  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) {
+        return; //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*124) {
+        flAllocMem = 0;
+  }
+  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:
+  DosClose(dllfile);
+  return;
+}
+//******************************************************************************
+//******************************************************************************