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

Timestamp:

Jul 21, 2002, 11:17:28 AM (23 years ago)

Author:

sandervl

Message:

Use shared memory in high region (> 512MB) if available + Interface changes for shared memory allocation

File:

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

trunk/src/kernel32/initkernel32.cpp

@@ -1 @@
-/* $Id: initkernel32.cpp,v 1.21 2002-07-15 14:40:16 sandervl Exp $
+/* $Id: initkernel32.cpp,v 1.22 2002-07-21 09:17:28 sandervl Exp $
  *
  * KERNEL32 DLL entry point
@@ -134 +134 @@
             OpenPrivateLogFiles();
 
-            if (InitializeSharedHeap() == FALSE)
-                return 0UL;
-
-            if (InitializeCodeHeap() == FALSE)
-                return 0UL;
-
             //SvL: Do it here instead of during the exe object creation
             //(std handles can be used in win32 dll initialization routines
             HMInitialize();             /* store standard handles within HandleManager */
-
-            InitializeMemMaps();
-
-            PROFILE_LoadOdinIni();
-            dllHandle = RegisterLxDll(hModule, 0, (PVOID)&kernel32_PEResTab);
-            if (dllHandle == 0)
-                return 0UL;
-
-            //SvL: Kernel32 is a special case; pe.exe loads it, so increase
-            //     the reference count here
-            Win32DllBase *module = Win32DllBase::findModule(dllHandle);
-            if (module)
-            {
-                module->AddRef();
-                module->DisableUnload();
-            }
 
             /* knut: check for high memory support */
@@ -174 +152 @@
             else
                 flAllocMem = 0;        // no high memory support
+
+            if (InitializeSharedHeap() == FALSE)
+                return 0UL;
+
+            if (InitializeCodeHeap() == FALSE)
+                return 0UL;
+
+            InitializeMemMaps();
+
+            PROFILE_LoadOdinIni();
+            dllHandle = RegisterLxDll(hModule, 0, (PVOID)&kernel32_PEResTab);
+            if (dllHandle == 0)
+                return 0UL;
+
+            //SvL: Kernel32 is a special case; pe.exe loads it, so increase
+            //     the reference count here
+            Win32DllBase *module = Win32DllBase::findModule(dllHandle);
+            if (module)
+            {
+                module->AddRef();
+                module->DisableUnload();
+            }
 
             OSLibDosSetInitialMaxFileHandles(ODIN_DEFAULT_MAX_FILEHANDLES);