From a4d79d73755feab0a924b57b0677104b485930ac Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 14 Mar 2006 02:16:26 +0000 Subject: [PATCH] Small cosmetic changes. committer: mfx 1142302586 +0000 --- src/p_armpe.cpp | 9 +++++---- src/p_w32pe.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/p_armpe.cpp b/src/p_armpe.cpp index 2229dc78..64ccd0e6 100644 --- a/src/p_armpe.cpp +++ b/src/p_armpe.cpp @@ -1564,11 +1564,12 @@ void PackArmPe::pack(OutputFile *fo) // check the PE header // FIXME: add more checks if (!opt->force && ( - ih.opthdrsize != 0xE0 - || (ih.flags & EXECUTABLE) == 0 - || ih.subsystem != 9 + (ih.cpu != 0x1c0) + || (ih.opthdrsize != 0xe0) + || ((ih.flags & EXECUTABLE) == 0) + || (ih.subsystem != 9) || (ih.entry == 0 && !isdll) - || ih.ddirsentries != 16 + || (ih.ddirsentries != 16) // || IDSIZE(PEDIR_EXCEPTION) // is this used on arm? // || IDSIZE(PEDIR_COPYRIGHT) )) diff --git a/src/p_w32pe.cpp b/src/p_w32pe.cpp index 42307c82..377f26f9 100644 --- a/src/p_w32pe.cpp +++ b/src/p_w32pe.cpp @@ -1676,12 +1676,12 @@ void PackW32Pe::pack(OutputFile *fo) // check the PE header // FIXME: add more checks if (!opt->force && ( - ih.cpu < 0x14c || ih.cpu > 0x150 - || ih.opthdrsize != 0xE0 - || (ih.flags & EXECUTABLE) == 0 + (ih.cpu < 0x14c || ih.cpu > 0x150) + || (ih.opthdrsize != 0xe0) + || ((ih.flags & EXECUTABLE) == 0) || (ih.subsystem != 2 && ih.subsystem != 3 && ih.subsystem != 1) || (ih.entry == 0 && !isdll) - || ih.ddirsentries != 16 + || (ih.ddirsentries != 16) || IDSIZE(PEDIR_EXCEPTION) // is this used on i386? // || IDSIZE(PEDIR_COPYRIGHT) ))