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

Timestamp:

Nov 9, 1999, 8:22:33 PM (26 years ago)

Author:

sandervl

Message:

thread fixes + heap wrappers

File:

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

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.14 1999-08-21 16:29:26 sandervl Exp $ */
+/* $Id: heap.cpp,v 1.15 1999-11-09 19:22:32 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #include "os2heap.h"
 #include <heap.h>
+#include <odinwrap.h>
 
 static HANDLE processheap = NULL;
@@ -23 +24 @@
 //******************************************************************************
 //******************************************************************************
-LPVOID WIN32API HeapAlloc(HANDLE hHeap, DWORD dwFlags, DWORD dwBytes)
-{
- OS2Heap *curheap = OS2Heap::find(hHeap);
-
-//  dprintf(("HeapAlloc %X bytes", dwBytes));
+ODINFUNCTIONNODBG3(LPVOID, HeapAlloc, HANDLE, hHeap, DWORD, dwFlags, 
+                   DWORD, dwBytes)
+{
+ OS2Heap *curheap = OS2Heap::find(hHeap);
+
+  dprintf2(("HeapAlloc %X bytes", dwBytes));
   if(curheap == NULL)
         return(NULL);
@@ -35 +37 @@
 //******************************************************************************
 //******************************************************************************
-LPVOID WIN32API HeapReAlloc(HANDLE hHeap, DWORD dwFlags, LPVOID lpMem, DWORD dwBytes)
-{
- OS2Heap *curheap = OS2Heap::find(hHeap);
-
+ODINFUNCTIONNODBG4(LPVOID, HeapReAlloc, HANDLE, hHeap, DWORD, dwFlags, LPVOID, 
+                   lpMem, DWORD, dwBytes)
+{
+ OS2Heap *curheap = OS2Heap::find(hHeap);
+
+  dprintf2(("HeapReAlloc %X bytes", dwBytes));
   if(curheap == NULL)
         return(NULL);
@@ -46 +50 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API HeapFree(HANDLE hHeap, DWORD dwFlags, LPVOID lpMem)
-{
- OS2Heap *curheap = OS2Heap::find(hHeap);
-
+ODINFUNCTIONNODBG3(BOOL, HeapFree, HANDLE, hHeap, DWORD, dwFlags, LPVOID, lpMem)
+{
+ OS2Heap *curheap = OS2Heap::find(hHeap);
+
+  dprintf2(("HeapFree %X", lpMem));
   if(curheap == NULL)
         return(FALSE);
@@ -57 +62 @@
 //******************************************************************************
 //******************************************************************************
-HANDLE WIN32API HeapCreate(DWORD flOptions, DWORD dwInitialSize, DWORD dwMaximumSize)
+ODINFUNCTIONNODBG3(HANDLE, HeapCreate, DWORD, flOptions, DWORD, dwInitialSize, 
+                   DWORD, dwMaximumSize)
 {
  OS2Heap *curheap;
 
   //Create Open32 heap for it's handle
+  dprintf2(("HeapCreate dwInitialSize %X", dwInitialSize));
   HANDLE hHeap = O32_HeapCreate(flOptions, 0, 4096);
   if(hHeap == NULL)
@@ -84 +91 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API HeapDestroy(HANDLE hHeap)
-{
- OS2Heap *curheap = OS2Heap::find(hHeap);
-
+ODINFUNCTIONNODBG1(BOOL, HeapDestroy, HANDLE, hHeap)
+{
+ OS2Heap *curheap = OS2Heap::find(hHeap);
+
+  dprintf2(("HeapDestroy %X", hHeap));
   if(curheap == NULL)
         return(FALSE);
@@ -97 +105 @@
 //******************************************************************************
 //******************************************************************************
-DWORD WIN32API HeapSize(HANDLE hHeap, DWORD arg2, PVOID  arg3)
-{
- OS2Heap *curheap = OS2Heap::find(hHeap);
-
+ODINFUNCTIONNODBG3(DWORD, HeapSize, HANDLE, hHeap, DWORD, arg2, PVOID, arg3)
+{
+ OS2Heap *curheap = OS2Heap::find(hHeap);
+
+  dprintf2(("HeapSize %X %x", hHeap, arg2));
   if(curheap == NULL)
         return(0);
@@ -108 +117 @@
 //TODO: Check this!!!
 //******************************************************************************
-DWORD WIN32API HeapCompact(HANDLE hHeap, DWORD dwFlags)
+ODINFUNCTIONNODBG2(DWORD, HeapCompact, HANDLE, hHeap, DWORD, dwFlags)
 {
   dprintf(("KERNEL32:  HeapCompact: Unknown API - stub\n"));
@@ -115 +124 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API HeapValidate(HANDLE hHeap, DWORD dwFlags, LPCVOID lpMem)
+ODINFUNCTIONNODBG3(BOOL, HeapValidate, HANDLE, hHeap, DWORD, dwFlags, LPCVOID, lpMem)
 {
   dprintf(("KERNEL32:  HeapValidate - stub\n"));
@@ -122 +131 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API HeapUnlock(HANDLE hHeap)
+ODINFUNCTIONNODBG1(BOOL, HeapUnlock, HANDLE, hHeap)
 {
   dprintf(("KERNEL32:  HeapUnlock - stub (TRUE)\n"));
@@ -129 +138 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API HeapLock(HANDLE hHeap)
+ODINFUNCTIONNODBG1(BOOL, HeapLock, HANDLE, hHeap)
 {
   dprintf(("KERNEL32:  HeapLock - stub (TRUE)\n"));
@@ -137 +146 @@
 //    LPPROCESS_HEAP_ENTRY lpEntry
 //******************************************************************************
-BOOL WIN32API HeapWalk(HANDLE hHeap, void *lpEntry)
+ODINFUNCTIONNODBG2(BOOL, HeapWalk, HANDLE, hHeap, LPVOID, lpEntry)
 {
   dprintf(("KERNEL32:  HeapWalk - stub (TRUE)\n"));
@@ -144 +153 @@
 //******************************************************************************
 //******************************************************************************
-HANDLE WIN32API GetProcessHeap(VOID)
+ODINFUNCTIONNODBG0(HANDLE, GetProcessHeap)
 {
  HANDLE hHeap;
 
-//    dprintf(("KERNEL32:  OS2GetProcessHeap\n"));
+    dprintf2(("KERNEL32: GetProcessHeap\n"));
     //SvL: Only one process heap per process
     if(processheap == NULL) {