Changeset 21649 for trunk/src/user32

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/user32

Files:

• controls/initodinctrl.cpp (modified) (1 diff)
• inituser32.cpp (modified) (1 diff)

trunk/src/user32/controls/initodinctrl.cpp

@@ -67 +67 @@
          ParseLogStatusOdinCtrl();
 
-         InitializeKernel32();
+         if (InitializeKernel32() == 0)
+             return 0;
+
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
          break;
-     
+
       case 1 :
          break;

trunk/src/user32/inituser32.cpp

@@ -174 +174 @@
          ParseLogStatusUSER32();
 
-         InitializeKernel32();
+         if (InitializeKernel32() == 0)
+             return 0;
+
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/