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

Timestamp:

Sep 8, 2000, 8:07:52 PM (25 years ago)

Author:

sandervl

Message:

exception changes, implemented enumresourcelanguages + put back some old code

File:

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

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.21 2000-09-08 04:28:46 phaller Exp $ */
+/* $Id: heap.cpp,v 1.22 2000-09-08 18:07:50 sandervl Exp $ */
 
 /*
@@ -180 +180 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG2(HLOCAL, LocalAlloc,
-                   UINT,   fuFlags,
-                   DWORD,  cbBytes)
+HLOCAL WIN32API LocalAlloc(UINT fuFlags, DWORD cbBytes)
 {
  HLOCAL lmem;
@@ -219 +217 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG1(HLOCAL, LocalFree,
-                   HLOCAL, hMem)
-{
-  if(OS2ProcessHeap->GetLockCnt((LPVOID)hMem) != 0)
-  {
-    dprintf(("LocalFree, lock count != 0\n"));
-    return(hMem);   //TODO: SetLastError
-  }
-  if(OS2ProcessHeap->Free(0, (LPVOID)hMem) == FALSE) 
-  {
-    return(hMem);   //TODO: SetLastError
+HLOCAL WIN32API LocalFree(HLOCAL hMem)
+{
+  dprintf(("KERNEL32: LocalFree %X\n", hMem));
+
+  if(OS2ProcessHeap->GetLockCnt((LPVOID)hMem) != 0) {
+        dprintf(("LocalFree, lock count != 0\n"));
+        return(hMem);   //TODO: SetLastError
+  }
+  if(OS2ProcessHeap->Free(0, (LPVOID)hMem) == FALSE) {
+        return(hMem);   //TODO: SetLastError
   }
   return NULL; //success
@@ -252 +249 @@
 //TODO: cbBytes==0 && fuFlags & LMEM_MOVEABLE not handled!!
 //******************************************************************************
-ODINFUNCTIONNODBG3(HLOCAL, LocalReAlloc,
-                   HLOCAL, hMem,
-                   DWORD,  cbBytes,
-                   UINT,   fuFlags)
+HLOCAL WIN32API LocalReAlloc(HLOCAL hMem, DWORD cbBytes, UINT fuFlags)
 {
   HLOCAL hLocalNew;
   LPVOID 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)
@@ -322 +318 @@
 }
 //******************************************************************************
+#ifdef DEBUG
+static ULONG totalGlobalAlloc = 0;
+#endif
 //******************************************************************************
 HGLOBAL WIN32API GlobalAlloc(UINT fuFlags, DWORD dwBytes)
 {
-    dprintf(("KERNEL32:  GlobalAlloc %d\n", dwBytes));
-
-    return O32_GlobalAlloc(fuFlags, dwBytes);
+ HGLOBAL ret;
+
+    ret = O32_GlobalAlloc(fuFlags, dwBytes);
+#ifdef DEBUG
+    totalGlobalAlloc += dwBytes;
+#endif
+    dprintf(("KERNEL32: GlobalAlloc %x %d returned %x (total %x)", fuFlags, dwBytes, ret, totalGlobalAlloc));
+    return ret;
 }
 //******************************************************************************
@@ -333 +337 @@
 HGLOBAL WIN32API GlobalFree( HGLOBAL arg1)
 {
-    dprintf(("KERNEL32:  GlobalFree\n"));
-
-    return O32_GlobalFree(arg1);
+ HGLOBAL ret;
+
+#ifdef DEBUG
+    totalGlobalAlloc -= O32_GlobalSize(arg1);
+#endif
+    ret = O32_GlobalFree(arg1);
+    dprintf(("KERNEL32: GlobalFree %x returned %x (lasterr=%x) total %x", arg1, ret, GetLastError(), totalGlobalAlloc));
+    return ret;
 }
 //******************************************************************************
@@ -365 +374 @@
 PVOID WIN32API GlobalLock(HGLOBAL arg1)
 {
-    dprintf(("KERNEL32: GlobalLock\n"));
-
-    return O32_GlobalLock(arg1);
+ PVOID ret;
+
+    ret = O32_GlobalLock(arg1);
+    dprintf(("KERNEL32: GlobalLock %x returned %x", arg1, ret));
+    return ret;
 }
 //******************************************************************************