Changeset 3399 for trunk/src

Timestamp:

Apr 16, 2000, 8:47:22 AM (25 years ago)

Author:

bird

Message:

Corrected bug - WinExe might be NULL during intiation. Currently we'll
ignore the executable path. (temprorary fix!)

File:

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

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.16 2000-04-16 04:27:37 bird Exp $ */
+/* $Id: winimagebase.cpp,v 1.17 2000-04-16 06:47:22 bird Exp $ */
 
 /*
@@ -269 +269 @@
                      *      slashes are backslashes!
                      */
+                    if (!WinExe) continue;
                     pszPath = strcpy(plv->szPath, WinExe->getFullPath());
                 }
@@ -455 +456 @@
 //******************************************************************************
 //******************************************************************************
+/**
+ * Checks if a file is a PE executable image valid to be executed on this machine.
+ * @returns   FALSE if not PE image.
+ *            > 0 if valid PE image.
+ *                1 DLL
+ *                2 EXE
+ * @param     szFilename    Pointer to filename
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @remark    Should not call findDll!
+ */
 BOOL Win32ImageBase::isPEImage(char *szFileName)
 {
@@ -539 +550 @@
   }
   DosClose(win32handle);
-  return(TRUE);
+  return (fh.Characteristics & IMAGE_FILE_DLL ? 1 : 2);
 
 failure: