dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

RequestExecutionLevel now defaults to admin

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6599 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-08-07 00:13:36 +00:00
parent 32f9b646e4
commit 10448ec632
4 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/build.cpp
View file

@ -280,7 +280,7 @@ CEXEBuild::CEXEBuild(signed char pponly) :
PEDllCharacteristics = IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE|IMAGE_DLLCHARACTERISTICS_NO_SEH|IMAGE_DLLCHARACTERISTICS_NX_COMPAT|IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; //forums.winamp.com/showthread.php?t=344755
PESubsysVerMaj = PESubsysVerMin = (WORD) -1;
manifest_comctl = manifest::comctl_old;
manifest_exec_level = manifest::exec_level_none;
manifest_exec_level = manifest::exec_level_admin;
manifest_dpiaware = manifest::dpiaware_notset;
manifest_sosl.setdefault();

3
Source/manifest.cpp
View file

@ -90,7 +90,8 @@ bool SupportedOSList::append(const TCHAR* osid)
string generate(comctl comctl_selection, exec_level exec_level_selection, dpiaware dpia, SupportedOSList& sosl)
{
if (comctl_selection == comctl_old && exec_level_selection == exec_level_none)
bool default_or_empty_sosl = sosl.isdefaultlist() || !sosl.getcount();
if (comctl_selection == comctl_old && exec_level_selection == exec_level_none && default_or_empty_sosl && dpiaware_notset == dpia)
return "";
string xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"><assemblyIdentity version=\"1.0.0.0\" processorArchitecture=\"*\" name=\"Nullsoft.NSIS.exehead\" type=\"win32\"/><description>Nullsoft Install System ";