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

Timestamp:

Feb 9, 2002, 6:27:32 PM (24 years ago)

Author:

sandervl

Message:

logging updates

File:

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

trunk/src/kernel32/heap.cpp

@@ -131 +131 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(HANDLE, HeapCreate, DWORD, flOptions, DWORD, dwInitialSize, 
-                   DWORD, dwMaximumSize)
+HANDLE WIN32API HeapCreate(DWORD flOptions, DWORD dwInitialSize, 
+                           DWORD dwMaximumSize)
 {
  OS2Heap *curheap;
@@ -155 +155 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG1(BOOL, HeapDestroy, HANDLE, hHeap)
+BOOL WIN32API HeapDestroy(HANDLE hHeap)
 {
   OS2Heap *curheap;
@@ -169 +169 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(DWORD, HeapSize, HANDLE, hHeap, DWORD, arg2, PVOID, lpMem)
+DWORD WIN32API HeapSize(HANDLE hHeap, DWORD arg2, PVOID lpMem)
 {
   OS2Heap *curheap;
@@ -182 +182 @@
 //TODO: Check this!!!
 //******************************************************************************
-ODINFUNCTIONNODBG2(DWORD, HeapCompact, HANDLE, hHeap, DWORD, dwFlags)
+DWORD WIN32API HeapCompact(HANDLE hHeap, DWORD dwFlags)
 {
   dprintf(("KERNEL32:  HeapCompact: Unknown API - stub\n"));
@@ -189 +189 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(BOOL, HeapValidate, HANDLE, hHeap, DWORD, dwFlags, LPCVOID, lpMem)
+BOOL WIN32API HeapValidate(HANDLE hHeap, DWORD dwFlags, LPCVOID lpMem)
 {
   OS2Heap *curheap;
@@ -202 +202 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG1(BOOL, HeapUnlock, HANDLE, hHeap)
+BOOL WIN32API HeapUnlock(HANDLE hHeap)
 {
   dprintf(("KERNEL32:  HeapUnlock - stub (TRUE)\n"));
@@ -209 +209 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG1(BOOL, HeapLock, HANDLE, hHeap)
+BOOL WIN32API HeapLock(HANDLE hHeap)
 {
   dprintf(("KERNEL32:  HeapLock - stub (TRUE)\n"));
@@ -217 +217 @@
 //    LPPROCESS_HEAP_ENTRY lpEntry
 //******************************************************************************
-ODINFUNCTIONNODBG2(BOOL, HeapWalk, HANDLE, hHeap, LPVOID, lpEntry)
+BOOL WIN32API HeapWalk(HANDLE hHeap, LPVOID lpEntry)
 {
   dprintf(("KERNEL32:  HeapWalk - stub (TRUE)\n"));
@@ -229 +229 @@
     return(Heap_ProcessHeap);
 }
-#if 1
 /*
  * Win32 Global heap functions (GlobalXXX).
@@ -271 +270 @@
  *      NULL: Failure
  */
-ODINFUNCTION2(HGLOBAL, GlobalAlloc,
-              UINT, flags,
-              DWORD, size)
+HGLOBAL WIN32API GlobalAlloc(UINT flags, DWORD size)
 {
    PGLOBAL32_INTERN     pintern;
@@ -323 +320 @@
  *      NULL: Failure
  */
-ODINFUNCTION1(LPVOID, GlobalLock,
-              HGLOBAL, hmem)
+LPVOID WIN32API GlobalLock(HGLOBAL hmem)
 {
    PGLOBAL32_INTERN pintern;
@@ -371 +367 @@
  *      FALSE: Object is unlocked
  */
-ODINFUNCTION1(BOOL, GlobalUnlock,
-              HGLOBAL, hmem)
+BOOL WIN32API GlobalUnlock(HGLOBAL hmem)
 {
    PGLOBAL32_INTERN       pintern;
@@ -418 +413 @@
  *      NULL: Failure
  */
-ODINFUNCTION1(HGLOBAL, GlobalHandle,
-              LPCVOID, pmem)
+HGLOBAL WIN32API GlobalHandle(LPCVOID pmem)
 {
     HGLOBAL handle;
@@ -509 +503 @@
  *      NULL: Failure
  */
-ODINFUNCTION3(HGLOBAL, GlobalReAlloc,
-                 HGLOBAL, hmem,
-                 DWORD, size,
-                 UINT, flags)
+HGLOBAL WIN32API GlobalReAlloc(HGLOBAL hmem, DWORD size, UINT flags)
 {
    LPVOID               palloc;
@@ -622 +613 @@
  *      Handle: Failure
  */
-ODINFUNCTION1(HGLOBAL, GlobalFree,
-              HGLOBAL, hmem)
+HGLOBAL WIN32API GlobalFree(HGLOBAL hmem)
 {
    PGLOBAL32_INTERN pintern;
@@ -688 +678 @@
  *      0: Failure
  */
-ODINFUNCTION1(DWORD, GlobalSize,
-              HGLOBAL, hmem)
+DWORD WIN32API GlobalSize(HGLOBAL hmem)
 {
    DWORD                retval;
@@ -729 +718 @@
  *           GlobalWire   (KERNEL32.@)
  */
-ODINFUNCTION1(LPVOID, GlobalWire,
-              HGLOBAL, hmem)
+LPVOID WIN32API GlobalWire(HGLOBAL hmem)
 {
    return GlobalLock( hmem );
@@ -739 +727 @@
  *           GlobalUnWire   (KERNEL32.@)
  */
-ODINFUNCTION1(BOOL, GlobalUnWire,
-              HGLOBAL, hmem)
+BOOL WIN32API GlobalUnWire(HGLOBAL hmem)
 {
    return GlobalUnlock( hmem);
@@ -749 +736 @@
  *           GlobalFix   (KERNEL32.@)
  */
-ODINPROCEDURE1(GlobalFix,
-               HGLOBAL, hmem)
+void WIN32API GlobalFix(HGLOBAL hmem)
 {
     GlobalLock( hmem );
@@ -759 +745 @@
  *           GlobalUnfix   (KERNEL32.@)
  */
-ODINPROCEDURE1(GlobalUnfix,
-               HGLOBAL, hmem)
+void WIN32API GlobalUnfix(HGLOBAL hmem)
 {
    GlobalUnlock( hmem);
@@ -777 +762 @@
  *      GMEM_INVALID_HANDLE: Failure
  */
-ODINFUNCTION1(UINT, GlobalFlags,
-              HGLOBAL, hmem)
+UINT WIN32API GlobalFlags(HGLOBAL hmem)
 {
    DWORD                retval;
@@ -811 +795 @@
  *           GlobalCompact   (KERNEL32.@)
  */
-ODINFUNCTION1(DWORD, GlobalCompact,
-              DWORD, minfree )
+DWORD WIN32API GlobalCompact(DWORD minfree)
 {
     return 0;  /* GlobalCompact does nothing in Win32 */
 }
-#else
-//******************************************************************************
-#ifdef DEBUG
-static ULONG totalGlobalAlloc = 0;
-#endif
-//******************************************************************************
-ODINFUNCTION2(HGLOBAL, GlobalAlloc,
-              UINT, fuFlags, 
-              DWORD, dwBytes)
-{
- HGLOBAL ret;
-
-    ret = O32_GlobalAlloc(fuFlags, dwBytes);
-#ifdef DEBUG
-    totalGlobalAlloc += dwBytes;
-#endif
-    return ret;
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION1(HGLOBAL, GlobalFree,
-              HGLOBAL, arg1)
-{
- HGLOBAL ret;
-
-#ifdef DEBUG
-    totalGlobalAlloc -= O32_GlobalSize(arg1);
-#endif
-    ret = O32_GlobalFree(arg1);
-    return ret;
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION1(HGLOBAL, GlobalHandle,
-              LPCVOID, lpMem)
-{
-    return O32_GlobalHandle((LPVOID)lpMem);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION1(UINT, GlobalFlags,
-              HGLOBAL, hMem)
-{
-    return O32_GlobalFlags(hMem);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION1(DWORD, GlobalCompact,
-              DWORD, dwMinFree)
-{
-  return(0);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION1(PVOID, GlobalLock,
-              HGLOBAL, hMem)
-{
-  return O32_GlobalLock(hMem);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION3(HGLOBAL, GlobalReAlloc,
-              HGLOBAL, arg1,
-              DWORD, arg2,
-              UINT,  arg3)
-{
-    return O32_GlobalReAlloc(arg1, arg2, arg3);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION1(DWORD, GlobalSize,
-              HGLOBAL, arg1)
-{
-    return O32_GlobalSize(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION1(BOOL, GlobalUnlock,
-              HGLOBAL, arg1)
-{
-    return O32_GlobalUnlock(arg1);
-}
-/***********************************************************************
- *           GlobalWire
- *
- * The GlobalWire function is obsolete. It is provided only for compatibility 
- * with 16-bit versions of Windows. Applications that need to lock a global 
- * memory object should use the GlobalLock and GlobalUnlock functions. 
- *
- */
-ODINFUNCTION1(LPVOID, GlobalWire,
-              HGLOBAL, hmem)
-{
-   return GlobalLock( hmem );
-}
-/***********************************************************************
- *           GlobalUnWire
- *
- * The GlobalUnWire function is obsolete. It is provided only for compatibility 
- * with 16-bit versions of Windows. Applications that need to lock a global 
- * memory object should use the GlobalLock and GlobalUnlock functions. 
- *
- */
-ODINFUNCTION1(BOOL, GlobalUnWire,
-              HGLOBAL, hmem)
-{
-   return GlobalUnlock( hmem);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION1(HGLOBAL, GlobalDiscard,
-              HGLOBAL, hGlobal)
-{
-    return O32_GlobalDiscard(hGlobal);
-}
-/***********************************************************************
- *           GlobalFix   (KERNEL32.@)
- */
-ODINPROCEDURE1(GlobalFix,
-               HGLOBAL, hmem)
-{
-    GlobalLock( hmem );
-}
-/***********************************************************************
- *           GlobalUnfix   (KERNEL32.@)
- */
-ODINPROCEDURE1(GlobalUnfix,
-               HGLOBAL, hmem)
-{
-   GlobalUnlock( hmem);
-}
-#endif
 //******************************************************************************
 //******************************************************************************