Changeset 21649 for trunk/src/kernel32

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.

Location:

trunk/src/kernel32

Files:

• initkernel32.cpp (modified) (4 diffs)
• initterm.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();

trunk/src/kernel32/initterm.cpp

@@ -95 +95 @@
     /*-------------------------------------------------------------------------*/
 
-    if(fInit == TRUE && ulFlag == 0) {
-        return 1; //already initialized
-    }
-
     switch (ulFlag)
     {
-        case 0 :
+        case 0:
         {
+            if (fInit)
+                return 1; // already initialized
+
             ctordtorInit();
 
@@ -112 +111 @@
             rc = DosExitList(EXITLIST_KERNEL32|EXLST_ADD, cleanup);
             if (rc)
-                return 0UL;
+                return 0;
 
-            rc = DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR, version, sizeof(version));
-            if(rc == 0){
-                if(version[0] >= 20 && version[1] <= 30) {
+            rc = DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR,
+                                 version, sizeof(version));
+            if (rc == 0)
+                if(version[0] >= 20 && version[1] <= 30)
                     fVersionWarp3 = TRUE;
-                }
-            }
 
             rc = inittermKernel32(hModule, ulFlag);
@@ -125 +123 @@
         }
 
-        case 1 :
+        case 1:
             rc = inittermKernel32(hModule, ulFlag);
             break;
 
-        default  :
-            return 0UL;
+        default:
+            return 0;
     }
 
@@ -156 +154 @@
     HMODULE hModule;
 
-    if(!fInit) {
+    if (!fInit)
         loadNr = globLoadNr++;
-    }
-    DosQueryModuleHandleStrict("WGSS50", &hModule);
-    _O32__DLL_InitTerm(hModule, 0);
-    DosQueryModuleHandleStrict("KERNEL32", &hModule);
-    return DLLENTRYPOINT_NAME(hModule, 0);
+
+    if (DosQueryModuleHandleStrict("WGSS50", &hModule) == NO_ERROR)
+        if (_O32__DLL_InitTerm(hModule, 0) != 0)
+            if (DosQueryModuleHandleStrict("KERNEL32", &hModule) == NO_ERROR)
+                return DLLENTRYPOINT_NAME(hModule, 0);
+
+    return 0; // failure
 }
 //******************************************************************************