Start using some C++ 14 features.

This commit is contained in:
Markus F.X.J. Oberhumer
2020-12-08 05:40:17 +01:00
parent 361a3056cb
commit f7e2266c3f
62 changed files with 971 additions and 960 deletions
+13 -13
View File
@@ -114,14 +114,14 @@ void PackW64Pep::buildLoader(const Filter *ft)
//getDecompressorSections(),
/*multipass ? "PEMULTIP" : */ "",
"PEMAIN10",
NULL
nullptr
);
addLoader(tmp_tlsindex ? "PETLSHAK2" : "");
if (ft->id)
{
const unsigned texv = ih.codebase - rvamin;
assert(ft->calls > 0);
addLoader(texv ? "PECTTPOS" : "PECTTNUL",NULL);
addLoader(texv ? "PECTTPOS" : "PECTTNUL",nullptr);
addLoader("PEFILTER49");
}
if (soimport)
@@ -132,7 +132,7 @@ void PackW64Pep::buildLoader(const Filter *ft)
"PEIMPOR2",
isdll ? "PEIERDLL" : "PEIEREXE",
"PEIMDONE",
NULL
nullptr
);
if (sorelocs)
{
@@ -140,38 +140,38 @@ void PackW64Pep::buildLoader(const Filter *ft)
"PERELOC3",
big_relocs ? "REL64BIG" : "",
"RELOC64J",
NULL
nullptr
);
if __acc_cte(0)
{
addLoader(big_relocs&6 ? "PERLOHI0" : "",
big_relocs&4 ? "PERELLO0" : "",
big_relocs&2 ? "PERELHI0" : "",
NULL
nullptr
);
}
}
if (use_dep_hack)
addLoader("PEDEPHAK", NULL);
addLoader("PEDEPHAK", nullptr);
//NEW: TLS callback support PART 1, the callback handler installation - Stefan Widmann
if(use_tls_callbacks)
addLoader("PETLSC", NULL);
addLoader("PETLSC", nullptr);
addLoader("PEMAIN20", NULL);
addLoader("PEMAIN20", nullptr);
if (use_clear_dirty_stack)
addLoader("CLEARSTACK", NULL);
addLoader("PEMAIN21", NULL);
addLoader("CLEARSTACK", nullptr);
addLoader("PEMAIN21", nullptr);
if (ih.entry && isdll)
addLoader("PEISDLL9");
addLoader(ih.entry ? "PEDOJUMP" : "PERETURN", NULL);
addLoader(ih.entry ? "PEDOJUMP" : "PERETURN", nullptr);
//NEW: TLS callback support PART 2, the callback handler - Stefan Widmann
if(use_tls_callbacks)
addLoader("PETLSC2", NULL);
addLoader("PETLSC2", nullptr);
addLoader("IDENTSTR,UPX1HEAD", NULL);
addLoader("IDENTSTR,UPX1HEAD", nullptr);
}
bool PackW64Pep::handleForceOption()