diff --git a/Docs/src/attributes.but b/Docs/src/attributes.but index ac15c815..74828935 100644 --- a/Docs/src/attributes.but +++ b/Docs/src/attributes.but @@ -293,9 +293,9 @@ See \W{http://msdn.microsoft.com/en-us/library/dd464660}{MSDN} for more informat \c none|all|WinVista|\\Win7|Win8|Win8.1|Win10\\|{GUID} [...] -Declare that the installer is compatible with the specified Windows version(s). This adds a SupportedOS entry in the compatibility section of the application manifest. The default list of Win7+Win8+Win8.1 will probably be updated to include newer Windows versions in the future. \e{none} is the default if \R{arequestexecutionlevel}{RequestExecutionLevel} is set to \e{none} for compatibility reasons. +Declare that the installer is compatible with the specified Windows version(s). This adds a SupportedOS entry in the compatibility section of the application manifest. The default list of Win7+8+8.1+10 will probably be updated to include newer Windows versions in the future. \e{none} is the default if \R{arequestexecutionlevel}{RequestExecutionLevel} is set to \e{none} for compatibility reasons. -You can read more about the changes in behavior on \W{http://msdn.microsoft.com/en-us/library/windows/desktop/hh848036}{MSDN}. +Windows 8.1 and later will fake its version number if you don't declare support for that particular version. You can read more about the other changes in behavior on \W{http://msdn.microsoft.com/en-us/library/windows/desktop/hh848036}{MSDN}. \S2{amiscbuttontext} MiscButtonText diff --git a/Docs/src/history.but b/Docs/src/history.but index 513e6ef7..16fe62a3 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -1,5 +1,15 @@ \A{history} Changelog and Release Notes +\H{v3.0b3} 3.0 Beta 3 + +Released on ? ?th, 201? + +\S1{v3.0b3-cl} Changelog + +\S2{} Major Changes + +\b RequestExecutionLevel now defaults to \c{admin} + \H{v3.0b2} 3.0 Beta 2 Released on August 4th, 2015 diff --git a/Source/build.cpp b/Source/build.cpp index 7738c06c..e9415473 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -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(); diff --git a/Source/manifest.cpp b/Source/manifest.cpp index 69ed5537..9b89c418 100644 --- a/Source/manifest.cpp +++ b/Source/manifest.cpp @@ -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 = "Nullsoft Install System ";