Changeset 1665

Timestamp:

02/17/98 01:45:16 (11 years ago)

Author:

himi

Message:

Emacs 20.3.5 FSF import

Files:

• branches/GNU/src/unexw32.c (modified) (6 diffs)

branches/GNU/src/unexw32.c

@@ -100 +100 @@
-  extern void mainCRTStartup (void);
-
-1
+0
-  /* Give us a way to debug problems with crashes on startup when
-     running under the MSVC profiler. */
@@ -500 +500 @@
-#define ROUND_UP_DST(align) \
-  (dst = p_outfile->file_base + ROUND_UP (DST_TO_OFFSET (), (align)))
-#define ROUND_UP_DST_AND_ZERO(align)                                            \
-  do {                                                                          \
-    unsigned char *newdst = p_outfile->file_base                                \
-      + ROUND_UP (DST_TO_OFFSET (), (align));                                   \
-    /* Zero the alignment slop; it may actually initialize real data.  */       \
-    memset (dst, 0, newdst - dst);                                              \
-    dst = newdst;                                                               \
-  } while (0)
-
-  /* Copy the source image sequentially, ie. section by section after
@@ -531 +523 @@
-              nt_header->FileHeader.NumberOfSections * sizeof (*section));
-
-  /* Align the first section's raw data area, and set the header size
-     field accordingly.  */
-  ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment);
-  dst_nt_header->OptionalHeader.SizeOfHeaders = DST_TO_OFFSET ();
-
-  for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++)
-    {
@@ -541 +528 @@
-      sprintf (msg, "Copying raw data for %s...", section->Name);
-
+      /* Align the section's raw data area.  */
+      ROUND_UP_DST (dst_nt_header->OptionalHeader.FileAlignment);
-      dst_save = dst;
-
@@ -553 +542 @@
-        (msg, OFFSET_TO_PTR (section->PointerToRawData, p_infile),
-         section->SizeOfRawData);
-      /* Ensure alignment slop is zeroed.  */
-      ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment);
-
-      /* Note that various sections below may be aliases.  */
@@ -622 +609 @@
-        }
-
-      /* Align the section's raw data area.  */
-      ROUND_UP_DST (dst_nt_header->OptionalHeader.FileAlignment);
-
-      section++;
-      dst_section++;
-    }
+
+  /* Pad out the final section raw data area.  */
+  ROUND_UP_DST (dst_nt_header->OptionalHeader.FileAlignment);
-
-  /* Copy remainder of source image.  */