Added PEDllCharacteristics attribute and changed default DllCharacteristics to TS_AWARE+NO_SEH+NX_COMPAT+DYNAMIC_BASE

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6537 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-08-15 19:15:06 +00:00
parent 0f264e9f5a
commit 3c2a937cab
7 changed files with 31 additions and 4 deletions

View file

@ -2808,6 +2808,16 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
return PS_ERROR;
#endif// NSIS_CONFIG_VISIBLE_SUPPORT
case TOK_PEDLLCHARACTERISTICS:
{
int s1, s2;
WORD add = (WORD)line.gettoken_int(1, &s1), del = (WORD)line.gettoken_int(2, &s2), org = PEDllCharacteristics;
if (!s1 || !s2) PRINTHELP();
PEDllCharacteristics &= ~del, PEDllCharacteristics |= add;
SCRIPT_MSG(_T("PEDllCharacteristics: 0x%.4x -> 0x%.4x\n"), org, PEDllCharacteristics);
}
return PS_OK;
case TOK_REQEXECLEVEL:
switch (line.gettoken_enum(1,_T("none\0user\0highest\0admin\0")))
{