diff --git a/src/pefile.cpp b/src/pefile.cpp index 760a6fa5..8b0a0fa5 100644 --- a/src/pefile.cpp +++ b/src/pefile.cpp @@ -2138,7 +2138,7 @@ unsigned PeFile::handleStripRelocs(upx_uint64_t ih_imagebase, upx_uint64_t default_imagebase, unsigned dllflags) { - if (dllflags & IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE) + if (dllflags & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) opt->win32_pe.strip_relocs = false; else if (isdll) //do never strip relocations from DLLs opt->win32_pe.strip_relocs = false; @@ -2245,10 +2245,10 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh, if (ih.dllflags & IMAGE_DLLCHARACTERISTICS_CONTROL_FLOW_GUARD) throwCantPack("CFGuard enabled PE files are not supported"); - if (ih.dllflags & IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY) + if (ih.dllflags & IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY) { if (opt->force) - ih.dllflags &= ~(unsigned)IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY; + ih.dllflags &= ~(unsigned)IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY; else throwCantPack("image forces integrity check (use --force to remove)"); } diff --git a/src/pefile.h b/src/pefile.h index 99f12aa8..bb42b03e 100644 --- a/src/pefile.h +++ b/src/pefile.h @@ -261,9 +261,9 @@ protected: //NEW: DLL characteristics definition for ASLR, ... - Stefan Widmann enum { - IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE = 0x0040, - IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY = 0x0080, - IMAGE_DLL_CHARACTERISTICS_NX_COMPAT = 0x0100, + IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE = 0x0040, + IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY = 0x0080, + IMAGE_DLLCHARACTERISTICS_NX_COMPAT = 0x0100, IMAGE_DLLCHARACTERISTICS_NO_ISOLATION = 0x0200, IMAGE_DLLCHARACTERISTICS_NO_SEH = 0x0400, IMAGE_DLLCHARACTERISTICS_NO_BIND = 0x0800,