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

Timestamp:

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

Author:

sandervl

Message:

heap changes/fixes

File:

• trunk/src/kernel32/heap.cpp (modified) (7 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;