Changeset 2182 for trunk/src/crtdll/crtdll.cpp

Timestamp:

Dec 21, 1999, 2:46:25 PM (26 years ago)

Author:

sandervl

Message:

calloc bugfix + private heap for crtldll added

File:

• trunk/src/crtdll/crtdll.cpp (modified) (11 diffs)

trunk/src/crtdll/crtdll.cpp

@@ -1 @@
-/* $Id: crtdll.cpp,v 1.17 1999-12-21 12:27:11 sandervl Exp $ */
+/* $Id: crtdll.cpp,v 1.18 1999-12-21 13:46:24 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
 DEFAULT_DEBUG_CHANNEL(crtdll)
 
+//SvL: per process heap for CRTDLL
+HANDLE CRTDLL_hHeap = 0;
+
 
 /*********************************************************************
@@ -63 +66 @@
                 CRTDLL__fdopen(1,"w");
                 CRTDLL__fdopen(2,"w");
+                CRTDLL_hHeap = HeapCreate(0, 0x10000, 0);
         }
+        else 
+        if (fdwReason == DLL_PROCESS_DETACH) {
+                HeapDestroy(CRTDLL_hHeap);
+                CRTDLL_hHeap = 0;
+        }       
         return TRUE;
 }
@@ -75 +84 @@
     dprintf(("CRTDLL: ??2@YAPAXI@Z\n"));
     VOID* result;
-    if(!(result = HeapAlloc(GetProcessHeap(),0,size)) && new_handler)
+    if(!(result = Heap_Alloc(size)) && new_handler)
         (*new_handler)();
     return result;
@@ -87 +96 @@
 {
     dprintf(("CRTDLL: ??3@YAXPAX@Z\n"));
-    HeapFree(GetProcessHeap(),0,ptr);
+    Heap_Free(ptr);
 }
 
@@ -1047 +1056 @@
         break;
     default:
-        file = (PCRTDLL_FILE)HeapAlloc( GetProcessHeap(), 0, sizeof(*file) );
+        file = (PCRTDLL_FILE)Heap_Alloc(sizeof(*file) );
         file->handle = handle;
         break;
@@ -3487 +3496 @@
 int CDECL CRTDLL__setjmp( jmp_buf env )
 {
-  dprintf(("CRTDLL: _setjmp -> setjmp\n"));
+  dprintf(("CRTDLL: _setjmp -> setjmp (NOT IDENTICAL!!!)\n"));
+  return(setjmp( env));
+}
+
+/*********************************************************************
+ *           CRTDLL__setjmp3     (CRTDLL.262)
+ */
+int CDECL CRTDLL__setjmp3( jmp_buf env )
+{
+  dprintf(("CRTDLL: _setjmp3 -> setjmp (NOT IDENTICAL!!!)\n"));
   return(setjmp( env));
 }
@@ -4192 +4210 @@
 void * CDECL CRTDLL_calloc( size_t n, size_t size )
 {
-  dprintf(("CRTDLL: calloc\n"));
-  return (calloc(n, size));
+//  dprintf(("CRTDLL: calloc\n"));
+  return Heap_Alloc(size*n);
 }
 
@@ -4428 +4446 @@
 size_t CDECL CRTDLL_fread( void *ptr, size_t size, size_t n, FILE *fp )
 {
-  dprintf(("CRTDLL: fread\n"));
+//  dprintf(("CRTDLL: fread\n"));
   return (fread(ptr, size, n, fp));
 }
@@ -4438 +4456 @@
 VOID CDECL CRTDLL_free(LPVOID ptr)
 {
-    dprintf(("CRTDLL: free\n"));
-    HeapFree(GetProcessHeap(),0,ptr);
+//    dprintf(("CRTDLL: free\n"));
+    Heap_Free(ptr);
 }
 
@@ -4845 +4863 @@
 VOID* CDECL CRTDLL_malloc(DWORD size)
 {
-      dprintf(("CRTDLL: malloc\n"));
-      return HeapAlloc(GetProcessHeap(),0,size);
+//      dprintf(("CRTDLL: malloc\n"));
+      return Heap_Alloc(size);
 }