Changeset 5605 for trunk/src

Timestamp:

Apr 27, 2001, 7:35:41 PM (24 years ago)

Author:

sandervl

Message:

HeapReAlloc change

Location:

trunk/src/kernel32

Files:

• heap.cpp (modified) (2 diffs)
• kernel32.mak (modified) (2 diffs)
• misc.cpp (modified) (2 diffs)
• os2heap.cpp (modified) (2 diffs)

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.25 2001-02-11 17:24:09 sandervl Exp $ */
+/* $Id: heap.cpp,v 1.26 2001-04-27 17:35:40 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
 
   rc = curheap->Alloc(dwFlags, dwBytes);
-  dprintf2(("HeapAlloc %X bytes -> %x", dwBytes, rc));
+  dprintf2(("HeapAlloc %d bytes -> %x", dwBytes, rc));
   return rc;
 }

trunk/src/kernel32/kernel32.mak

@@ -1 @@
-# $Id: kernel32.mak,v 1.4 2001-04-26 13:22:48 sandervl Exp $
+# $Id: kernel32.mak,v 1.5 2001-04-27 17:35:40 sandervl Exp $
 
 #
@@ -6 +6 @@
 #       kernel32.dll makefile
 #
+
+#
+# Alternate makefile name.
+#
+MAKEFILE=kernel32.mak
 
 #

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.33 2001-03-21 12:32:55 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.34 2001-04-27 17:35:41 sandervl Exp $ */
 
 /*
@@ -255 +255 @@
 #if defined(DEBUG) && defined(CHECK_ODINHEAP)
 int checkOdinHeap = 1;
-#define ODIN_HEAPCHECK()    if(checkOdinHeap)   _heap_check();
+int checkingheap = 0;
+#define ODIN_HEAPCHECK() \
+        if(checkingheap) checkOdinHeap = 0; \
+        checkingheap++; \
+        if(checkOdinHeap)   _heap_check(); \
+        checkingheap--;
 #else
 #define ODIN_HEAPCHECK()

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.16 2001-03-13 18:45:33 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.17 2001-04-27 17:35:41 sandervl Exp $ */
 
 /*
@@ -300 +300 @@
 
   oldSize = Size(0,lpMem);
-  if (oldSize == dwBytes) return lpMem; // if reallocation with same size
-                                        // don't do anything
+  if (oldSize >= dwBytes) {
+       dprintf(("ReAlloc with smaller size than original (%d); return old pointer", oldSize));
+       return lpMem; // if reallocation with same size don't do anything
+  }
   lpNewMem = Alloc(dwFlags, dwBytes);
   memcpy(lpNewMem, lpMem, dwBytes < oldSize ? dwBytes : oldSize);