Changeset 6354 for trunk/src

Timestamp:

Jul 17, 2001, 2:10:22 PM (24 years ago)

Author:

sandervl

Message:

heap changes/fixes

Location:

trunk/src/kernel32

Files:

• heap.cpp (modified) (7 diffs)
• os2heap.cpp (modified) (9 diffs)
• os2heap.h (modified) (3 diffs)

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.31 2001-07-08 07:14:45 sandervl Exp $ */
+/* $Id: heap.cpp,v 1.32 2001-07-17 12:10:21 sandervl Exp $ */
 
 /*
@@ -139 +139 @@
 ODINFUNCTIONNODBG3(BOOL, HeapValidate, HANDLE, hHeap, DWORD, dwFlags, LPCVOID, lpMem)
 {
-  dprintf(("KERNEL32:  HeapValidate - stub\n"));
-  return(TRUE);
+ OS2Heap *curheap = OS2Heap::find(hHeap);
+
+  dprintf2(("KERNEL32: HeapValidate %x %x %x", hHeap, dwFlags, lpMem));
+  if(curheap == NULL)
+        return FALSE;
+
+  return curheap->Validate(dwFlags, lpMem);
 }
 //******************************************************************************
@@ -289 +294 @@
 
 
+   if(hmem == NULL || ISPOINTER(hmem)) {
+      dprintf(("KERNEL32: GlobalLock %x returned %x", hmem, hmem));
+      return (LPVOID) hmem;
+   }
+
    /* verify lpMem address */
    if (hmem >= (HGLOBAL)ulMaxAddr || hmem < (HGLOBAL)0x10000)
@@ -295 +305 @@
         DebugInt3();
         return 0;
-   }
-
-   if(hmem == NULL || ISPOINTER(hmem)) {
-      dprintf(("KERNEL32: GlobalLock %x returned %x", hmem, hmem));
-      return (LPVOID) hmem;
    }
 
@@ -338 +343 @@
    dprintf(("KERNEL32: GlobalUnlock %x", hmem));
 
+   if(hmem == NULL || ISPOINTER(hmem))
+      return FALSE;
+
    /* verify lpMem address */
    if (hmem >= (HGLOBAL)ulMaxAddr || hmem < (HGLOBAL)0x10000)
@@ -345 +353 @@
         return 0;
    }
-
-   if(hmem == NULL || ISPOINTER(hmem))
-      return FALSE;
 
    /* HeapLock(GetProcessHeap()); */
@@ -481 +486 @@
    PGLOBAL32_INTERN     pintern;
    DWORD heap_flags = (flags & GMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0;
+
+#ifdef __WIN32OS2__
+   hmem = GlobalHandle((LPCVOID)hmem);
+#endif
 
    hnew = 0;

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.19 2001-07-06 13:47:19 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.20 2001-07-17 12:10:21 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 #include <stdlib.h>
 #include <string.h>
+#include <umalloc.h>
 
 #include "win32type.h"
@@ -41 +42 @@
 VMutex heaplistmutex;   //protects linked lists of heaps
 
+void * _LNK_CONV getmoreHeapMem(Heap_t pHeap, size_t *size, int *clean);
+void _LNK_CONV   releaseHeapMem(Heap_t pHeap, void *block, size_t size);
+
 //******************************************************************************
 //******************************************************************************
@@ -54 +58 @@
 
   this->dwMaximumSize = dwMaximumSize;
-  this->dwInitialSize = dwInitialSize;
+  this->dwInitialSize = (dwInitialSize) ? dwInitialSize : 0x4000;
   this->flOptions     = flOptions;
 
@@ -77 +81 @@
 
   heaplistmutex.leave();
+
+  APIRET rc;
+
+  rc = DosAllocMem((PPVOID)&pInitialHeapMem, dwInitialSize, PAG_READ|PAG_WRITE|PAG_COMMIT);
+  if(rc != 0) {
+        dprintf(("OS2Heap::OS2Heap: DosAllocSharedMem failed with %d", rc));
+        DebugInt3();
+  }
+  uheap = _ucreate(pInitialHeapMem, dwInitialSize, _BLOCK_CLEAN,
+                   _HEAP_REGULAR, getmoreHeapMem, releaseHeapMem);
+  if(uheap == NULL) {
+        DosFreeMem(pInitialHeapMem);
+        pInitialHeapMem = NULL;
+        dprintf(("OS2Heap::OS2Heap: _ucreate failed!"));
+        DebugInt3();
+  }
 }
 //******************************************************************************
