Changeset 6301 for trunk/src

Timestamp:

Jul 10, 2001, 10:18:12 PM (24 years ago)

Author:

bird

Message:

Better WinExe == NULL check. Set fDll flag in Win32Pe2LxImage.

File:

• trunk/src/kernel32/windllpe2lx.cpp (modified) (4 diffs)

trunk/src/kernel32/windllpe2lx.cpp

@@ -1 @@
-/* $Id: windllpe2lx.cpp,v 1.10 2001-07-08 02:49:47 bird Exp $ */
+/* $Id: windllpe2lx.cpp,v 1.11 2001-07-10 20:18:12 bird Exp $ */
 
 /*
@@ -39 +39 @@
 #include "dbglocal.h"
 
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+extern BOOL fPeLoader;
 
 /**
@@ -111 +115 @@
         iConsoleDevicesRegister();
 
-        /* Before we attach the DLL we must make sure that we have a valid executable */
-        if (!WinExe)
+        /*
+         * Before we attach the DLL we must make sure that we have a valid executable
+         * Should perhaps find a good way of checking for native LX binaries...
+         */
+        if (!WinExe && !fPeLoader)
+        {
+            dprintf(("RegisterPe2LxDll: tries to do an early exe init.\n"));
             Win32Pe2LxExe::earlyInit();
+        }
 
         /* Add reference and attach dll to process. */
@@ -143 +153 @@
 {
     dprintf(("Win32Pe2LxDll::Win32Pe2LxDll %s", szModule));
+    fDll = TRUE;
 }