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

Timestamp:

Jun 18, 2009, 11:53:26 AM (16 years ago)

Author:

ydario

Message:

Kernel32 updates.

File:

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

trunk/src/kernel32/initkernel32.cpp

@@ -60 +60 @@
 #include <stats.h>
 #include <heapshared.h>
-#include <heapstring.h>
+#include <_ras.h>
 
 #define DBG_LOCALLOG    DBG_initterm
@@ -71 +71 @@
  extern DWORD kernel32_PEResTab;
 }
-
-extern PFN pfnImSetMsgQueueProperty;
 
        ULONG   flAllocMem = 0;    /* flag to optimize DosAllocMem to use all the memory on SMP machines */
@@ -81 +79 @@
        BOOL    fInit     = FALSE;
        BOOL    fWin32k   = FALSE;
-       HMODULE imHandle = 0;
-       char    szModName[ 256 ] = "";
 
 /****************************************************************************/
@@ -113 +109 @@
         case 0 :
         {
+            // This always must be the first thing to do.
+            RasInitialize (hModule);
+#ifdef RAS
+            extern void rasInitVirtual (void);
+            rasInitVirtual ();
+#endif
+
             ParseLogStatusKERNEL32();
 
@@ -221 +224 @@
             CODEPAGE_Init();
 
-            if( IsDBCSEnv() && DosLoadModule( szModName, sizeof( szModName ), "OS2IM.DLL", &imHandle ) == 0 )
-                DosQueryProcAddr( imHandle, 140, NULL, &pfnImSetMsgQueueProperty );
-
             InitSystemInfo(ulSysinfo);
             //Set up environment as found in NT
@@ -237 +237 @@
             SetProcessAffinityMask(GetCurrentProcess(), dwSystemAffinityMask);
 
+            //Activate current timezone information
+            TIME_ZONE_INFORMATION tzone;
+            GetTimeZoneInformation(&tzone);
+            SetTimeZoneInformation(&tzone);
+
             //Set default paths for PE & NE loaders
             InitLoaders();
+            
+            RasEntry (RAS_EVENT_Kernel32InitComplete, &dllHandle, sizeof (dllHandle));
+            
             break;
         }
@@ -264 +272 @@
     dprintf(("kernel32 exit %d\n", ulReason));
 
-    if( IsDBCSEnv() && imHandle )
-        DosFreeModule( imHandle );
-
     //Flush and delete all open memory mapped files
     Win32MemMap::deleteAll();
     WinExe = NULL;
+
+    FinalizeMemMaps();
 
     WriteOutProfiles();
@@ -281 +288 @@
 
     HMTerminate(); /* shutdown handlemanager */
+
+#ifdef DEBUG
+    extern void printCriticalSectionStatistic (void);
+    printCriticalSectionStatistic ();
+#endif
 
 #if defined(DEBUG) && defined(__IBMCPP__) && __IBMCPP__ == 300
@@ -298 +310 @@
     //NOTE: Must be done after DestroyTIB
     ClosePrivateLogFiles();
+
+#ifndef DEBUG
+    //if we do a dump of the shared heap, then we'll need the logging facility
+    //for a little while longer
     CloseLogFile();
+#endif
 
     /*
@@ -305 +322 @@
     libWin32kSetEnvironment(NULL, 0, 0);
     libWin32kTerm();
+
+    RasUninitialize ();
+    
     return ;
 }