Changeset 7504

Timestamp:

Nov 30, 2001, 6:50:42 PM (24 years ago)

Author:

phaller

Message:

Exported Heap_ProcessHeap to heapstring.cpp and tuned GetProcessHeap() via inlining macro

Location:

trunk/src/kernel32

Files:

• heap.cpp (modified) (2 diffs)
• heapstring.cpp (modified) (4 diffs)

trunk/src/kernel32/heap.cpp

@@ -48 +48 @@
 }
 
-static HANDLE processheap = i_initializeProcessHeap();
+// Note:
+// variable is exported (i. e. to heapstring)
+HANDLE Heap_ProcessHeap = i_initializeProcessHeap();
 
 // This macro could be mapped to GetProcessHeap() if there
 // is any change in functionality
-#define GETPROCESSHEAP processheap
+#define GETPROCESSHEAP Heap_ProcessHeap
 
 
@@ -225 +227 @@
 {
 //    dprintf2(("KERNEL32: GetProcessHeap\n"));
-    return(processheap);
+    return(Heap_ProcessHeap);
 }
 #if 1

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.47 2001-10-15 17:15:30 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.48 2001-11-30 17:50:42 phaller Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -34 +34 @@
 #include "dbglocal.h"
 
+
 /*****************************************************************************
  * Defines                                                                   *
@@ -39 +40 @@
 
 ODINDEBUGCHANNEL(KERNEL32-HEAPSTRING)
+
+
+/*****************************************************************************
+ * Imported variables                                                        *
+ *****************************************************************************/
+
+// This macro could be mapped to GetProcessHeap() if there
+// is any change in functionality
+#define GetProcessHeap() Heap_ProcessHeap
+
+extern HANDLE Heap_ProcessHeap;
+
 
 /*****************************************************************************
@@ -761 +774 @@
  *****************************************************************************/
 
-ODINPROCEDURENODBG1(HEAP_free,
-                    LPVOID, lpMem)
-{
-  HeapFree( GetProcessHeap(), 0, lpMem);
+ODINFUNCTIONNODBG1(BOOL,   HEAP_free,
+                   LPVOID, lpMem)
+{
+  return HeapFree( GetProcessHeap(), 0, lpMem);
 }