From a97f08a28113df5539c0b3c23c6dba008a1d3c60 Mon Sep 17 00:00:00 2001 From: anders_k Date: Tue, 13 Dec 2011 02:04:16 +0000 Subject: [PATCH] Added some rarely used SW_ flags to ExecShell whitelist git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6207 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/script.cpp | 4 ++-- Source/tokens.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/script.cpp b/Source/script.cpp index 5b0e4a3a..89c779f4 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -4158,8 +4158,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) ent.offsets[3]=SW_SHOWNORMAL; if (line.getnumtokens() > 4) { - int tab[5]={SW_SHOWDEFAULT,SW_SHOWNORMAL,SW_SHOWMAXIMIZED,SW_SHOWMINIMIZED,SW_HIDE}; - int a=line.gettoken_enum(4,_T("SW_SHOWDEFAULT\0SW_SHOWNORMAL\0SW_SHOWMAXIMIZED\0SW_SHOWMINIMIZED\0SW_HIDE\0")); + int tab[8]={SW_SHOWDEFAULT,SW_SHOWNORMAL,SW_SHOWMAXIMIZED,SW_SHOWMINIMIZED,SW_HIDE,SW_SHOW,SW_SHOWNA,SW_SHOWMINNOACTIVE}; + int a=line.gettoken_enum(4,_T("SW_SHOWDEFAULT\0SW_SHOWNORMAL\0SW_SHOWMAXIMIZED\0SW_SHOWMINIMIZED\0SW_HIDE\0SW_SHOW\0SW_SHOWNA\0SW_SHOWMINNOACTIVE\0")); if (a < 0) PRINTHELP() ent.offsets[3]=tab[a]; } diff --git a/Source/tokens.cpp b/Source/tokens.cpp index bcd78baa..2b86e0b1 100644 --- a/Source/tokens.cpp +++ b/Source/tokens.cpp @@ -80,7 +80,7 @@ static tokenType tokenlist[TOK__LAST] = {TOK_EXCH,_T("Exch"),0,1,_T("[$(user_var)] | [stack_item_index]"),TP_CODE}, {TOK_EXEC,_T("Exec"),1,0,_T("command_line"),TP_CODE}, {TOK_EXECWAIT,_T("ExecWait"),1,1,_T("command_line [$(user_var: return value)]"),TP_CODE}, -{TOK_EXECSHELL,_T("ExecShell"),2,2,_T("(open|print|etc) command_line [parameters [showmode]]\n showmode=(SW_SHOWNORMAL|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_HIDE)"),TP_CODE}, +{TOK_EXECSHELL,_T("ExecShell"),2,2,_T("(open|print|etc) command_line [parameters [showmode]]\n showmode=(SW_SHOWNORMAL|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_HIDE|SW_SHOW)"),TP_CODE}, {TOK_EXPANDENVSTRS,_T("ExpandEnvStrings"),2,0,_T("$(user_var: output) string"),TP_CODE}, {TOK_FINDWINDOW,_T("FindWindow"),2,3,_T("$(user_var: handle output) WindowClass [WindowTitle] [Window_Parent] [Child_After]"),TP_CODE}, {TOK_FINDCLOSE,_T("FindClose"),1,0,_T("$(user_var: handle input)"),TP_CODE},