Changeset 8880 for trunk/src

Timestamp:

Jul 15, 2002, 4:40:16 PM (23 years ago)

Author:

sandervl

Message:

Dynamically allocate handlemanager array to prevent waste of shared memory (as it is a private array (for now))

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (3 diffs)
• initkernel32.cpp (modified) (3 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.88 2002-05-10 14:55:09 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.89 2002-07-15 14:40:15 sandervl Exp $ */
 
 /*
@@ -121 +121 @@
 static PHMDEVICE TabWin32Devices = NULL;
 
-static HMHANDLE TabWin32Handles[MAX_OS2_HMHANDLES];   /* static handle table */
-VMutex          handleMutex;
+static HMHANDLE *TabWin32Handles = NULL;   /* static handle table */
+VMutex           handleMutex;
 
 struct _HMGlobals
@@ -420 +420 @@
   {
     handleMutex.enter();
+
+    TabWin32Handles = (HMHANDLE *)malloc(MAX_OS2_HMHANDLES*sizeof(HMHANDLE));
+    if(TabWin32Handles == NULL) {
+        DebugInt3();
+        return ERROR_NOT_ENOUGH_MEMORY;
+    }
+    memset(TabWin32Handles, 0, MAX_OS2_HMHANDLES*sizeof(HMHANDLE));
+
     // fill handle table
     for(ulIndex = 0; ulIndex < MAX_OS2_HMHANDLES; ulIndex++) {

trunk/src/kernel32/initkernel32.cpp

@@ -1 @@
-/* $Id: initkernel32.cpp,v 1.20 2002-07-13 15:57:57 sandervl Exp $
+/* $Id: initkernel32.cpp,v 1.21 2002-07-15 14:40:16 sandervl Exp $
  *
  * KERNEL32 DLL entry point
@@ -140 +140 @@
                 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();
 
@@ -173 +177 @@
             OSLibDosSetInitialMaxFileHandles(ODIN_DEFAULT_MAX_FILEHANDLES);
 
-            //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 */
             InitDirectories();          //Must be done before InitializeTIB (which loads NTDLL -> USER32)
             InitializeMainThread();     //Must be done after HMInitialize!