Changeset 4164 for trunk/src/win32k/misc/malloc.c

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

File:

• trunk/src/win32k/misc/malloc.c (modified) (9 diffs)

trunk/src/win32k/misc/malloc.c

@@ -1 @@
-/* $Id: malloc.c,v 1.6 2000-01-24 18:19:00 bird Exp $
+/* $Id: malloc.c,v 1.7 2000-09-02 21:08:14 bird Exp $
  *
  * Common Heap - this forwards to the swappable heap!
@@ -20 +20 @@
 ******************************************************************************/
 #include <os2.h>
+#include "devSegDf.h"                   /* Win32k segment definitions. */
 #include "smalloc.h"
 #include "rmalloc.h"
@@ -28 +29 @@
 *  Global data
 ******************************************************************************/
-#ifndef RING0
+#if !defined(RING0) || defined(R3TST)
     char           fInited;       /* init flag */
 #endif
@@ -53 +54 @@
     if (rc != 0)
         return rc;
-    #ifdef RING3
+    #if !defined(RING0) || defined(R3TST)
         fInited = TRUE;
     #endif
@@ -69 +70 @@
 void * malloc(unsigned cbSize)
 {
+    #ifdef R3TST
+    if (!fInited)
+    {
+        PVOID pv;
+        if (!DosAllocMem(&pv, cbSize, PAG_WRITE | PAG_READ | PAG_COMMIT)) /* no SSToDS! */
+            return pv;
+        else
+            return NULL;
+    }
+    #endif
     return smalloc(cbSize);
 }
@@ -81 +92 @@
 void *realloc(void *pv, unsigned cbNew)
 {
+    #ifdef R3TST
+    if (!fInited)
+        Int3();
+    #endif
     return srealloc(pv, cbNew);
 }
@@ -91 +106 @@
 void free(void *pv)
 {
+    #ifdef R3TST
+    if (!fInited) /* controlled leak! */
+       return;
+    #endif
     sfree(pv);
 }
@@ -154 +173 @@
 
 
+
 #if !defined(RING0) && defined(__IBMC__)
 
@@ -162 +182 @@
 int _rmem_init(void)
 {
-    int rc = heapInit(CB_RES_INIT, CB_RES_MAX, CB_SWP_INIT, CB_SWP_MAX);
+    int rc;
+    rc = heapInit(CB_RES_INIT, CB_RES_MAX, CB_SWP_INIT, CB_SWP_MAX);
     return rc;
 }