Changeset 10005 for trunk/src/msvcrt/heap.c

Timestamp:

Apr 10, 2003, 12:28:07 PM (22 years ago)

Author:

sandervl

Message:

PF: MSVCRT update

File:

• trunk/src/msvcrt/heap.c (modified) (23 diffs)

trunk/src/msvcrt/heap.c

@@ -23 +23 @@
 
 #include "msvcrt.h"
+
+#include <string.h>
+
 #include "ms_errno.h"
 
@@ -43 +46 @@
 static int MSVCRT_new_mode;
 
-
 /*********************************************************************
  *              ??2@YAPAXI@Z (MSVCRT.@)
@@ -50 +52 @@
 {
   void *retval = HeapAlloc(GetProcessHeap(), 0, size);
-  TRACE("(%ld) returning %p\n", size, retval);
+  TRACE("MSVCRT: operator_new (%ld) returning %p\n", size, retval);
   LOCK_HEAP;
   if(!retval && MSVCRT_new_handler)
@@ -63 +65 @@
 void MSVCRT_operator_delete(void *mem)
 {
-  TRACE("(%p)\n", mem);
+  TRACE("MSVCRT: operator_delete (%p)\n", mem);
   HeapFree(GetProcessHeap(), 0, mem);
 }
@@ -73 +75 @@
 MSVCRT_new_handler_func MSVCRT__query_new_handler(void)
 {
+  dprintf(("MSVCRT: _query_new_handler"));
   return MSVCRT_new_handler;
 }
@@ -82 +85 @@
 int MSVCRT__query_new_mode(void)
 {
+  dprintf(("MSVCRT: _query_new_mode"));
   return MSVCRT_new_mode;
 }
@@ -91 +95 @@
 {
   MSVCRT_new_handler_func old_handler;
+
+  dprintf(("MSVCRT: _set_new_mode"));
+
   LOCK_HEAP;
   old_handler = MSVCRT_new_handler;
@@ -103 +110 @@
 MSVCRT_new_handler_func MSVCRT_set_new_handler(void *func)
 {
-  TRACE("(%p)\n",func);
+  TRACE("MSVCRT: set_new_handler (%p)\n",func);
   MSVCRT__set_new_handler(NULL);
   return NULL;
@@ -114 +121 @@
 {
   int old_mode;
+  TRACE("MSVCRT: set_new_mode (%d)\n",mode);
   LOCK_HEAP;
   old_mode = MSVCRT_new_mode;
@@ -126 +134 @@
 int _callnewh(unsigned long size)
 {
+  TRACE("MSVCRT: _callnewh (%d)\n",size);
   if(MSVCRT_new_handler)
     (*MSVCRT_new_handler)(size);
@@ -136 +145 @@
 void* _expand(void* mem, MSVCRT_size_t size)
 {
+  TRACE("MSVCRT: _expand (%p)\n",mem);
   return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, size);
 }
@@ -142 +152 @@
  *              _heapchk (MSVCRT.@)
  */
-int _heapchk(void)
-{
+int MSVCRT__heapchk(void)
+{
+  TRACE("MSVCRT: _heapchk");
   if (!HeapValidate( GetProcessHeap(), 0, NULL))
   {
@@ -155 +166 @@
  *              _heapmin (MSVCRT.@)
  */
-int _heapmin(void)
-{
+int MSVCRT__heapmin(void)
+{
+  TRACE("MSVCRT: _heapmin");
   if (!HeapCompact( GetProcessHeap(), 0 ))
   {
@@ -169 +181 @@
  *              _heapwalk (MSVCRT.@)
  */
-int _heapwalk(_HEAPINFO* next)
+int MSVCRT__heapwalk(_HEAPINFO* next)
 {
   PROCESS_HEAP_ENTRY phe;
+
+  TRACE("MSVCRT: _heapwalk");
 
   LOCK_HEAP;
@@ -210 +224 @@
  *              _heapset (MSVCRT.@)
  */
-int _heapset(unsigned int value)
+int MSVCRT__heapset(unsigned int value)
 {
   int retval;
   _HEAPINFO heap;
 
+  TRACE("MSVCRT: _heapset");
+
   memset( &heap, 0, sizeof(_HEAPINFO) );
   LOCK_HEAP;
-  while ((retval = _heapwalk(&heap)) == _HEAPOK)
+  while ((retval = MSVCRT__heapwalk(&heap)) == _HEAPOK)
   {
     if (heap._useflag == _FREEENTRY)
@@ -229 +245 @@
  *              _heapadd (MSVCRT.@)
  */
-int _heapadd(void* mem, MSVCRT_size_t size)
-{
-  TRACE("(%p,%d) unsupported in Win32\n", mem,size);
+int MSVCRT__heapadd(void* mem, MSVCRT_size_t size)
+{
+  TRACE("MSVCRT: _heapadd (%p,%d) unsupported in Win32\n", mem,size);
   *MSVCRT__errno() = MSVCRT_ENOSYS;
   return -1;
@@ -239 +255 @@
  *              _msize (MSVCRT.@)
  */
-MSVCRT_size_t _msize(void* mem)
+MSVCRT_size_t MSVCRT__msize(void* mem)
 {
   long size = HeapSize(GetProcessHeap(),0,mem);
+
+  TRACE("MSVCRT: _msize (%p)",mem);
+
   if (size == -1)
   {
@@ -255 +274 @@
 void* MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count)
 {
-  return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size * count );
+  void *ret;
+  ret = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size * count );
+  TRACE("MSVCRT: calloc (%d,%d) returned %p",size, count, ret);
+  return ret;
 }
 
@@ -263 +285 @@
 void MSVCRT_free(void* ptr)
 {
-  dprintf(("MSVCRT_free %x ptr",ptr));
+  dprintf(("MSVCRT: free %x ptr",ptr));
   HeapFree(GetProcessHeap(),0,ptr);
 }
@@ -269 +291 @@
 void* MSVCRT(memset)(void* ptr,int fill,MSVCRT(size_t) size)
 {
-  dprintf(("MSVCRT_memset %x(%d bytes) with %d",ptr,size,fill));
+  dprintf(("MSVCRT: memset %x(%d bytes) with %d",ptr,size,fill));
   return memset(ptr,fill,size);
 }
@@ -276 +298 @@
 void* MSVCRT(memcpy)(void* ptr,const void* ptr2,MSVCRT(size_t) size)
 {
-  dprintf(("MSVCRT_memcpy %x->%x (%d bytes)",ptr2,ptr,size));
+  dprintf(("MSVCRT: memcpy %x->%x (%d bytes)",ptr2,ptr,size));
   return memcpy(ptr,ptr2,size);
 }
@@ -287 +309 @@
 {
   void *ret = HeapAlloc(GetProcessHeap(),0,size);
-  dprintf(("MSVCRT_malloc of %d size returned %x",size,ret));
+  dprintf(("MSVCRT: malloc of %d size returned %x",size,ret));
   if (!ret)
     MSVCRT__set_errno(GetLastError());
@@ -298 +320 @@
 void* MSVCRT_realloc(void* ptr, MSVCRT_size_t size)
 {
-  dprintf(("MSVCRT_realloc %x",ptr));
+  dprintf(("MSVCRT: realloc %x",ptr));
   return HeapReAlloc(GetProcessHeap(), 0, ptr, size);
 }