Changeset 10528 for trunk/src/kernel32/initkernel32.cpp

Timestamp:

Mar 16, 2004, 2:34:58 PM (21 years ago)

Author:

sandervl

Message:

init update

File:

• trunk/src/kernel32/initkernel32.cpp (modified) (6 diffs)

trunk/src/kernel32/initkernel32.cpp

@@ -1 @@
-/* $Id: initkernel32.cpp,v 1.26 2003-02-28 11:32:27 sandervl Exp $
+/* $Id: initkernel32.cpp,v 1.27 2004-03-16 13:34:23 sandervl Exp $
  *
  * KERNEL32 DLL entry point
@@ -59 +59 @@
 #include <process.h>
 #include <stats.h>
+#include <heapshared.h>
 
 #define DBG_LOCALLOG    DBG_initterm
@@ -131 +132 @@
             CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
+            /* knut: check for high memory support */
+            rc = DosQuerySysInfo(QSV_VIRTUALADDRESSLIMIT, QSV_VIRTUALADDRESSLIMIT, &ulSysinfo, sizeof(ulSysinfo));
+            if (rc == 0 && ulSysinfo > 512)   //VirtualAddresslimit is in MB
+            {
+                flAllocMem = PAG_ANY;      // high memory support. Let's use it!
+                ulMaxAddr = ulSysinfo * (1024*1024);
+            }
+            else
+                flAllocMem = 0;        // no high memory support
+
             dprintf(("kernel32 init %s %s (%x) Win32k - %s", __DATE__, __TIME__, inittermKernel32,
                      libWin32kInstalled() ? "Installed" : "Not Installed"));
@@ -139 +150 @@
             //(std handles can be used in win32 dll initialization routines
             HMInitialize();             /* store standard handles within HandleManager */
-
-            /* knut: check for high memory support */
-            rc = DosQuerySysInfo(QSV_VIRTUALADDRESSLIMIT, QSV_VIRTUALADDRESSLIMIT, &ulSysinfo, sizeof(ulSysinfo));
-            if (rc == 0 && ulSysinfo > 512)   //VirtualAddresslimit is in MB
-            {
-                flAllocMem = PAG_ANY;      // high memory support. Let's use it!
-                ulMaxAddr = ulSysinfo * (1024*1024);
+            
+            // VP: Shared heap should be initialized before call to PROFILE_*
+            // because they use a critical section which in turn uses smalloc
+            // in debug build
+            if (InitializeSharedHeap() == FALSE)
+                return 0UL;
+
+            // VP: initialize profile internal data (critical section actually).
+            // This was done in PROFILE_LoadOdinIni but PROFILE_GetOdinIniInt
+            // is called earlier and this lead to a handle leak.
+            PROFILE_Initialize();
+
+            if(flAllocMem == PAG_ANY) {
                 OSLibInitWSeBFileIO();
                 if (PROFILE_GetOdinIniInt(ODINSYSTEM_SECTION, HIGHMEM_KEY, 1) == 0) {
@@ -152 +169 @@
                 }
             }
-            else
-                flAllocMem = 0;        // no high memory support
-
-            if (InitializeSharedHeap() == FALSE)
-                return 0UL;
 
             if (InitializeCodeHeap() == FALSE)
@@ -178 +190 @@
 
             OSLibDosSetInitialMaxFileHandles(ODIN_DEFAULT_MAX_FILEHANDLES);
+
+
+#ifdef DEBUG
+            {
+            LPSTR WIN32API GetEnvironmentStringsA();
+
+            char *tmpenvnew = GetEnvironmentStringsA();
+            dprintf(("Environment:"));
+            while(*tmpenvnew) {
+                dprintf(("%s", tmpenvnew));
+                tmpenvnew += strlen(tmpenvnew)+1;
+            }
+            }
+#endif
 
             InitDirectories();          //Must be done before InitializeTIB (which loads NTDLL -> USER32)