Changeset 12766

Timestamp:

Sep 4, 2009, 4:09:49 PM (15 years ago)

Author:

Gary Byers

Message:

I thought that I'd checked this in already: in %PREPEND-FILE, change
PEF to PE (and add a comment explaining why.) Try to use the FFI to
generate some magic constants (structure sizes, field offsets) for us.
(I'd been concerned that this code might be broken on Win64, but the
relevant sizes/offsets that're used here happened to be OK.)

File:

• trunk/source/lib/dumplisp.lisp (modified) (2 diffs)

trunk/source/lib/dumplisp.lisp

@@ -193 +193 @@
                     header-pos))))))))))
                   
-  
+;;; Note that Windows executable files are in what they call "PE"
+;;; (= "Portable Executable") format, not to be confused with the "PEF"
+;;; (= "PowerPC Executable Format" or "Preferred Executable Format")
+;;; executable format that Apple used on Classic MacOS.
 (defun %prepend-file (out-fd in-fd len #+windows-target application-type)
   (declare (fixnum out-fd in-fd len))
@@ -211 +214 @@
                                          (:console #$IMAGE_SUBSYSTEM_WINDOWS_CUI)
                                          (:gui #$IMAGE_SUBSYSTEM_WINDOWS_GUI)))
-                     (offset (%get-long buf #x3c)))
-                (assert (< offset bufsize) () "PEF header not within first ~D bytes" bufsize)
+                     (offset (%get-long buf (get-field-offset #>IMAGE_DOS_HEADER.lfanew))))
+                (assert (< offset bufsize) () "PE header not within first ~D bytes" bufsize)
                 (assert (= (%get-byte buf (+ offset 0)) (char-code #\P)) ()
-                        "File does not appear to be a PEF file")
+                        "File does not appear to be a PE file")
                 (assert (= (%get-byte buf (+ offset 1)) (char-code #\E)) ()
-                        "File does not appear to be a PEF file")
+                        "File does not appear to be a PE file")
                 (assert (= (%get-byte buf (+ offset 2)) 0) ()
-                        "File does not appear to be a PEF file")
+                        "File does not appear to be a PE file")
                 (assert (= (%get-byte buf (+ offset 3)) 0) ()
-                        "File does not appear to be a PEF file")
-                ;; File is a PEF file -- Windows subsystem byte goes at offset 68 in the
+                        "File does not appear to be a PE file")
+                ;; File is a PE file -- Windows subsystem byte goes at offset 68 in the
                 ;;  "optional header" which appears right after the standard header (20 bytes)
-                ;;  and the PEF cookie (4 bytes)
+                ;;  and the PE cookie (4 bytes)
                 (setf (%get-byte buf (+ offset 4 20 68)) application-byte)))
             (let* ((nwritten (fd-write out-fd buf nread)))