Changeset 16865

Timestamp:

Jul 10, 2001, 10:41:50 PM (24 years ago)

Author:

bird

Message:

Disallow loading of LX files if env.var. ODIN32.FAIL_IF_UNREGISTEREDLX is set. This fixes the int 3 when running Opera/2 on debug odin.

File:

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

tags/trunk/src/kernel32/wprocess.cpp ¶

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.128 2001-07-03 13:23:09 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.129 2001-07-10 20:41:50 bird Exp $ */
 
 /*
@@ -840 +840 @@
             }
             else {
+                /* bird 2001-07-10:
+                 *  let's fail right away instead of hitting DebugInt3s and fail other places.
+                 *  This is very annoying when running Opera on a debug build with netscape/2
+                 *  plugins present. We'll make this conditional for the time being.
+                 */
+                static BOOL fFailIfUnregisteredLX = -1;
+                if (fFailIfUnregisteredLX == -1)
+                    fFailIfUnregisteredLX = getenv("ODIN32.FAIL_IF_UNREGISTEREDLX") != NULL;
+                if (fExeStarted && fFailIfUnregisteredLX)
+                {
+                    dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): returns 0x%x. Loaded OS/2 dll %s using DosLoadModule. returns NULL.",
+                             lpszLibFile, hFile, dwFlags, hDll, szModname));
+                    SetLastError(ERROR_INVALID_EXE_SIGNATURE);
+                    return NULL;
+                }
                 dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): returns 0x%x. Loaded OS/2 dll %s using DosLoadModule.",
                          lpszLibFile, hFile, dwFlags, hDll, szModname));
@@ -1678 +1693 @@
         exename++;
         if (SearchPathA( NULL, &buffer[1], ".exe", sizeof(szAppName), szAppName, NULL ) ||
-            SearchPathA( NULL, &buffer[1], NULL, sizeof(szAppName), szAppName, NULL )) 
+            SearchPathA( NULL, &buffer[1], NULL, sizeof(szAppName), szAppName, NULL ))
         {
             //