Changeset 2513 for trunk/src/kernel32

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/kernel32

Files:

• initterm.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 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