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

Timestamp:

Jun 23, 2011, 2:02:58 PM (14 years ago)

Author:

dmik

Message:

general: Exit gracefully instead of crashing if KERNEL32.DLL initialization fails. Note that "gracefully" means "silently" in this case since it seems that the only way how the OS/2 loader reports a failure to initialize a required DLL for a started EXE is by returning a non-zero exit code.

File:

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

trunk/src/kernel32/initkernel32.cpp

@@ -112 +112 @@
     /*-------------------------------------------------------------------------*/
 
-    if(fInit == TRUE && ulFlag == 0) {
-        return 1; //already initialized
-    }
-    fInit = TRUE;
-
     switch (ulFlag)
     {
-        case 0 :
+        case 0:
         {
+            if (fInit)
+                return 1; // already initialized
+
             // This always must be the first thing to do.
             RasInitialize (hModule);
@@ -257 +255 @@
             RasEntry (RAS_EVENT_Kernel32InitComplete, &dllHandle, sizeof (dllHandle));
 
+            fInit = TRUE;
+
             break;
         }
 
-        case 1 :
+        case 1:
             if (dllHandle)
             {
@@ -267 +267 @@
             break;
 
-        default  :
-            return 0UL;
+        default:
+            return 0;
     }
 
@@ -280 +280 @@
 void APIENTRY cleanupKernel32(ULONG ulReason)
 {
-    dprintf(("kernel32 exit %d\n", ulReason));
+    if (!fInit)
+    {
+        // The initialization sequence was not complete; attempting to
+        // uninitialize some things may crash (yeah, dirty code that doesn't
+        // analyze its own state)
+        return;
+    }
+
+    dprintf(("kernel32 exit %d", ulReason));
 
     TEB *teb = GetThreadTEB();