Changeset 22090

Timestamp:

Mar 18, 2015, 4:59:40 PM (11 years ago)

Author:

rousseau

Message:

Fixed broken 'xx2lx.exe'

When using VAC, the resident and swap heaps were initialized using VAC
specific '_exeentry' functionality. This does not exist on GCC resulting
in uninitialized heaps causing 'xx2lx.exe' to crash.

File:

• branches/swt/src/win32k/ldr/xx2lxmain.cpp (modified) (1 diff)

branches/swt/src/win32k/ldr/xx2lxmain.cpp

@@ -83 +83 @@
     PCSZ   psz;
     int    argi;
+
+#ifdef __GNUC__
+    /*
+     * Initialize heaps when using GCC.
+     * When building with GCC, there exists no VAC '_exeentry' stuff.
+     * So the function '_rmem_init()' in 'misc/malloc.c', which would
+     * initialize the resident and swap heaps, is never called under GCC.
+     */
+    rc = heapInit(CB_RES_INIT, CB_RES_MAX, CB_SWP_INIT, CB_SWP_MAX);
+    if (rc != NO_ERROR) {
+        printf("Fatal error: Failed to initialize memory heaps. rc=%d\n", rc);
+        return rc;
+    }
+#endif
 
     /* special edition for Dave Evans */