Changeset 2493 for trunk/src

Timestamp:

Jan 21, 2000, 11:38:53 PM (26 years ago)

Author:

sandervl

Message:

memory map fixes

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (2 diffs)
• oslibdos.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.40 1999-12-28 19:16:34 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.41 2000-01-21 22:38:52 sandervl Exp $ */
 
 /*
@@ -401 +401 @@
 int WIN32API MulDiv(int arg1, int arg2, int  arg3)
 {
-    dprintf(("KERNEL32:  OS2MulDiv %d*%d/%d\n", arg1, arg2, arg3));
+    dprintf2(("KERNEL32:  MulDiv %d*%d/%d\n", arg1, arg2, arg3));
     if(arg3 == 0)
         return 0;

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.15 2000-01-03 21:36:11 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.16 2000-01-21 22:38:53 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -72 +72 @@
   rc = DosAliasMem(pb, cb, ppbAlias, 2);
   if(rc) {
-        dprintf(("OSLibDosAliasMem: DosAliasMem %x %x return %d", pb, cb, rc));
+        dprintf(("OSLibDosAliasMem: DosAliasMem %x %x returned %d", pb, cb, rc));
         return rc;
   }

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.27 1999-12-29 12:39:09 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.28 2000-01-21 22:38:53 sandervl Exp $ */
 
 /*
@@ -688 +688 @@
  ULONG  baseAddress;
 
-  if(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) {
+  //SvL: We don't care where the image is loaded for resource lookup
+  if(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED && loadType == REAL_LOAD) {
         return allocFixedMem(reservedMem);
   }