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

Timestamp:

Jun 23, 2011, 4:19:24 PM (14 years ago)

Author:

dmik

Message:

kernel32: Add the full path to the started executable to the message box shown on DLL load failure.

File:

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

trunk/src/kernel32/initkernel32.cpp

@@ -301 +301 @@
     if (ulFlag == 0 && rc == 0)
     {
-        static const char msg[] =
-            "Failed to initialize the KERNEL32 library.\n\r"
+        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 "
@@ -309 +312 @@
             "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.
@@ -317 +331 @@
         // available)
         ULONG dummy;
-        DosWrite((HFILE)1, (PVOID)msg, sizeof(msg), &dummy);
+        DosWrite((HFILE)1, (PVOID)&msg, strlen(msg), &dummy);
     }