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

Timestamp:

Jun 27, 2011, 2:27:23 AM (14 years ago)

Author:

dmik

Message:

kernel32: Show an error message box if WGSS50.DLL initialization fails too. See also r21651.

File:

• trunk/src/kernel32/initkernel32.cpp (modified) (1 diff)

trunk/src/kernel32/initkernel32.cpp

@@ -300 +300 @@
 
     if (ulFlag == 0 && rc == 0)
-    {
-        static const char msg1[] =
-            "Failed to initialize the KERNEL32 library while starting \"";
-
-        static const char msg2[] =
-            "\".\n\r"
-            "\n\r"
-            "It is possible that there is not enough memory in the system to "
-            "run this application. Please close other applications and try "
-            "again. If the problem persists, please report the details by "
-            "creating a ticket at http://svn.netlabs.org/odin32/.\n\r";
-
-        char msg[sizeof(msg1) + CCHMAXPATH + sizeof(msg2)];
-
-        strcpy(msg, msg1);
-
-        PPIB ppib;
-        DosGetInfoBlocks(NULL, &ppib);
-        if (DosQueryModuleName(ppib->pib_hmte, CCHMAXPATH,
-                               msg + sizeof(msg1) - 1) != NO_ERROR)
-            strcat(msg, "<unknown executable>");
-        strcat(msg, msg2);
-
-        // Initialization has failed. Try to be nice and show an error message
-        // to the user.
-        WinMessageBox(HWND_DESKTOP, NULL, msg, "Odin: Fatal Error", 0,
-                      MB_APPLMODAL | MB_MOVEABLE | MB_ERROR | MB_OK);
-
-        // duplicate the message to the console just in case (PM may be not
-        // available)
-        ULONG dummy;
-        DosWrite((HFILE)1, (PVOID)&msg, strlen(msg), &dummy);
-    }
+        ReportFatalDllInitError("KERNEL32");
 
     return rc;