Changeset 2511 for trunk/src/win32k/dev32/d32init.c

Timestamp:

Jan 24, 2000, 7:19:01 PM (26 years ago)

Author:

bird

Message:

Heapchanges: Heap is splitted into a swappable and a resident. The heaps
are dynamically growable.

File:

• trunk/src/win32k/dev32/d32init.c (modified) (5 diffs)

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.5 2000-01-22 18:20:57 bird Exp $
+/* $Id: d32init.c,v 1.6 2000-01-24 18:18:59 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -129 +129 @@
                     {
                         if (strnicmp(pszTmp, "heapm", 5) == 0)
-                            options.cbHeapMax = ul;
+                            options.cbSwpHeapMax = ul;
                         else
-                            options.cbHeap = ul;
+                            options.cbSwpHeapInit = ul;
                     }
                 }
@@ -189 +189 @@
                     {
                         if (strnicmp(pszTmp, "resheapm", 8) == 0)
-                            options.cbHeapMaxResident = ul;
+                            options.cbResHeapMax = ul;
                         else
-                            options.cbHeapResident = ul;
+                            options.cbResHeapInit = ul;
                     }
                 }
@@ -243 +243 @@
 
     /* heap min/max corrections */
-    if (options.cbHeap > options.cbHeapMax)
-        options.cbHeapMax = options.cbHeap;
-    if (options.cbHeapResident > options.cbHeapMaxResident)
-        options.cbHeapMaxResident = options.cbHeapResident;
+    if (options.cbSwpHeapInit > options.cbSwpHeapMax)
+        options.cbSwpHeapMax = options.cbSwpHeapInit;
+    if (options.cbResHeapInit > options.cbResHeapMax)
+        options.cbResHeapMax = options.cbResHeapInit;
 
     /* Transfer version and build number from 16-bit probkrnl.c */
@@ -277 +277 @@
      */
     /* heap */
-    if (heapInit(options.cbHeap) != NO_ERROR)
+    if (heapInit(options.cbResHeapInit, options.cbResHeapMax,
+                 options.cbSwpHeapInit, options.cbSwpHeapMax) != NO_ERROR)
         return STATUS_DONE | STERR | ERROR_I24_QUIET_INIT_FAIL;