@@ -116 +136 @@
   }
   heaplistmutex.leave();
+
+  if(uheap) {
+        _uclose(uheap);
+        _udestroy(uheap, _FORCE);
+        uheap = NULL;
+  }
+  if(pInitialHeapMem) {
+        DosFreeMem(pInitialHeapMem);
+        pInitialHeapMem = NULL;
+  }
+
   dprintf(("dtr OS2Heap, hPrimaryHeap = %X done\n", hPrimaryHeap));
 }
@@ -126 +157 @@
 
 //  dprintf(("OS2Heap::Alloc\n"));
-  lpMem = malloc(dwBytes + HEAP_OVERHEAD);
+  lpMem = _umalloc(uheap, dwBytes + HEAP_OVERHEAD);
   if(lpMem == NULL) {
       dprintf(("OS2Heap::Alloc, lpMem == NULL"));
@@ -274 +305 @@
 BOOL OS2Heap::Validate(DWORD dwFlags, LPCVOID lpMem)
 {
-  dprintf(("OS2Heap::Validate, %X %X - stub? (TRUE)\n", dwFlags, lpMem));
+  HEAPELEM *helem = GET_HEAPOBJ(lpMem);
+
+  dprintf(("OS2Heap::Validate, %X %X", dwFlags, lpMem));
+
+  if(lpMem == NULL) {
+        dprintf(("OS2Heap::Validate lpMem == NULL\n"));
+        return(FALSE);
+  }
+  /* verify lpMem address */
+  if (lpMem >= (LPVOID)ulMaxAddr || lpMem < (LPVOID)0x10000)
+  {
+        dprintf(("OS2Heap::Validate BAD HEAP POINTER:%X\n", lpMem));
+        return FALSE;
+  }
+
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+        dprintf(("OS2Heap::Validate BAD HEAP POINTER:%X\n", lpMem));
+        return FALSE;
+  }
   return(TRUE);
 }
@@ -307 +357 @@
 //******************************************************************************
 OS2Heap *OS2Heap::heap = NULL;
+
+//******************************************************************************
+//******************************************************************************
+void * _LNK_CONV getmoreHeapMem(Heap_t pHeap, size_t *size, int *clean)
+{
+ APIRET rc;
+ PVOID newblock;
+
+  dprintf(("KERNEL32: getmoreHeapMem(%08xh, %08xh, %08xh)", pHeap, *size, *clean));
+
+  /* round the size up to a multiple of 4K */
+  *size = (*size / 4096) * 4096 + 4096;
+
+  rc = DosAllocMem(&newblock, *size, PAG_READ|PAG_WRITE|PAG_COMMIT|PAG_EXECUTE);
+  if(rc != 0) {
+        dprintf(("getmoreHeapMem: DosAllocMem failed with %d", rc));
+        return FALSE;
+  }
+  *clean = _BLOCK_CLEAN;
+  dprintf(("KERNEL32: getmoreHeapMem %x %d", newblock, *size));
+  return newblock;
+}
+//******************************************************************************
+//******************************************************************************
+void _LNK_CONV releaseHeapMem(Heap_t pHeap, void *block, size_t size)
+{
+  dprintf(("KERNEL32: releaseHeapMem %x %x %d", pHeap, block, size));
+  DosFreeMem(block);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/os2heap.h

@@ -1 @@
-/* $Id: os2heap.h,v 1.5 2001-07-06 13:47:19 sandervl Exp $ */
+/* $Id: os2heap.h,v 1.6 2001-07-17 12:10:22 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 
 #include "vmutex.h"
+#include <umalloc.h>
 
 #define MAGIC_NR_HEAP  0x87654321
@@ -61 +62 @@
     HEAPELEM *heapelem;
 
+    char     *pInitialHeapMem;
+    Heap_t    uheap;
+
           OS2Heap *next;
    static OS2Heap *heap;