Changeset 37 for trunk/src/kernel32/heap.cpp

Timestamp:

Jun 6, 1999, 2:25:49 PM (26 years ago)

Author:

cbratschi

Message:

hiho

File:

• trunk/src/kernel32/heap.cpp (modified) (7 diffs)

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.4 1999-05-31 23:17:17 phaller Exp $ */
+/* $Id: heap.cpp,v 1.5 1999-06-06 12:25:49 cbratschi Exp $ */
 
 /*
@@ -71 +71 @@
   curheap = new OS2Heap(hHeap, flOptions, dwInitialSize, dwMaximumSize);
   if(curheap == NULL) {
-        O32_HeapDestroy(hHeap);
+        O32_HeapDestroy(hHeap);
         return(NULL);
   }
   if(curheap->getHeapHandle() == NULL) {
-        O32_HeapDestroy(hHeap);
+        O32_HeapDestroy(hHeap);
         delete curheap;
         return(NULL);
@@ -98 +98 @@
 /* PH: Though "HeapSize" is a reserved word for the linker, ILINK can be
    tricked by placing the word HEAPSIZE in quotes. It then exports it properly
-   to the target DLL. 
+   to the target DLL.
  */
 DWORD WIN32API HeapSize(HANDLE hHeap, DWORD arg2, PVOID  arg3)
@@ -154 +154 @@
     //SvL: Only one process heap per process
     if(processheap == NULL) {
-        //TODO: I haven't thought real hard about this.  I added it just to make "hdr.exe" happy.
-        hHeap = O32_HeapCreate(HEAP_GENERATE_EXCEPTIONS, 1, 0x4000);
-        OS2ProcessHeap = new OS2Heap(hHeap, HEAP_GENERATE_EXCEPTIONS, 0x4000, 0);
-        if(OS2ProcessHeap == NULL) {
-                O32_HeapDestroy(hHeap);
-                return(NULL);
-        }
-        processheap = hHeap;
+        //TODO: I haven't thought real hard about this.  I added it just to make "hdr.exe" happy.
+        hHeap = O32_HeapCreate(HEAP_GENERATE_EXCEPTIONS, 1, 0x4000);
+        OS2ProcessHeap = new OS2Heap(hHeap, HEAP_GENERATE_EXCEPTIONS, 0x4000, 0);
+        if(OS2ProcessHeap == NULL) {
+                O32_HeapDestroy(hHeap);
+                return(NULL);
+        }
+        processheap = hHeap;
     }
     return(processheap);
@@ -173 +173 @@
 
   if(processheap == NULL) {
-        if(GetProcessHeap() == NULL)
-                return(NULL);
+        if(GetProcessHeap() == NULL)
+                return(NULL);
   }
   if(fuFlags & LMEM_ZEROINIT)
@@ -209 +209 @@
 
     if(OS2ProcessHeap->GetLockCnt((LPVOID)hMem) != 0) {
-        dprintf(("LocalFree, lock count != 0\n"));
-        return(hMem);   //TODO: SetLastError
+        dprintf(("LocalFree, lock count != 0\n"));
+        return(hMem);   //TODO: SetLastError
     }
     if(OS2ProcessHeap->Free(0, (LPVOID)hMem) == FALSE) {
-        return(hMem);   //TODO: SetLastError
+        return(hMem);   //TODO: SetLastError
     }
     return NULL; //success
@@ -238 +238 @@
 HLOCAL WIN32API LocalReAlloc(HLOCAL hMem, DWORD cbBytes, UINT fuFlags)
 {
- LPVOID lpMem;
+ HLOCAL lpMem;
 
     dprintf(("KERNEL32: LocalReAlloc %X %d %X\n", hMem, cbBytes, fuFlags));
     //SvL: 8-8-'98: Notepad bugfix (assumes address is identical when new size < old size)
-    if(OS2ProcessHeap->Size(0, (LPVOID)hMem) > cbBytes)
-        return hMem;
-
-    lpMem = (LPVOID)O32_LocalAlloc(fuFlags, cbBytes);
-    memcpy(lpMem, (LPVOID)hMem, min(cbBytes, OS2ProcessHeap->Size(0, (LPVOID)hMem)));
+    if(OS2ProcessHeap->Size(0, (LPVOID)hMem) >= cbBytes)
+    {
+        dprintf(("KERNEL32:  LocalReAlloc returned %X\n", hMem));
+        return hMem;
+    }
+
+    lpMem = LocalAlloc(fuFlags, cbBytes);
+    memcpy((LPVOID)lpMem, (LPVOID)hMem, min(cbBytes, OS2ProcessHeap->Size(0, (LPVOID)hMem)));
     OS2ProcessHeap->Free(0, (LPVOID)hMem);
+
+    dprintf(("KERNEL32:  LocalReAlloc returned %X\n", lpMem));
     return((HLOCAL)lpMem);
 }