diff -Nru nsis-3.05/ChangeLog nsis-3.06.1/ChangeLog
--- nsis-3.05/ChangeLog	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/ChangeLog	2020-08-01 02:31:06.000000000 +0000
@@ -1,3 +1,544 @@
+2020-08-01 02:28  kichik
+
+	* /NSIS/tags/v3061: Tagging for release 3.06.1
+
+2020-08-01 02:24  kichik
+
+	* /NSIS/trunk/Menu/images/header.gif: 3.06.1
+
+2020-08-01 02:09  kichik
+
+	* /NSIS/trunk/Docs/src/history.but: update history
+
+2020-08-01 01:40  anders_k
+
+	* /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Source/exehead/exec.c, /NSIS/trunk/Source/script.cpp:
+	  Fixed SetBrandingImage crash
+
+2020-08-01 00:29  anders_k
+
+	* /NSIS/trunk/Source/manifest.cpp: Fix GCC TtoC conversion
+
+2020-08-01 00:25  kichik
+
+	* /NSIS/trunk/.travis.yml: don't ignore errors
+
+2020-07-31 23:11  kichik
+
+	* /NSIS/tags/v306: Tagging for release 3.06
+
+2020-07-31 23:08  kichik
+
+	* /NSIS/trunk/Menu/images/header.gif: 3.06
+
+2020-07-31 22:53  kichik
+
+	* /NSIS/trunk/Include/Integration.nsh: fix eol
+
+2020-07-31 22:40  kichik
+
+	* /NSIS/trunk/Examples/install-per-user.nsi,
+	  /NSIS/trunk/Examples/install-shared.nsi: fix eol
+
+2020-07-31 21:38  kichik
+
+	* /NSIS/trunk/Source/build.cpp, /NSIS/trunk/Source/manifest.cpp:
+	  vc6 build fixes
+
+2020-07-31 21:06  anders_k
+
+	* /NSIS/trunk/Source/build.cpp: Help VC6 find the type
+
+2020-07-31 20:07  kichik
+
+	* /NSIS/trunk/Contrib/InstallOptions/testlink.ini,
+	  /NSIS/trunk/Contrib/Makensisw/makensisw.h,
+	  /NSIS/trunk/Contrib/System/System.html,
+	  /NSIS/trunk/Docs/src/basic.but, /NSIS/trunk/Docs/src/build.but,
+	  /NSIS/trunk/Docs/src/config.but,
+	  /NSIS/trunk/Docs/src/headers.but,
+	  /NSIS/trunk/Docs/src/history.but, /NSIS/trunk/Docs/src/intro.but,
+	  /NSIS/trunk/Docs/src/library.but,
+	  /NSIS/trunk/Docs/src/tutorial.but,
+	  /NSIS/trunk/Docs/src/usefulfunc.but,
+	  /NSIS/trunk/Docs/src/var.but, /NSIS/trunk/Examples/makensis.nsi,
+	  /NSIS/trunk/Examples/NSISMenu.nsi,
+	  /NSIS/trunk/Include/Sections.nsh,
+	  /NSIS/trunk/Include/VB6RunTime.nsh, /NSIS/trunk/Menu/index.html,
+	  /NSIS/trunk/README.md, /NSIS/trunk/Scripts/release.py: use https
+
+2020-07-31 19:52  kichik
+
+	* /NSIS/trunk/Docs/src/history.but: update for release
+
+2020-07-25 20:13  anders_k
+
+	* /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Source/manifest.cpp, /NSIS/trunk/Source/manifest.h,
+	  /NSIS/trunk/Source/script.cpp, /NSIS/trunk/Source/tokens.cpp,
+	  /NSIS/trunk/Source/tokens.h: Added experimental
+	  ManifestAppendCustomString
+
+2020-07-18 23:18  anders_k
+
+	* /NSIS/trunk/Source/icon.cpp: Fix unaligned memory access (bug
+	  #290)
+
+2020-06-29 23:08  anders_k
+
+	* /NSIS/trunk/Contrib/ExDLL/exdll.dsp,
+	  /NSIS/trunk/Contrib/Library/RegTool/SConscript,
+	  /NSIS/trunk/Contrib/Makensisw/SConscript,
+	  /NSIS/trunk/Contrib/nsExec/SConscript,
+	  /NSIS/trunk/Contrib/NSISdl/SConscript,
+	  /NSIS/trunk/Contrib/UserInfo/SConscript,
+	  /NSIS/trunk/Contrib/UserInfo/UserInfo.c,
+	  /NSIS/trunk/Contrib/zip2exe/SConscript,
+	  /NSIS/trunk/Source/exehead/SConscript: Try to work around the
+	  mingw-w64 kernel32:OpenThreadToken library issue
+
+2020-06-28 22:02  anders_k
+
+	* /NSIS/trunk/Source/exehead/util.h: Don't perform workaround on
+	  98/ME
+
+2020-06-28 21:55  anders_k
+
+	* /NSIS/trunk/Source/exehead/Ui.c,
+	  /NSIS/trunk/Source/exehead/util.h: Only perform component list
+	  redraw hack on 95/NT4 to avoid flicker
+
+2020-06-27 23:18  anders_k
+
+	* /NSIS/trunk/Docs/src/history.but, /NSIS/trunk/SCons/Config/gnu:
+	  Don't let GCC 10 generate memmove calls (bug #1248)
+
+2020-06-26 22:52  anders_k
+
+	* /NSIS/trunk/Docs/src/history.but, /NSIS/trunk/SCons/Config/gnu,
+	  /NSIS/trunk/SCons/Tools/mstoolkit.py, /NSIS/trunk/SCons/utils.py,
+	  /NSIS/trunk/SConstruct, /NSIS/trunk/Source/build.cpp: Primitive
+	  SOURCE_DATE_EPOCH support for reproducible builds (patches 294)
+
+2020-06-07 21:05  anders_k
+
+	* /NSIS/trunk/Contrib/Language files/SimpChinese.nlf,
+	  /NSIS/trunk/Contrib/Language files/SimpChinese.nsh,
+	  /NSIS/trunk/Docs/src/credits.but,
+	  /NSIS/trunk/Docs/src/history.but: Improved Simplified Chinese
+	  translation (Patch 297)
+
+2020-06-06 14:14  anders_k
+
+	* /NSIS/trunk/Examples/NSISMenu.nsi, /NSIS/trunk/SConstruct: Try
+	  harder to generate a usable version string
+
+2020-06-06 13:17  anders_k
+
+	* /NSIS/trunk/Source/lineparse.cpp: Avoid GCC maybe-uninitialized
+	  warning
+
+2020-05-23 19:28  anders_k
+
+	* /NSIS/trunk/Source/tokens.cpp: Make all preprocessor instructions
+	  lower case (patch 287)
+
+2020-05-21 00:44  anders_k
+
+	* /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Examples/install-per-user.nsi,
+	  /NSIS/trunk/Examples/install-shared.nsi,
+	  /NSIS/trunk/Examples/makensis.nsi,
+	  /NSIS/trunk/Include/Integration.nsh,
+	  /NSIS/trunk/Include/SConscript: Added UnpinShortcut and
+	  NotifyShell_AssocChanged macros
+
+2020-05-17 21:37  anders_k
+
+	* /NSIS/trunk/Docs/src/bin/halibut/halibut.h: GCC -fno-common is
+	  now the defaul in GCC 10 (xantares PR for RH/Fedora bug 1799650)
+
+2020-05-17 21:21  anders_k
+
+	* /NSIS/trunk/Include/WinVer.nsh: WinVer Win10 20H1 detection
+
+2020-05-02 21:53  anders_k
+
+	* /NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh,
+	  /NSIS/trunk/Source/build.cpp, /NSIS/trunk/Source/build.h,
+	  /NSIS/trunk/Source/lineparse.cpp, /NSIS/trunk/Source/lineparse.h,
+	  /NSIS/trunk/Source/script.cpp,
+	  /NSIS/trunk/Source/Tests/preprocessor.nsi,
+	  /NSIS/trunk/Source/tokens.cpp: Added LineParser::gettoken_intx
+	  with basic arithmetic expression handling for LoadAndSetImage,
+	  SectionSetFlags and SectionSetInstTypes.
+
+2020-05-01 13:15  anders_k
+
+	* /NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh,
+	  /NSIS/trunk/Docs/src/ui.but, /NSIS/trunk/Source/build.h,
+	  /NSIS/trunk/Source/exehead/exec.c,
+	  /NSIS/trunk/Source/exehead/fileform.h,
+	  /NSIS/trunk/Source/script.cpp, /NSIS/trunk/Source/tokens.cpp:
+	  LoadAndSetImage can return the image handle
+
+2020-04-27 12:37  anders_k
+
+	* /NSIS/trunk/Examples/install-shared.nsi: HKLM, not HKCU
+
+2020-04-27 12:36  anders_k
+
+	* /NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh,
+	  /NSIS/trunk/Contrib/nsDialogs/Readme.html,
+	  /NSIS/trunk/Docs/src/history.but: Added NSD NetAddress control
+	  and Date macros
+
+2020-04-23 18:31  anders_k
+
+	* /NSIS/trunk/Contrib/Modern UI 2/Readme.html,
+	  /NSIS/trunk/Contrib/nsDialogs/example.nsi,
+	  /NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh,
+	  /NSIS/trunk/Contrib/nsDialogs/Readme.html,
+	  /NSIS/trunk/Include/WinMessages.nsh: Added DatePicker NSD control
+
+2020-04-22 21:37  anders_k
+
+	* /NSIS/trunk/Contrib/nsDialogs/browse.c: Make sure filter buffer
+	  has room for the double terminator
+
+2020-04-22 21:31  anders_k
+
+	* /NSIS/trunk/Contrib/nsDialogs/Readme.html: Improved
+	  nsDialogs::SelectFileDialog filter string format documentation
+
+2020-04-22 21:14  anders_k
+
+	* /NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh,
+	  /NSIS/trunk/Docs/src/defines.but,
+	  /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Source/scriptpp.cpp,
+	  /NSIS/trunk/Source/Tests/preprocessor.nsi,
+	  /NSIS/trunk/Source/tokens.cpp: Added !define /intfmt
+
+2020-04-21 19:02  anders_k
+
+	* /NSIS/trunk/Docs/src/usefulinfos.but: DumpLog example function
+	  should not return anything
+
+2020-04-21 18:53  anders_k
+
+	* /NSIS/trunk/Contrib/Makensisw/makensisw.cpp,
+	  /NSIS/trunk/Contrib/Makensisw/makensisw.h,
+	  /NSIS/trunk/Contrib/Makensisw/Readme.txt,
+	  /NSIS/trunk/Contrib/Makensisw/resource.h,
+	  /NSIS/trunk/Contrib/Makensisw/resource.rc,
+	  /NSIS/trunk/Contrib/Makensisw/SConscript,
+	  /NSIS/trunk/Contrib/Makensisw/utils.cpp: Added MakeNsisW GUID
+	  generator command
+
+2020-04-20 17:48  anders_k
+
+	* /NSIS/trunk/SConstruct: Make sure NSIS_VERSION is not just "v"
+
+2020-04-20 17:21  anders_k
+
+	* /NSIS/trunk/Contrib/Makensisw/makensisw.cpp,
+	  /NSIS/trunk/Contrib/Makensisw/makensisw.h,
+	  /NSIS/trunk/Contrib/Makensisw/utils.h,
+	  /NSIS/trunk/Source/build.cpp, /NSIS/trunk/Source/build.h,
+	  /NSIS/trunk/Source/growbuf.h: Added API for compiler host to
+	  choose a different output path on output error
+
+2020-04-14 17:37  anders_k
+
+	* /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Docs/src/usefulfunc.but,
+	  /NSIS/trunk/Docs/src/usefulinfos.but: Updated example functions
+	  in the main documentation
+
+2020-04-13 19:16  anders_k
+
+	* /NSIS/trunk/Docs/src/registry.but,
+	  /NSIS/trunk/Examples/example1.nsi,
+	  /NSIS/trunk/Examples/example2.nsi,
+	  /NSIS/trunk/Examples/install-per-user.nsi,
+	  /NSIS/trunk/Examples/install-shared.nsi,
+	  /NSIS/trunk/Source/exehead/fileform.h: Added a file association
+	  example to install-per-user.nsi
+
+2020-04-12 18:25  anders_k
+
+	* /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Docs/src/registry.but,
+	  /NSIS/trunk/Source/exehead/exec.c,
+	  /NSIS/trunk/Source/exehead/fileform.h,
+	  /NSIS/trunk/Source/exehead/util.c,
+	  /NSIS/trunk/Source/exehead/util.h, /NSIS/trunk/Source/script.cpp,
+	  /NSIS/trunk/Source/tokens.cpp: DeleteRegKey /ifempty now also
+	  checks for values
+
+2020-04-06 18:04  anders_k
+
+	* /NSIS/trunk/Docs/src/generalpurpose.but,
+	  /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Include/LogicLib.nsh, /NSIS/trunk/Include/x64.nsh:
+	  Added RegKeyIsEmpty LogicLib operator
+
+2020-03-29 20:08  anders_k
+
+	* /NSIS/trunk/Contrib/Language files/German.nlf,
+	  /NSIS/trunk/Contrib/Language files/German.nsh,
+	  /NSIS/trunk/Docs/src/history.but: Updated German (SebStange PR)
+
+2020-03-29 19:10  anders_k
+
+	* /NSIS/trunk/Examples/makensis.nsi,
+	  /NSIS/trunk/Examples/SConscript,
+	  /NSIS/trunk/Examples/viewhtml.nsi: Removed viewhtml.nsi
+
+2020-03-26 00:19  anders_k
+
+	* /NSIS/trunk/Examples/makensis.nsi,
+	  /NSIS/trunk/Examples/SConscript,
+	  /NSIS/trunk/Examples/unicode.nsi,
+	  /NSIS/trunk/Examples/UserVars.nsi: Updated unicode.nsi and
+	  removed UserVars.nsi
+
+2020-03-24 02:35  anders_k
+
+	* /NSIS/trunk/Contrib/Graphics/SConscript,
+	  /NSIS/trunk/Contrib/Modern UI 2/SConscript,
+	  /NSIS/trunk/Contrib/Modern UI/SConscript,
+	  /NSIS/trunk/Docs/src/history.but, /NSIS/trunk/SConstruct: Python
+	  3 fixes (patch #296)
+
+2020-03-24 02:01  anders_k
+
+	* /NSIS/trunk/Contrib/Language files/English.nsh,
+	  /NSIS/trunk/Contrib/MultiUser/MultiUser.nsh,
+	  /NSIS/trunk/Contrib/MultiUser/Readme.html,
+	  /NSIS/trunk/Docs/src/history.but: * Added
+	  MULTIUSER_INSTALLMODEPAGE_SHOWUSERNAME
+	  * Decoupled the page from MUI
+	  * Try FOLDERID_UserProgramFiles
+
+2020-03-18 21:27  anders_k
+
+	* /NSIS/trunk/Contrib/Modern UI 2/Readme.html,
+	  /NSIS/trunk/Contrib/Modern UI/Readme.html,
+	  /NSIS/trunk/Contrib/MultiUser/MultiUser.nsh,
+	  /NSIS/trunk/Contrib/MultiUser/Readme.html,
+	  /NSIS/trunk/Docs/src/basic.but: Fixed
+	  MULTIUSER_INSTALLMODE_FUNCTION and minor typos
+
+2020-03-18 01:01  anders_k
+
+	* /NSIS/trunk/Docs/src/var.but,
+	  /NSIS/trunk/Examples/install-per-user.nsi,
+	  /NSIS/trunk/Examples/install-shared.nsi,
+	  /NSIS/trunk/Examples/makensis.nsi,
+	  /NSIS/trunk/Examples/SConscript: Added the install-shared.nsi
+	  example
+
+2020-03-17 19:02  anders_k
+
+	* /NSIS/trunk/Docs/src/generalpurpose.but,
+	  /NSIS/trunk/Examples/install-per-user.nsi,
+	  /NSIS/trunk/Examples/makensis.nsi,
+	  /NSIS/trunk/Examples/SConscript: Added install-per-user.nsi
+	  example
+
+2020-03-12 23:43  anders_k
+
+	* /NSIS/trunk/Docs/src/generalpurpose.but,
+	  /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Include/WinCore.nsh,
+	  /NSIS/trunk/Source/exehead/exec.c,
+	  /NSIS/trunk/Source/exehead/fileform.h,
+	  /NSIS/trunk/Source/exehead/util.c,
+	  /NSIS/trunk/Source/exehead/util.h, /NSIS/trunk/Source/script.cpp,
+	  /NSIS/trunk/Source/tokens.cpp, /NSIS/trunk/Source/tokens.h: Added
+	  GetKnownFolderPath
+
+2020-03-10 18:16  anders_k
+
+	* /NSIS/trunk/Docs/src/flowcontrol.but,
+	  /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Docs/src/registry.but,
+	  /NSIS/trunk/Include/LogicLib.nsh,
+	  /NSIS/trunk/Source/exehead/api.h, /NSIS/trunk/Source/script.cpp,
+	  /NSIS/trunk/Source/tokens.cpp, /NSIS/trunk/Source/tokens.h: Added
+	  IfRtlLanguage and GetRegView
+
+2020-03-10 01:44  anders_k
+
+	* /NSIS/trunk/Docs/src/flowcontrol.but,
+	  /NSIS/trunk/Docs/src/history.but,
+	  /NSIS/trunk/Include/LogicLib.nsh, /NSIS/trunk/Source/build.h,
+	  /NSIS/trunk/Source/script.cpp, /NSIS/trunk/Source/tokens.cpp,
+	  /NSIS/trunk/Source/tokens.h: Added IfShellVarContextAll and
+	  refactored flag instructions generation
+
+2020-03-05 00:07  kichik
+
+	* /NSIS/trunk/.travis.yml: fix deploy
+
+2020-03-03 19:57  kichik
+
+	* /NSIS/trunk/Contrib/SubStart/SConscript: fix #1242 - don't
+	  install substart on linux
+
+2020-01-02 21:36  anders_k
+
+	* /NSIS/trunk/.travis.yml: Update travis deploy script
+
+2020-01-01 21:13  anders_k
+
+	* /NSIS/trunk/Contrib/ExDLL/nsis_tchar.h,
+	  /NSIS/trunk/Contrib/InstallOptions/Readme.html,
+	  /NSIS/trunk/Contrib/Makensisw/wndspy.cpp,
+	  /NSIS/trunk/Contrib/Modern UI 2/License.txt,
+	  /NSIS/trunk/Contrib/Modern UI 2/MUI2.nsh,
+	  /NSIS/trunk/Contrib/Modern UI 2/Readme.html,
+	  /NSIS/trunk/Contrib/Modern UI/License.txt,
+	  /NSIS/trunk/Contrib/Modern UI/Readme.html,
+	  /NSIS/trunk/Contrib/Modern UI/System.nsh,
+	  /NSIS/trunk/Contrib/MultiUser/MultiUser.nsh,
+	  /NSIS/trunk/Contrib/nsExec/nsexec.c,
+	  /NSIS/trunk/Contrib/SubStart/substart.c,
+	  /NSIS/trunk/Contrib/System/Source/Call.S,
+	  /NSIS/trunk/Contrib/System/Source/Call-amd64.S,
+	  /NSIS/trunk/Contrib/System/System.html, /NSIS/trunk/COPYING,
+	  /NSIS/trunk/Docs/src/config.but,
+	  /NSIS/trunk/Include/LangFile.nsh,
+	  /NSIS/trunk/Include/VB6RunTime.nsh,
+	  /NSIS/trunk/Source/7zip/7zGuids.cpp,
+	  /NSIS/trunk/Source/7zip/7zip/Common/InBuffer.cpp,
+	  /NSIS/trunk/Source/7zip/7zip/Common/InBuffer.h,
+	  /NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.cpp,
+	  /NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.h,
+	  /NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.cpp,
+	  /NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/IMatchFinder.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMA.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h,
+	  /NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h,
+	  /NSIS/trunk/Source/7zip/7zip/ICoder.h,
+	  /NSIS/trunk/Source/7zip/7zip/IStream.h,
+	  /NSIS/trunk/Source/7zip/Common/Alloc.cpp,
+	  /NSIS/trunk/Source/7zip/Common/Alloc.h,
+	  /NSIS/trunk/Source/7zip/Common/CRC.cpp,
+	  /NSIS/trunk/Source/7zip/Common/CRC.h,
+	  /NSIS/trunk/Source/7zip/Common/Defs.h,
+	  /NSIS/trunk/Source/7zip/Common/MyCom.h,
+	  /NSIS/trunk/Source/7zip/Common/MyGuidDef.h,
+	  /NSIS/trunk/Source/7zip/Common/MyUnknown.h,
+	  /NSIS/trunk/Source/7zip/Common/MyWindows.h,
+	  /NSIS/trunk/Source/7zip/Common/StdAfx.h,
+	  /NSIS/trunk/Source/7zip/Common/Types.h,
+	  /NSIS/trunk/Source/7zip/LZMADecode.c,
+	  /NSIS/trunk/Source/7zip/LZMADecode.h,
+	  /NSIS/trunk/Source/afxres.h, /NSIS/trunk/Source/BinInterop.cpp,
+	  /NSIS/trunk/Source/BinInterop.h, /NSIS/trunk/Source/build.cpp,
+	  /NSIS/trunk/Source/build.h, /NSIS/trunk/Source/bzip2/blocksort.c,
+	  /NSIS/trunk/Source/bzip2/bzlib.c,
+	  /NSIS/trunk/Source/bzip2/bzlib.h,
+	  /NSIS/trunk/Source/bzip2/compress.c,
+	  /NSIS/trunk/Source/bzip2/decompress.c,
+	  /NSIS/trunk/Source/bzip2/huffman.c, /NSIS/trunk/Source/cbzip2.h,
+	  /NSIS/trunk/Source/clzma.cpp, /NSIS/trunk/Source/clzma.h,
+	  /NSIS/trunk/Source/compressor.h, /NSIS/trunk/Source/crc32.c,
+	  /NSIS/trunk/Source/crc32.h, /NSIS/trunk/Source/czlib.h,
+	  /NSIS/trunk/Source/DialogTemplate.cpp,
+	  /NSIS/trunk/Source/DialogTemplate.h,
+	  /NSIS/trunk/Source/dirreader.cpp, /NSIS/trunk/Source/dirreader.h,
+	  /NSIS/trunk/Source/exehead/afxres.h,
+	  /NSIS/trunk/Source/exehead/api.h,
+	  /NSIS/trunk/Source/exehead/bgbg.c,
+	  /NSIS/trunk/Source/exehead/components.c,
+	  /NSIS/trunk/Source/exehead/components.h,
+	  /NSIS/trunk/Source/exehead/config.h,
+	  /NSIS/trunk/Source/exehead/exec.c,
+	  /NSIS/trunk/Source/exehead/exec.h,
+	  /NSIS/trunk/Source/exehead/fileform.c,
+	  /NSIS/trunk/Source/exehead/fileform.h,
+	  /NSIS/trunk/Source/exehead/lang.h,
+	  /NSIS/trunk/Source/exehead/Main.c,
+	  /NSIS/trunk/Source/exehead/plugin.c,
+	  /NSIS/trunk/Source/exehead/plugin.h,
+	  /NSIS/trunk/Source/exehead/state.h,
+	  /NSIS/trunk/Source/exehead/Ui.c, /NSIS/trunk/Source/exehead/ui.h,
+	  /NSIS/trunk/Source/exehead/util.c,
+	  /NSIS/trunk/Source/exehead/util.h,
+	  /NSIS/trunk/Source/fileform.cpp, /NSIS/trunk/Source/fileform.h,
+	  /NSIS/trunk/Source/growbuf.cpp, /NSIS/trunk/Source/growbuf.h,
+	  /NSIS/trunk/Source/icon.cpp, /NSIS/trunk/Source/icon.h,
+	  /NSIS/trunk/Source/lang.cpp, /NSIS/trunk/Source/lang.h,
+	  /NSIS/trunk/Source/lineparse.cpp, /NSIS/trunk/Source/lineparse.h,
+	  /NSIS/trunk/Source/makenssi.cpp, /NSIS/trunk/Source/manifest.cpp,
+	  /NSIS/trunk/Source/manifest.h, /NSIS/trunk/Source/mmap.cpp,
+	  /NSIS/trunk/Source/mmap.h, /NSIS/trunk/Source/Platform.h,
+	  /NSIS/trunk/Source/Plugins.cpp, /NSIS/trunk/Source/Plugins.h,
+	  /NSIS/trunk/Source/ResourceEditor.cpp,
+	  /NSIS/trunk/Source/ResourceEditor.h,
+	  /NSIS/trunk/Source/ResourceVersionInfo.cpp,
+	  /NSIS/trunk/Source/ResourceVersionInfo.h,
+	  /NSIS/trunk/Source/script.cpp, /NSIS/trunk/Source/scriptpp.cpp,
+	  /NSIS/trunk/Source/ShConstants.cpp,
+	  /NSIS/trunk/Source/ShConstants.h, /NSIS/trunk/Source/strlist.cpp,
+	  /NSIS/trunk/Source/strlist.h, /NSIS/trunk/Source/tchar.h,
+	  /NSIS/trunk/Source/tokens.cpp, /NSIS/trunk/Source/tokens.h,
+	  /NSIS/trunk/Source/tstring.cpp, /NSIS/trunk/Source/tstring.h,
+	  /NSIS/trunk/Source/uservars.h, /NSIS/trunk/Source/utf.cpp,
+	  /NSIS/trunk/Source/utf.h, /NSIS/trunk/Source/util.cpp,
+	  /NSIS/trunk/Source/util.h,
+	  /NSIS/trunk/Source/validateunicode.cpp,
+	  /NSIS/trunk/Source/validateunicode.h,
+	  /NSIS/trunk/Source/winchar.cpp, /NSIS/trunk/Source/winchar.h,
+	  /NSIS/trunk/Source/writer.cpp, /NSIS/trunk/Source/writer.h,
+	  /NSIS/trunk/Source/zlib/INFBLOCK.C,
+	  /NSIS/trunk/Source/zlib/ZCONF.H, /NSIS/trunk/Source/zlib/ZLIB.H,
+	  /NSIS/trunk/Source/zlib/ZUTIL.H: (C) 2020
+
+2019-12-29 02:17  anders_k
+
+	* /NSIS/trunk/Docs/src/headers.but,
+	  /NSIS/trunk/Docs/src/history.but: Added links to more useful
+	  headers (Bug #1196)
+
+2019-12-16 03:13  kichik
+
+	* /NSIS/trunk/.travis.yml: add build.log to nightly zip
+
+2019-12-16 02:47  kichik
+
+	* /NSIS/trunk/.travis.yml: fix nightly
+
+2019-12-16 01:08  kichik
+
+	* /NSIS/trunk/Scripts/release.py: nuke old folders so release
+	  doesn't fail for no reason
+
 2019-12-16 00:47  kichik
 
 	* /NSIS/tags/v305: Tagging for release 3.05
diff -Nru nsis-3.05/Contrib/ExDLL/exdll.dsp nsis-3.06.1/Contrib/ExDLL/exdll.dsp
--- nsis-3.05/Contrib/ExDLL/exdll.dsp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/ExDLL/exdll.dsp	2020-06-29 23:08:12.000000000 +0000
@@ -52,8 +52,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib nsis\pluginapi.lib /nologo /entry:"DllMain" /dll /machine:I386 /nodefaultlib /out:"../../Plugins/exdll.dll" /opt:nowin98
+# ADD BASE LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib nsis\pluginapi.lib /nologo /entry:"DllMain" /dll /machine:I386 /nodefaultlib /out:"../../Plugins/exdll.dll" /opt:nowin98
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "exdll - Win32 Debug"
@@ -79,8 +79,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib nsis\pluginapi.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib nsis\pluginapi.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
diff -Nru nsis-3.05/Contrib/ExDLL/nsis_tchar.h nsis-3.06.1/Contrib/ExDLL/nsis_tchar.h
--- nsis-3.05/Contrib/ExDLL/nsis_tchar.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/ExDLL/nsis_tchar.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
diff -Nru nsis-3.05/Contrib/Graphics/SConscript nsis-3.06.1/Contrib/Graphics/SConscript
--- nsis-3.05/Contrib/Graphics/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Graphics/SConscript	2020-03-24 02:35:17.000000000 +0000
@@ -90,8 +90,8 @@
 
 Import('defenv')
 
-def join(prefix, list):
-	return map(lambda x: '%s/%s' % (prefix, x), list)
+def join(prefix, list_):
+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
 
 def dist(dir, files):
 	defenv.DistributeContrib(join(dir, files), path='Graphics/%s' % dir)
diff -Nru nsis-3.05/Contrib/InstallOptions/Readme.html nsis-3.06.1/Contrib/InstallOptions/Readme.html
--- nsis-3.05/Contrib/InstallOptions/Readme.html	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/InstallOptions/Readme.html	2020-01-01 21:13:57.000000000 +0000
@@ -883,7 +883,7 @@
         <pre>
 Original version Copyright &copy; 2001 Michael Bishop
 DLL version 1 Copyright &copy; 2001-2002 Nullsoft, Inc., ORTIM
-DLL version 2 Copyright &copy; 2003-2019 Amir Szekely, Joost Verburg, Dave Laundon
+DLL version 2 Copyright &copy; 2003-2020 Amir Szekely, Joost Verburg, Dave Laundon
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff -Nru nsis-3.05/Contrib/InstallOptions/testlink.ini nsis-3.06.1/Contrib/InstallOptions/testlink.ini
--- nsis-3.05/Contrib/InstallOptions/testlink.ini	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/InstallOptions/testlink.ini	2020-07-31 20:07:43.000000000 +0000
@@ -32,8 +32,8 @@
 Right=-40
 Top=70
 Bottom=80
-State=http://nsis.sourceforge.net/
-Text=* Homepage http://nsis.sourceforge.net/
+State=https://nsis.sourceforge.io/
+Text=* Homepage https://nsis.sourceforge.io/
 
 [Field 5]
 Type=Text
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/English.nsh" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/English.nsh"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/English.nsh"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/English.nsh"	2020-03-24 02:01:11.000000000 +0000
@@ -123,7 +123,7 @@
 !ifdef MULTIUSER_INSTALLMODEPAGE
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Choose Users"
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Choose for which users you want to install $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Select whether you want to install $(^NameDA) for yourself only or for all users of this computer. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Select whether you want to install $(^NameDA) only for yourself or for all users of this computer. $(^ClickNext)"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Install for anyone using this computer"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Install just for me"
 !endif
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/German.nlf" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/German.nlf"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/German.nlf"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/German.nlf"	2020-03-29 20:08:23.000000000 +0000
@@ -9,7 +9,7 @@
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by L.King, changes by R. Bisswanger, Tim Kosse, Frederik Schwarzer
+# Translation by L.King, changes by R. Bisswanger, Tim Kosse, Frederik Schwarzer & Sebastian Stange
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
@@ -19,7 +19,7 @@
 # ^LicenseSubCaption
 : Lizenzabkommen
 # ^ComponentsSubCaption
-: Installations-Optionen
+: Installationsoptionen
 # ^DirSubCaption
 : Zielverzeichnis
 # ^InstallingSubCaption
@@ -27,7 +27,7 @@
 # ^CompletedSubCaption
 : Fertig
 # ^UnComponentsSubCaption
-: Deinstallations-Optionen
+: Deinstallationsoptionen
 # ^UnDirSubCaption
 : Quellverzeichnis
 # ^ConfirmSubCaption
@@ -83,21 +83,21 @@
 # ^Custom
 Benutzerdefiniert
 # ^ComponentsText
-Wählen Sie die Komponenten aus, die Sie installieren möchten, und wählen Sie diejenigen ab, die Sie nicht installiert werden sollen. $_CLICK
+Wählen Sie die Komponenten, welche Sie installieren wollen. $_CLICK
 # ^ComponentsSubText1
-Installations-Typ bestimmen:
+Installationstyp bestimmen:
 # ^ComponentsSubText2_NoInstTypes
-Wählen Sie die Komponenten aus, die Sie installieren möchten:
+Wählen Sie die zu installierenden Komponenten:
 # ^ComponentsSubText2
-oder wählen Sie zusätzliche Komponenten aus, die Sie installieren möchten:
+oder wählen Sie zusätzliche zu installierende Komponenten:
 # ^UnComponentsText
-Wählen Sie die Komponenten aus, die Sie entfernen möchten, und wählen Sie diejenigen ab, die Sie nicht entfernt werden sollen. $_CLICK
+Wählen Sie die Komponenten, welche Sie entfernen wollen. $_CLICK
 # ^UnComponentsSubText1
-Deinstallations-Typ bestimmen:
+Deinstallationstyp bestimmen:
 # ^UnComponentsSubText2_NoInstTypes
-Wählen Sie die Komponenten aus, die Sie entfernen möchten:
+Wählen Sie die zu entfernenden Komponenten:
 # ^UnComponentsSubText2
-oder wählen Sie zusätzliche Komponenten aus, die Sie entfernen möchten:
+oder wählen Sie zusätzliche Komponenten, welche Sie entfernen möchten:
 # ^DirText
 $(^NameDA) wird in das unten angegebene Verzeichnis installiert. Falls Sie in ein anderes Verzeichnis installieren möchten, klicken Sie auf Durchsuchen und wählen Sie ein anderes Verzeichnis aus. $_CLICK
 # ^DirSubText
@@ -141,7 +141,7 @@
 # ^CreateShortcut
 "Verknüpfung wird erstellt: "
 # ^CreatedUninstaller
-"Deinstallations-Programm wird erstellt: "
+"Deinstallationsprogramm wird erstellt: "
 # ^Delete
 "Datei wird gelöscht: "
 # ^DeleteOnReboot
@@ -151,7 +151,7 @@
 # ^ErrorCreating
 "Fehler beim Erstellen: "
 # ^ErrorDecompressing
-Fehler beim Entpacken. Ist das Installations-Programm beschädigt?
+Fehler beim Entpacken. Ist das Installationsprogramm beschädigt?
 # ^ErrorRegistering
 Fehler beim Registrieren der DLL
 # ^ExecShell
@@ -163,7 +163,7 @@
 # ^ErrorWriting
 "Entpacken: Fehler beim Schreiben der Datei "
 # ^InvalidOpcode
-Beschädigtes Installations-Programm: ungültiger Befehlscode
+Beschädigtes Installationsprogramm: ungültiger Befehlscode
 # ^NoOLE
 "Kein OLE für: "
 # ^OutputFolder
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/German.nsh" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/German.nsh"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/German.nsh"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/German.nsh"	2020-03-29 20:08:23.000000000 +0000
@@ -1,15 +1,15 @@
 ;Language: German (1031)
-;By L.King, changes by K. Windszus & R. Bisswanger & M. Simmack & D. Weiß & Frederik Schwarzer
+;By L.King, changes by K. Windszus, R. Bisswanger, M. Simmack, D. Weiß, Frederik Schwarzer & S. Stange
 
 !insertmacro LANGFILE "German" = "Deutsch" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Willkommen beim Installations-$\r$\nAssistenten für $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Willkommen zur Installation$\r$\nvon $(^NameDA)"
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Dieser Assistent wird Sie durch die Installation von $(^NameDA) begleiten.$\r$\n$\r$\nEs wird empfohlen, vor der Installation alle anderen Programme zu schließen, damit bestimmte Systemdateien ohne Neustart ersetzt werden können.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Willkommen beim Deinstallations-$\r$\nAssistenten für $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Willkommen zur Deinstallation$\r$\nvon $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Dieser Assistent wird Sie durch die Deinstallation von $(^NameDA) begleiten.$\r$\n$\r$\nBitte beenden Sie $(^NameDA), bevor Sie mit der Deinstallation fortfahren.$\r$\n$\r$\n$_CLICK"
 !endif
 
@@ -30,7 +30,7 @@
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Drücken Sie die Bild-Runter-Taste, um den Rest des Abkommens zu sehen."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Drücken Sie die BILD-AB-Taste, um den Rest des Abkommens zu lesen."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
@@ -46,9 +46,9 @@
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beschreibung"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bewegen Sie den Mauszeiger über eine Komponente, um ihre Beschreibung zu sehen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bewegen Sie den Mauszeiger über eine Komponente, um die Beschreibung zu lesen."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Selektieren Sie eine Komponente, um ihre Beschreibung zu sehen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Wählen Sie eine Komponente, um die Beschreibung zu lesen."
   !endif
 !endif
 
@@ -82,7 +82,7 @@
 
 !ifdef MUI_FINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Die Installation von $(^NameDA) wird abgeschlossen"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) wurde auf Ihrem Computer installiert.$\r$\n$\r$\nKlicken Sie auf Fertigstellen, um den Installations-Assistenten zu schließen."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) wurde auf Ihrem Computer installiert.$\r$\n$\r$\nKlicken Sie auf Fertigstellen, um den Installationsassistenten zu schließen."
   ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Windows muss neu gestartet werden, um die Installation von $(^NameDA) zu vervollständigen. Möchten Sie Windows jetzt neu starten?"
 !endif
 
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/SimpChinese.nlf" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/SimpChinese.nlf"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/SimpChinese.nlf"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/SimpChinese.nlf"	2020-06-07 21:05:16.000000000 +0000
@@ -1,5 +1,6 @@
 # Header, don't edit
 NLF v6
+# Start editing here
 # Language ID
 2052
 # Font and size - dash (-) means default 字体名称与大小
@@ -9,32 +10,32 @@
 936
 # RTL - anything else than RTL means LTR 由右至左书写
 -
-# Revision date: 2010-09-28
-# Translator: Kii Ali <kiiali@cpatch.org>, <kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>
+# Revision date: 2020-06-03
+# Translator: Kii Ali <kiiali@cpatch.org>, <kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>, Tyson Tan <tysontan@tysontan.com>
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
 $(^Name) 安装
 # ^UninstallCaption
-$(^Name) 解除安装
+$(^Name) 卸载
 # ^LicenseSubCaption
 : 许可证协议
 # ^ComponentsSubCaption
 : 安装选项
 # ^DirSubCaption
-: 安装文件夹
+: 安装目录
 # ^InstallingSubCaption
 : 正在安装
 # ^CompletedSubCaption
 : 已完成
 # ^UnComponentsSubCaption
-: 解除安装选项
+: 卸载选项
 # ^UnDirSubCaption
-: 解除安装文件夹
+: 卸载文件夹
 # ^ConfirmSubCaption
 : 确认
 # ^UninstallingSubCaption
-: 正在解除安装
+: 正在卸载
 # ^UnCompletedSubCaption
 : 完成
 # ^BackBtn
@@ -44,13 +45,13 @@
 # ^AgreeBtn
 我接受(&I)
 # ^AcceptBtn
-我接受“许可证协议”中的条款(&A)
+我接受许可证协议中的条款(&A)
 # ^DontAcceptBtn
-我不接受“许可证协议”中的条款(&N)
+我不接受许可证协议中的条款(&N)
 # ^InstallBtn
 安装(&I)
 # ^UninstallBtn
-解除安装(&U)
+卸载(&U)
 # ^CancelBtn
 取消(&C)
 # ^CloseBtn
@@ -58,71 +59,71 @@
 # ^BrowseBtn
 浏览(&B)...
 # ^ShowDetailsBtn
-显示细节(&D)
+显示详情(&D)
 # ^ClickNext
-单击 [下一步(N)] 继续。
+点击 [下一步(N)] 继续。
 # ^ClickInstall
-单击 [安装(I)] 开始安装进程。
+点击 [安装(I)] 开始安装。
 # ^ClickUninstall
-单击 [解除安装(U)] 开始解除安装进程。
+点击 [卸载(U)] 开始卸载。
 # ^Name
 名称
 # ^Completed
 已完成
 # ^LicenseText
-在安装 $(^NameDA) 之前请检阅许可证协议。如果你接受协议中所有条款，单击 [我同意(I)] 。
+请在安装 $(^NameDA) 之前阅读许可证协议。如果你接受协议中所有条款，点击 [我同意(I)] 。
 # ^LicenseTextCB
-在安装 $(^NameDA) 之前请检阅许可证协议。如果你接受协议中所有条款，单击下方的勾选框。 $_CLICK
+请在安装 $(^NameDA) 之前阅读许可证协议。如果你接受协议中所有条款，点击下方的选框。 $_CLICK
 # ^LicenseTextRB
-在安装 $(^NameDA) 之前请检阅许可证协议。如果你接受协议中所有条款，选择下方的第一个选项。 $_CLICK
+请在安装 $(^NameDA) 之前阅读许可证协议。如果你接受协议中所有条款，选择下方的第一个选项。 $_CLICK
 # ^UnLicenseText
-在解除安装 $(^NameDA) 之前请检阅许可证协议。如果你接受协议中所有条款，单击 [我同意(I)] 。
+请在卸载 $(^NameDA) 之前阅读许可证协议。如果你接受协议中所有条款，点击 [我同意(I)] 。
 # ^UnLicenseTextCB
-在解除安装 $(^NameDA) 之前请检阅许可证协议。如果你接受协议中所有条款，单击下方的勾选框。 $_CLICK
+请在卸载 $(^NameDA) 之前阅读许可证协议。如果你接受协议中所有条款，点击下方的选框。 $_CLICK
 # ^UnLicenseTextRB
-在解除安装 $(^NameDA) 之前请检阅许可证协议。如果你接受协议中所有条款，选择下方的第一个选项。 $_CLICK
+请在卸载 $(^NameDA) 之前阅读许可证协议。如果你接受协议中所有条款，选择下方的第一个选项。 $_CLICK
 # ^Custom
 自定义
 # ^ComponentsText
-勾选你想要安装的组件，并解除勾选你不希望安装的组件。 $_CLICK
+请勾选你想安装的组件，并取消勾选你不想安装的组件。 $_CLICK
 # ^ComponentsSubText1
-选定安装的类型: 
+选定的安装的类型: 
 # ^ComponentsSubText2_NoInstTypes
 选定安装的组件: 
 # ^ComponentsSubText2
 或者，自定义选定想安装的组件: 
 # ^UnComponentsText
-勾选你想要解除安装的组件，并解除勾选你不想要望解除安装的组件。 $_CLICK
+请勾选你想卸载的组件，并取消勾选你不想卸载的组件。 $_CLICK
 # ^UnComponentsSubText1
-选择解除安装的类型: 
+选择卸载的类型: 
 # ^UnComponentsSubText2_NoInstTypes
-选择要解除安装的组件: 
+选择要卸载的组件: 
 # ^UnComponentsSubText2
 或是，选择想要解除安装的可选项组件: 
 # ^DirText
-Setup 将安装 $(^NameDA) 在下列文件夹。要安装到不同文件夹，单击 [浏览(B)...] 并选择其他的文件夹。 $_CLICK
+安装程序将把 $(^NameDA) 安装到以下目录。要安装到另一个目录，请点击 [浏览(B)...] 并选择其他的文件夹。 $_CLICK
 # ^DirSubText
-目标文件夹
+安装目录
 # ^DirBrowseText
-选择要安装 $(^NameDA) 的文件夹位置: 
+选择安装此软件的 $(^NameDA) 的位置: 
 # ^UnDirText
-Setup 将自下列文件夹解除安装 $(^NameDA) 。要解除安装到不同文件夹，单击 [浏览(B)...] 并选择其他的文件夹。 $_CLICK
+安装程序将把 $(^NameDA) 从以下目录卸载。要从另一个目录卸载，点击 [浏览(B)...] 并选择其他目录。 $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-选择要解除安装 $(^NameDA) 的文件夹: 
+选择要卸载 $(^NameDA) 的目录: 
 # ^SpaceAvailable
 "可用空间: "
 # ^SpaceRequired
 "所需空间: "
 # ^UninstallingText
-这个向导将从你的计算机解除安装 $(^NameDA) 。 $_CLICK
+此向导将从本机卸载 $(^NameDA) 。 $_CLICK
 # ^UninstallingSubText
-解除安装目录: 
+卸载目录: 
 # ^FileError
-不能打开要写入的文件: \r\n\t"$0"\r\n单击 [Abort] 停止安装，\r\n [Retry] 重新尝试写入文件，或\r\n [Ignore] 忽略这个文件。
+无法打开要写入的文件: \r\n\t"$0"\r\n点击 [Abort] 停止安装，\r\n [Retry] 重新尝试写入文件，或者\r\n [Ignore] 忽略这个文件。
 # ^FileError_NoIgnore
-不能打开要写入的文件: \r\n\t"$0"\r\n单击 [Retry] 重新尝试写入文件，或\r\n [Cancel] 停止安装。
+无法打开要写入的文件: \r\n\t"$0"\r\n点击 [Retry] 重新尝试写入文件，或者\r\n [Cancel] 停止安装。
 # ^CantWrite
 "无法写入: "
 # ^CopyFailed
@@ -132,7 +133,7 @@
 # ^Registering
 "正在注册: "
 # ^Unregistering
-"正在解除注册: "
+"正在取消注册: "
 # ^SymbolNotFound
 "无法找到符号: "
 # ^CouldNotLoad
@@ -142,45 +143,45 @@
 # ^CreateShortcut
 "创建快捷方式: "
 # ^CreatedUninstaller
-"创建解除安装程序: "
+"创建卸载程序: "
 # ^Delete
 "删除文件: "
 # ^DeleteOnReboot
 "重新启动后删除: "
 # ^ErrorCreatingShortcut
-"正在创建快捷方式时发生错误: "
+"创建快捷方式时发生错误: "
 # ^ErrorCreating
-"正在创建时发生错误: "
+"创建时发生错误: "
 # ^ErrorDecompressing
-"正在解压缩数据发生错误！已损坏的安装程序？"
+"解压缩数据时发生错误！请检查安装程序是否损坏。"
 # ^ErrorRegistering
-"正在注册 DLL 时发生错误"
+"注册 DLL 时发生错误"
 # ^ExecShell
-"运行壳层程序: "
+"执行外壳程序: "
 # ^Exec
-"运行: "
+"执行: "
 # ^Extract
-"抽取: "
+"解压缩: "
 # ^ErrorWriting
 "抽取: 无法写入文件 "
 # ^InvalidOpcode
-"安装损毁: 无效的操作代码 "
+"安装程序损坏: 无效的操作代码 "
 # ^NoOLE
 "没有 OLE 用于: "
 # ^OutputFolder
 "输出目录: "
 # ^RemoveFolder
-"移除目录: "
+"删除目录: "
 # ^RenameOnReboot
-"重新启动后重命名: "
+"重新启动之后重命名: "
 # ^Rename
 "重命名: "
 # ^Skipped
 "已跳过: "
 # ^CopyDetails
-"复制细节到剪贴板 "
+"复制详情到剪贴板 "
 # ^LogInstall
-"日志安装进程"
+"记录安装过程到日志"
 # byte
 B
 # kilo
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/SimpChinese.nsh" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/SimpChinese.nsh"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Language files/SimpChinese.nsh"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Language files/SimpChinese.nsh"	2020-06-07 21:05:16.000000000 +0000
@@ -1,130 +1,130 @@
 ;Language: 'Chinese (Simplified)' (2052)
-;Translator: Kii Ali <kiiali@cpatch.org>, <kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>
-;Revision date: 2010-09-28
+;Translator: Kii Ali <kiiali@cpatch.org>, <kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>, Tyson Tan <tysontan@tysontan.com>
+;Revision date: 2020-06-03
 
 !insertmacro LANGFILE "SimpChinese" "Chinese (Simplified)" "中文(简体)" "Hanyu (Jiantizi)"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "欢迎使用 $(^NameDA) 安装向导"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "这个向导将指引你完成 $(^NameDA) 的安装进程。$\r$\n$\r$\n在开始安装之前，建议先关闭其他所有应用程序。这将允许“安装程序”更新指定的系统文件，而不需要重新启动你的计算机。$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "欢迎使用 $(^NameDA) 安装程序"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "此程序将引导你完成 $(^NameDA) 的安装。$\r$\n$\r$\n在安装之前，请先关闭其他所有应用程序。这将确保安装程序能够更新所需的系统文件，从而避免在安装后重新启动计算机。$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "欢迎使用 $(^NameDA) 解除安装向导"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "这个向导将全程指引你 $(^NameDA) 的解除安装进程。$\r$\n$\r$\n在开始解除安装之前，确认 $(^NameDA) 并未运行当中。$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "欢迎使用 $(^NameDA) 卸载程序"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "此程序将引导你完成 $(^NameDA) 的卸载。$\r$\n$\r$\n在卸载之前，请确认 $(^NameDA) 已经关闭。$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "许可证协议"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "在安装 $(^NameDA) 之前，请检阅授权条款。"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "如果你接受协议中的条款，单击 [我同意(I)] 继续安装。必须要接受协议才能安装 $(^NameDA) 。"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "如果你接受协议中的条款，单击下方的勾选框。必须要接受协议才能安装 $(^NameDA)。$_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "如果你接受协议中的条款，选择下方第一个选项。必须要接受协议才能安装 $(^NameDA)。$_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "在安装 $(^NameDA) 之前，请阅读许可证条款。"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "如果你接受许可证的条款，请点击 [我同意(I)] 继续安装。你必须在同意后才能安装 $(^NameDA) 。"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "如果你接受许可证的条款，请点击勾选下方的选框。你必须在同意后才能安装 $(^NameDA)。$_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "如果你接受许可证的条款，请选择下方第一个选项。你必须在同意后才能安装 $(^NameDA)。$_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "许可证协议"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "在解除安装 $(^NameDA) 之前，请检阅授权条款。"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "如果你接受协议中的条款，单击 [我同意(I)] 继续解除安装。如果你选定 [取消(C)] ，安装程序将会关闭。必须要接受协议才能解除安装 $(^NameDA) 。"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "如果你接受协议中的条款，单击下方的勾选框。必须要接受协议才能解除安装 $(^NameDA)。$_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "如果你接受协议中的条款，选择下方第一个选项。必须要接受协议才能解除安装 $(^NameDA)。$_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "在卸载 $(^NameDA) 之前，请阅读许可证条款。"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "如果你接受许可证的条款，请点击 [我同意(I)] 继续卸载。如果你点击 [取消(C)] ，卸载程序将会关闭。你必须在同意后才能卸载 $(^NameDA) 。"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "如果你接受许可证的条款，点击勾选下方的选框。你必须在同意后才能卸载 $(^NameDA)。$_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "如果你接受许可证的条款，请选择下方第一个选项。你必须在同意后才能卸载 $(^NameDA)。$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "检阅协议的其余部分，按 [PgDn] 往下卷动页面。"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "要阅读协议的其余部分，请按 [PgDn] 键向下翻页。"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "选择组件"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "选择你想要安装 $(^NameDA) 的那些功能。"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "选择你想安装的 $(^NameDA) 功能组件。"
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "选定组件"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "选定 $(^NameDA) 当中你想要解除安装的功能。"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "选择组件"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "选择你想卸载的 $(^NameDA) 功能组件。"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "描述"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "组件描述"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "停悬你的鼠标指针到组件之上，便可见到它的描述。"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "将光标悬停在组件名称之上，即可显示它的功能描述。"
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "选择一个组件，便可见到它的描述。"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "点击选中组件，即可显示它的功能描述。"
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "选定安装位置"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "选定 $(^NameDA) 要安装的文件夹。"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "选择安装位置"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "选择 $(^NameDA) 的安装文件夹。"
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "选定解除安装位置"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "选定 $(^NameDA) 要解除安装的文件夹。"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "选择卸载位置"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "选择 $(^NameDA) 的卸载文件夹。"
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "正在安装"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA) 正在安装，请等候。"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA) 正在安装，请稍候。"
   ${LangFileString} MUI_TEXT_FINISH_TITLE "安装完成"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "安装程序已成功地运行完成。"
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "安装己中止"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "安装程序并未成功地运行完成。"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "安装程序成功完成安装。"
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "安装中止"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "安装程序未能完成安装。"
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "正在解除安装"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) 正在解除安装，请等候。"
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "解除安装已完成"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "解除安装程序已成功地运行完成。"
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "解除安装已中止"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "解除安装程序并未成功地运行完成。"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "正在卸载"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) 正在卸载，请稍候。"
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "卸载完成"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "卸载程序成功完成卸载。"
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "卸载中止"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "卸载程序未能完成卸载。"
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "正在完成 $(^NameDA) 安装向导"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) 已安装在你的系统。$\r$\n单击 [完成(F)] 关闭此向导。"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "你的系统需要重新启动，以便完成 $(^NameDA) 的安装。现在要重新启动吗？"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) 安装程序结束"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) 已经成功安装到本机。$\r$\n点击 [完成(F)] 关闭安装程序。"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "必须重新启动本机才能完成 $(^NameDA) 的安装。是否立即重新启动？"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "正在完成 $(^NameDA) 解除安装向导"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) 已从你的计算机解除安装。$\r$\n$\r$\n单击 [完成] 关闭这个向导。"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "计算机需要重新启动，以便完成 $(^NameDA) 的解除安装。现在想要重新启动吗？"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) 卸载程序结束"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) 已经成功从本机卸载。$\r$\n$\r$\n点击 [完成] 关闭卸载程序。"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "必须重新启动本机才能完成 $(^NameDA) 的卸载。是否立即重新启动？"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "是，现在重新启动(&Y)"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "否，我稍后再自行重新启动(&N)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "是，立即重新启动(&Y)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "否，我会在之后重新启动(&N)"
   ${LangFileString} MUI_TEXT_FINISH_RUN "运行 $(^NameDA)(&R)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "显示“自述文件”(&M)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "显示自述文件(&M)"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "完成(&F)"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "选择“开始菜单”文件夹"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "选择“开始菜单”文件夹，用于程序的快捷方式。"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "选择“开始菜单”文件夹，以便创建程序的快捷方式。你也可以输入名称，创建新文件夹。"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "选择开始菜单文件夹"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "选择开始菜单文件夹，用于创建程序的快捷方式。"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "选择开始菜单文件夹，用于创建程序的快捷方式。你也可以输入自定义名称，创建新文件夹。"
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "不要创建快捷方式(&N)"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "解除安装 $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "从你的计算机解除安装 $(^NameDA) 。"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "卸载 $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "从本机卸载 $(^NameDA) 。"
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "你确实要退出 $(^Name) 安装程序吗？"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "确定要退出 $(^Name) 安装程序吗？"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "你确实要退出 $(^Name) 解除安装程序吗？"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "确定要退出 $(^Name) 卸载程序吗？"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "选定用户"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "选定你想要安装 $(^NameDA) 给那一个用户。"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "选择你想要安装 $(^NameDA) 给自己使用，或此计算机的所有用户。 $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "安装给此计算机的所有用户(&A)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "安装给自己(&M)"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "选择用户"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "选择为哪些用户安装 $(^NameDA) 。"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "选择只为自己安装 $(^NameDA) ，还是为本机的所有用户安装。 $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "为本机所有用户安装(&A)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "只为我自己安装(&M)"
 !endif
diff -Nru nsis-3.05/Contrib/Library/RegTool/SConscript nsis-3.06.1/Contrib/Library/RegTool/SConscript
--- nsis-3.05/Contrib/Library/RegTool/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Library/RegTool/SConscript	2020-06-29 23:08:12.000000000 +0000
@@ -5,11 +5,11 @@
 """)
 
 libs = Split("""
-	kernel32
-	oleaut32
 	advapi32
-	user32
+	oleaut32
 	ole32
+	user32
+	kernel32
 """)
 
 Import('BuildUtil env GetArcCPU')
diff -Nru nsis-3.05/Contrib/Makensisw/makensisw.cpp nsis-3.06.1/Contrib/Makensisw/makensisw.cpp
--- nsis-3.05/Contrib/Makensisw/makensisw.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/makensisw.cpp	2020-04-21 18:53:55.000000000 +0000
@@ -497,9 +497,10 @@
     case MakensisAPI::QUERYHOST: {
       if (MakensisAPI::QH_OUTPUTCHARSET == wParam) {
         const UINT reqcp = 1200; // We want UTF-16LE
-        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)(1+reqcp));
-        return TRUE;
+        return DlgRet(hwndDlg, (LONG_PTR)(1+reqcp));
       }
+      else if (MakensisAPI::QH_SUPPORTEDVERSION == wParam)
+        return DlgRet(hwndDlg, 0x03006000);
       return FALSE;
     }
     case WM_NOTIFY:
@@ -546,7 +547,8 @@
       return TRUE;
     case WM_COPYDATA:
     {
-      PCOPYDATASTRUCT cds = PCOPYDATASTRUCT(lParam);
+      using namespace MakensisAPI;
+      COPYDATASTRUCT *cds = (COPYDATASTRUCT*) lParam, cdsret;
       switch (cds->dwData) {
         case MakensisAPI::NOTIFY_SCRIPT:
           MemSafeFree(g_sdata.input_script);
@@ -564,6 +566,24 @@
           g_sdata.output_exe = (TCHAR*) MemAlloc(cds->cbData * sizeof(TCHAR));
           lstrcpy(g_sdata.output_exe, (TCHAR *)cds->lpData);
           break;
+        case MakensisAPI::PROMPT_FILEPATH:
+          if ((((PROMPT_FILEPATH_DATA*)cds->lpData)->Platform & 7) == sizeof(TCHAR))
+          {
+            TCHAR buf[MAX_PATH];
+            lstrcpyn(buf, FSPath::FindLastComponent(((PROMPT_FILEPATH_DATA*)cds->lpData)->Path), COUNTOF(buf));
+            OPENFILENAME of = { sizeof(of) };
+            of.hwndOwner = hwndDlg;
+            of.lpstrFilter = _T("*.exe\0*.exe\0*\0*.*\0");
+            of.lpstrFile = buf, of.nMaxFile = COUNTOF(buf);
+            of.Flags = OFN_EXPLORER|OFN_ENABLESIZING|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_PATHMUSTEXIST|OFN_NOCHANGEDIR;
+            if (GetSaveFileName(&of))
+            {
+              cdsret.dwData = cds->dwData, cdsret.cbData = (lstrlen(buf) + 1) * sizeof(TCHAR), cdsret.lpData = buf;
+              SendMessage((HWND) wParam, WM_COPYDATA, (SIZE_T) hwndDlg, (SIZE_T) &cdsret);
+            }
+            return TRUE;
+          }
+          return FALSE;
       }
       return TRUE;
     }
@@ -670,6 +690,17 @@
           extern int ShowWndSpy(HWND hOwner);
           return ShowWndSpy(g_sdata.hwnd);
         }
+        case IDM_GUIDGEN:
+        {
+          GUID guid;
+          TCHAR buf[41 * (1 + (sizeof(TCHAR) < 2))];
+          FARPROC func = GetKeyState(VK_CONTROL) < 0 ? GetSysProcAddr("RPCRT4", "UuidCreateSequential") : NULL;
+          ((HRESULT(WINAPI*)(GUID*))(func ? func : GetSysProcAddr("RPCRT4", "UuidCreate")))(&guid);
+          ((int(WINAPI*)(GUID*, TCHAR*, int))(GetSysProcAddr("OLE32", "StringFromGUID2")))(&guid, buf, 39);
+          for (UINT i = 0; sizeof(TCHAR) < 2; ++i) if (!(buf[i] = (CHAR) ((WCHAR*)buf)[i])) break; // WCHAR to TCHAR if ANSI
+          LogMessage(g_sdata.hwnd, (buf[38] = '\r', buf[39] = '\n', buf[40] = '\0', buf));
+          break;
+        }
         case IDM_TEST:
         case IDC_TEST:
         {
diff -Nru nsis-3.05/Contrib/Makensisw/makensisw.h nsis-3.06.1/Contrib/Makensisw/makensisw.h
--- nsis-3.05/Contrib/Makensisw/makensisw.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/makensisw.h	2020-07-31 20:07:43.000000000 +0000
@@ -39,20 +39,20 @@
 #define SupportsW95() ( FALSE && SupportsW9X() && !DpiAwarePerMonitor() )
 
 // Defines
-#define NSIS_URL     "http://nsis.sourceforge.net/"
+#define NSIS_URL     "https://nsis.sourceforge.io/"
 #define NSIS_FORUM_URL "http://forums.winamp.com/forumdisplay.php?forumid=65"
-#define NSIS_UC_URL  "http://nsis.sourceforge.net/update.php?version="
-#define NSIS_DL_URL  "http://nsis.sourceforge.net/download/"
+#define NSIS_UC_URL  "https://nsis.sourceforge.io/update.php?version="
+#define NSIS_DL_URL  "https://nsis.sourceforge.io/download/"
 #ifdef UNICODE
-#define USAGE        _T("Usage:\r\n\r\n \x2022 File \x203a Load Script...\r\n \x2022 Drag the .nsi file into this window\r\n \x2022 Right click the .nsi file and choose \"Compile NSIS Script\"")
+#define USAGE        _T("Usage:\r\n\r\n \x2022 File \x203a Load Script...\r\n \x2022 Drag the .nsi file into this window\r\n \x2022 Right click the .nsi file and choose \"Compile NSIS Script\"\r\n")
 #else
-#define USAGE        _T("Usage:\r\n\r\n - File | Load Script...\r\n - Drag the .nsi file into this window\r\n - Right click the .nsi file and choose \"Compile NSIS Script\"")
+#define USAGE        _T("Usage:\r\n\r\n - File | Load Script...\r\n - Drag the .nsi file into this window\r\n - Right click the .nsi file and choose \"Compile NSIS Script\"\r\n")
 #endif
 #define COPYRIGHT    _T("Copyright (C) 2002 Robert Rainwater")
 #define CONTRIB      _T("Fritz Elfert, Justin Frankel, Amir Szekely, Sunil Kamath, Joost Verburg, Anders Kjersem")
 #define DONATE       _T("<A ID=\"D\">Donate</A> to support NSIS development.")
 #define DONATEURL    { 'h'|x,'t','t'|x,'p',':'|x,'/'|x,'/'|x,'n'|x,'s'|x,'i'|x,'s'|x,'.'|x,'s'|x,'f'|x,'.','n'|x,'e'|x,'t'|x,'/'|x,'r','/'|x,'D'|x,'o'|x,'n'|x,'a'|x,'t'|x,'e'|x,'\0' } // "Encrypted"
-#define DOCPATH      "http://nsis.sourceforge.net/Docs/"
+#define DOCPATH      "https://nsis.sourceforge.io/Docs/"
 #define LOCALDOCS    _T("\\NSIS.chm")
 #define ERRBOXTITLE  0 //_T("Error")
 #define NSISERROR    _T("Unable to intialize MakeNSIS. Please verify that makensis.exe is in the same directory as makensisw.exe.")
@@ -94,18 +94,26 @@
   extern const TCHAR* SigintEventNameFmt;
   extern const TCHAR* SigintEventNameLegacy;
 
-  enum notify_e {
+  enum datatransfer_e {
     NOTIFY_SCRIPT,
     NOTIFY_WARNING,
     NOTIFY_ERROR,
-    NOTIFY_OUTPUT
+    NOTIFY_OUTPUT,
+    PROMPT_FILEPATH
   };
   enum sndmsg_e {
     QUERYHOST = WM_APP
   };
   enum QUERYHOST_e {
-    QH_OUTPUTCHARSET = 1
+    QH_OUTPUTCHARSET = 1,
+    QH_ENABLESTDERR,
+    QH_SUPPORTEDVERSION
   };
+  typedef struct {
+    unsigned char Platform;
+    unsigned char Reserved;
+    TCHAR Path[1];
+  } PROMPT_FILEPATH_DATA;
 }
 
 typedef enum {
diff -Nru nsis-3.05/Contrib/Makensisw/Readme.txt nsis-3.06.1/Contrib/Makensisw/Readme.txt
--- nsis-3.05/Contrib/Makensisw/Readme.txt	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/Readme.txt	2020-04-21 18:53:55.000000000 +0000
@@ -208,6 +208,8 @@
 - Added log window colors
 - Basic AppEvents custom sound support for BuildComplete, BuildWarning and BuildError
 
+2.3.6
+- Added GUID generator tool
 
 Copyright Information
 ---------------------
diff -Nru nsis-3.05/Contrib/Makensisw/resource.h nsis-3.06.1/Contrib/Makensisw/resource.h
--- nsis-3.05/Contrib/Makensisw/resource.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/resource.h	2020-04-21 18:53:55.000000000 +0000
@@ -126,6 +126,7 @@
 #define IDM_COPY                        537
 #define IDM_UI_SWITCHOWNEDWINDOW        538 // Alt+F6
 #define IDM_UI_SWITCHSECTION            539 // F6
+#define IDM_GUIDGEN                     540
 
 
 // Next default values for new objects
@@ -133,7 +134,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        138
-#define _APS_NEXT_COMMAND_VALUE         540
+#define _APS_NEXT_COMMAND_VALUE         541
 #define _APS_NEXT_CONTROL_VALUE         241
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
diff -Nru nsis-3.05/Contrib/Makensisw/resource.rc nsis-3.06.1/Contrib/Makensisw/resource.rc
--- nsis-3.05/Contrib/Makensisw/resource.rc	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/resource.rc	2020-04-21 18:53:55.000000000 +0000
@@ -111,6 +111,7 @@
         MENUITEM "&Settings\tCtrl+S",         IDM_SETTINGS
         MENUITEM "", -1, MFT_SEPARATOR
         MENUITEM "&Window Info",                IDM_WNDSPY
+        MENUITEM "Generate &GUID",              IDM_GUIDGEN
         MENUITEM "", -1, MFT_SEPARATOR
         MENUITEM "Clear Recent &Files List",    IDM_CLEAR_MRU_LIST
     END
diff -Nru nsis-3.05/Contrib/Makensisw/SConscript nsis-3.06.1/Contrib/Makensisw/SConscript
--- nsis-3.05/Contrib/Makensisw/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/SConscript	2020-06-29 23:08:12.000000000 +0000
@@ -31,7 +31,6 @@
 """)
 
 libs = Split("""
-	kernel32
 	advapi32
 	user32
 	gdi32
@@ -42,6 +41,7 @@
 	comctl32
 	wininet
 	winmm
+	kernel32
 """)
 
 docs = Split("""
@@ -58,7 +58,7 @@
 	res = res,
 	resources = resources,
 	entry = None,
-	defines = ['RELEASE=2.3.5'],
+	defines = ['RELEASE=2.3.6'],
 	docs = docs,
 	root_util = True
 )
diff -Nru nsis-3.05/Contrib/Makensisw/utils.cpp nsis-3.06.1/Contrib/Makensisw/utils.cpp
--- nsis-3.05/Contrib/Makensisw/utils.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/utils.cpp	2020-04-21 18:53:55.000000000 +0000
@@ -295,7 +295,7 @@
 
   static const PACKEDCMDID_T cmds [] = {
     PACKCMDID(IDM_EXIT), PACKCMDID(IDM_LOADSCRIPT), PACKCMDID(IDM_EDITSCRIPT), 
-    PACKCMDID(IDM_SAVE), PACKCMDID(IDM_CLEARLOG),
+    PACKCMDID(IDM_SAVE), PACKCMDID(IDM_CLEARLOG), PACKCMDID(IDM_GUIDGEN),
     PACKCMDID(IDM_COMPRESSOR), PACKCMDID(IDM_COMPRESSOR_SUBMENU),
     PACKCMDID(IDM_RECOMPILE), PACKCMDID(IDM_RECOMPILE_TEST)
   };
@@ -362,7 +362,7 @@
   ClearLog(g_sdata.hwnd);
   SetTitle(g_sdata.hwnd,NULL);
   PostMessage(g_sdata.hwnd, WM_MAKENSIS_UPDATEUISTATE, 0, 0);
-  if (lstrlen(g_sdata.script)==0) {
+  if (!g_sdata.script[0]) {
     LogMessage(g_sdata.hwnd,USAGE);
     SetUIState_NoScript();
     DragAcceptFiles(g_sdata.hwnd,TRUE);
diff -Nru nsis-3.05/Contrib/Makensisw/utils.h nsis-3.06.1/Contrib/Makensisw/utils.h
--- nsis-3.05/Contrib/Makensisw/utils.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/utils.h	2020-04-20 17:21:04.000000000 +0000
@@ -64,6 +64,7 @@
 void ErrorMessage(HWND hwnd,const TCHAR *str);
 void CenterOnParent(HWND hwnd);
 void SetDialogFocus(HWND hDlg, HWND hCtl); // Use this and not SetFocus()!
+#define DlgRet(hDlg, val) ( SetWindowLongPtr((hDlg), DWLP_MSGRESULT, (val)) | TRUE )
 HWND GetComboEdit(HWND hCB);
 #define DisableItems(hwnd) EnableDisableItems(hwnd, 0)
 #define EnableItems(hwnd) EnableDisableItems(hwnd, 1)
@@ -90,6 +91,18 @@
 void LoadMRUFile(int position);
 void ClearMRUList();
 
+struct FSPath {
+  template<class T> static inline bool IsAgnosticSeparator(const T c) { return '\\' == c || '/' == c; }
+  template<class T> static T* FindLastComponent(T*p) // Note: Returns "" for "dir\"
+  {
+    for (T *sep = 0, *start = p;; ++p)
+      if (!*p)
+        return sep ? ++sep : start;
+      else if (IsAgnosticSeparator(*p))
+        sep = p;
+  }
+};
+
 bool FileExists(const TCHAR *fname);
 bool OpenUrlInDefaultBrowser(HWND hwnd, LPCSTR Url);
 
diff -Nru nsis-3.05/Contrib/Makensisw/wndspy.cpp nsis-3.06.1/Contrib/Makensisw/wndspy.cpp
--- nsis-3.05/Contrib/Makensisw/wndspy.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/Makensisw/wndspy.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2019 Anders Kjersem
+// Copyright (C) 2018-2020 Anders Kjersem
 //
 // This file is a part of NSIS.
 //
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI/License.txt" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI/License.txt"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI/License.txt"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI/License.txt"	2020-01-01 21:13:57.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright 2002-2019 Joost Verburg
+Copyright 2002-2020 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI/Readme.html" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI/Readme.html"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI/Readme.html"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI/Readme.html"	2020-03-18 21:27:58.000000000 +0000
@@ -1026,7 +1026,7 @@
 Function CustomPageFunction
   !insertmacro MUI_HEADER_TEXT $(PAGE_TITLE) $(PAGE_SUBTITLE)
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY &quot;ioFile.ini&quot;
-FuctionEnd
+FunctionEnd
 </pre>
                     </div>
                     <h1>
@@ -1130,7 +1130,7 @@
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2019 Joost Verburg
+Copyright &copy; 2002-2020 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI/SConscript" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI/SConscript"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI/SConscript"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI/SConscript"	2020-03-24 02:35:17.000000000 +0000
@@ -22,8 +22,8 @@
 
 Import('defenv')
 
-def join(prefix, list):
-	return map(lambda x: '%s/%s' % (prefix, x), list)
+def join(prefix, list_):
+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
 
 defenv.DistributeDocs(docs, path=target)
 path = 'images'
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI/System.nsh" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI/System.nsh"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI/System.nsh"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI/System.nsh"	2020-01-01 21:13:57.000000000 +0000
@@ -1,7 +1,7 @@
 /*
 
 NSIS Modern User Interface - Version 1.81
-Copyright 2002-2019 Joost Verburg
+Copyright 2002-2020 Joost Verburg
 
 */
 
@@ -10,7 +10,7 @@
 !define MUI_INCLUDED
 !define MUI_SYSVERSION "1.81"
 !verbose pop
-!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2019 Joost Verburg"
+!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2020 Joost Verburg"
 
 ;--------------------------------
 !verbose push 3
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI 2/License.txt" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI 2/License.txt"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI 2/License.txt"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI 2/License.txt"	2020-01-01 21:13:57.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright � 2002-2019 Joost Verburg
+Copyright � 2002-2020 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI 2/MUI2.nsh" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI 2/MUI2.nsh"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI 2/MUI2.nsh"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI 2/MUI2.nsh"	2020-01-01 21:13:57.000000000 +0000
@@ -1,7 +1,7 @@
 /*
 
 NSIS Modern User Interface - Version 2.1
-Copyright 2002-2019 Joost Verburg
+Copyright 2002-2020 Joost Verburg
 Contributors: Amir Szekely, Anders Kjersem
 
 */
@@ -11,7 +11,7 @@
 !define MUI_INCLUDED
 !define MUI_SYSVERSION "2.1"
 !verbose pop
-!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2019 Joost Verburg"
+!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2020 Joost Verburg"
 
 ;--------------------------------
 !verbose push 3
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI 2/Readme.html" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI 2/Readme.html"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI 2/Readme.html"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI 2/Readme.html"	2020-04-23 18:31:23.000000000 +0000
@@ -1033,8 +1033,9 @@
 
 Function CustomPageFunction
   !insertmacro MUI_HEADER_TEXT $(PAGE_TITLE) $(PAGE_SUBTITLE)
+  nsDialogs::...
   ...
-FuctionEnd
+FunctionEnd
 </pre>
                     </div>
                     <h1>
@@ -1131,7 +1132,7 @@
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2019 Joost Verburg
+Copyright &copy; 2002-2020 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff -Nru "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI 2/SConscript" "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI 2/SConscript"
--- "/tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Contrib/Modern UI 2/SConscript"	2020-01-13 19:44:30.000000000 +0000
+++ "/tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Contrib/Modern UI 2/SConscript"	2020-03-24 02:35:17.000000000 +0000
@@ -34,8 +34,8 @@
 
 Import('defenv')
 
-def join(prefix, list):
-	return map(lambda x: '%s/%s' % (prefix, x), list)
+def join(prefix, list_):
+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
 
 defenv.DistributeDocs(docs, path=target)
 defenv.DistributeDocs(join('../Modern UI/images',doc_images), path='%s/%s'%(target,'images'))
diff -Nru nsis-3.05/Contrib/MultiUser/MultiUser.nsh nsis-3.06.1/Contrib/MultiUser/MultiUser.nsh
--- nsis-3.05/Contrib/MultiUser/MultiUser.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/MultiUser/MultiUser.nsh	2020-03-24 02:01:11.000000000 +0000
@@ -4,25 +4,29 @@
 
 Installer configuration for multi-user Windows environments
 
-Copyright 2008-2019 Joost Verburg
+Copyright 2008-2020 Joost Verburg
 
 */
 
 !ifndef MULTIUSER_INCLUDED
-!define MULTIUSER_INCLUDED
-!verbose push
-!verbose 3
+!define MULTIUSER_INCLUDED 20200319
+!verbose push 3
 
 ;Standard NSIS header files
 
 !ifdef MULTIUSER_MUI
   !include MUI2.nsh
 !endif
-!include nsDialogs.nsh
 !include LogicLib.nsh
 !include WinVer.nsh
 !include FileFunc.nsh
 
+!if ${NSIS_PTR_SIZE} > 4
+!define /IfNDef MULTIUSER_MINWIN 0x501
+!else
+!define /IfNDef MULTIUSER_MINWIN 0x400
+!endif
+
 ;Variables
 
 Var MultiUser.Privileges
@@ -123,39 +127,46 @@
 !macro MULTIUSER_INSTALLMODE_CURRENTUSER UNINSTALLER_PREFIX UNINSTALLER_FUNCPREFIX
 
   ;Install mode initialization - per-user
-  
-  ${if} ${IsNT}  
-  
+
+  !if ${MULTIUSER_MINWIN} < 0x500
+  ${if} ${IsNT}
+  !endif
+
     StrCpy $MultiUser.InstallMode CurrentUser
-    
     SetShellVarContext current
   
     !if "${UNINSTALLER_PREFIX}" != UN
       ;Set default installation location for installer  
       !ifdef MULTIUSER_INSTALLMODE_INSTDIR
+        !if ${MULTIUSER_MINWIN} < 0x490
         ${if} ${AtLeastWin2000}
-          StrCpy $INSTDIR "$LOCALAPPDATA\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !endif
+          GetKnownFolderPath $INSTDIR {5CD7AEE2-2219-4A67-B85D-6C9CE15660CB} ; FOLDERID_UserProgramFiles
+          StrCmp $INSTDIR "" 0 +2
+          StrCpy $INSTDIR "$LocalAppData\Programs" ; Fallback directory
+          StrCpy $INSTDIR "$INSTDIR\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !if ${MULTIUSER_MINWIN} < 0x490
         ${else}
           StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
         ${endif}
+        !endif
       !endif
     !endif
   
     !ifdef MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY & MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME
-  
       ReadRegStr $MultiUser.InstDir HKCU "${MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY}" "${MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME}"
-  
       ${if} $MultiUser.InstDir != ""
         StrCpy $INSTDIR $MultiUser.InstDir
       ${endif}
-  
     !endif
-  
+
     !ifdef MULTIUSER_INSTALLMODE_${UNINSTALLER_PREFIX}FUNCTION
       Call "${MULTIUSER_INSTALLMODE_${UNINSTALLER_PREFIX}FUNCTION}"
     !endif
-  
+
+  !if ${MULTIUSER_MINWIN} < 0x500
   ${endif}
+  !endif
 
 !macroend
 
@@ -188,7 +199,7 @@
 !macro MULTIUSER_INIT_QUIT UNINSTALLER_FUNCPREFIX
 
   !ifdef MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUNCTIONQUIT
-    Call "${MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUCTIONQUIT}
+    Call "${MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUNCTIONQUIT}"
   !else
     Quit
   !endif
@@ -203,17 +214,9 @@
     !define /ReDef MULTIUSER_TMPSTR_CAPTION "$(^Name)"
   !endif
 
-  !ifndef MULTIUSER_INIT_TEXT_ADMINREQUIRED
-    !define MULTIUSER_INIT_TEXT_ADMINREQUIRED "${MULTIUSER_TMPSTR_CAPTION} requires administrator privileges."
-  !endif
-
-  !ifndef MULTIUSER_INIT_TEXT_POWERREQUIRED
-    !define MULTIUSER_INIT_TEXT_POWERREQUIRED "${MULTIUSER_TMPSTR_CAPTION} requires at least Power User privileges."
-  !endif
-
-  !ifndef MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE
-    !define MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE "Your user account does not have sufficient privileges to install $(^Name) for all users of this computer."
-  !endif
+  !define /IfNDef MULTIUSER_INIT_TEXT_ADMINREQUIRED "${MULTIUSER_TMPSTR_CAPTION} requires administrator privileges."
+  !define /IfNDef MULTIUSER_INIT_TEXT_POWERREQUIRED "${MULTIUSER_TMPSTR_CAPTION} requires at least Power User privileges."
+  !define /IfNDef MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE "Your user account does not have sufficient privileges to install $(^Name) for all users of this computer."
 
   !undef MULTIUSER_TMPSTR_CAPTION
 
@@ -228,7 +231,9 @@
   UserInfo::GetAccountType
   Pop $MultiUser.Privileges
   
+  !if ${MULTIUSER_MINWIN} < 0x500
   ${if} ${IsNT}
+  !endif
   
     ;Check privileges
   
@@ -324,46 +329,50 @@
   
     !endif
 
-  !if ${NSIS_PTR_SIZE} <= 4
+  !if ${MULTIUSER_MINWIN} < 0x500
   ${else}
   
     ;Not running Windows NT, per-user installation not supported
     Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.AllUsers
 
-  !endif
   ${endif}
+  !endif
 
 !macroend
 
 !macro MULTIUSER_INIT
-  !verbose push
-  !verbose 3
-  
-  !insertmacro MULTIUSER_INIT_CHECKS "" ""
-  
+  !verbose push 3
+  !ifdef __UNINSTALL__
+    !insertmacro MULTIUSER_UNINIT
+  !else
+    !insertmacro MULTIUSER_INIT_CHECKS "" ""
+  !endif
   !verbose pop 
 !macroend
 
 !ifndef MULTIUSER_NOUNINSTALL
-
 !macro MULTIUSER_UNINIT
-  !verbose push
-  !verbose 3
-  
+  !verbose push 3
   !insertmacro MULTIUSER_INIT_CHECKS Un un.
-  
   !verbose pop 
 !macroend
-
 !endif
 
 /*
 
-Modern UI 2 page
+Mode selection page
 
 */
 
-!ifdef MULTIUSER_MUI
+!macro MULTIUSER_PAGE_FUNCTION_CUSTOM TYPE
+  !ifmacrodef MUI_PAGE_FUNCTION_CUSTOM
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM "${TYPE}"
+  !endif
+  !ifdef MULTIUSER_PAGE_CUSTOMFUNCTION_${TYPE}
+    Call "${MULTIUSER_PAGE_CUSTOMFUNCTION_${TYPE}}"
+    !undef MULTIUSER_PAGE_CUSTOMFUNCTION_${TYPE}
+  !endif
+!macroend
 
 !macro MULTIUSER_INSTALLMODEPAGE_INTERFACE
 
@@ -375,30 +384,30 @@
     
     Var MultiUser.InstallModePage.AllUsers
     Var MultiUser.InstallModePage.CurrentUser
-    
-    Var MultiUser.InstallModePage.ReturnValue
+
   !endif
 
 !macroend
 
-!macro MULTIUSER_PAGEDECLARATION_INSTALLMODE
+!macro MULTIUSER_PAGEDECLARATION_INSTALLMODE UNPREFIX UNIQUEID
 
-  !insertmacro MUI_SET MULTIUSER_${MUI_PAGE_UNINSTALLER_PREFIX}INSTALLMODEPAGE ""
+  !define /ReDef MULTIUSER_${UNPREFIX}INSTALLMODEPAGE "" ; Unlock strings in the language file(s)
   !insertmacro MULTIUSER_INSTALLMODEPAGE_INTERFACE
 
-  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_TOP "$(MULTIUSER_INNERTEXT_INSTALLMODE_TOP)"
-  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS "$(MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS)"
-  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER "$(MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER)"  
+  !define /IfNDef MULTIUSER_INSTALLMODEPAGE_TEXT_TOP "$(MULTIUSER_INNERTEXT_INSTALLMODE_TOP)"
+  !define /IfNDef MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS "$(MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS)"
+  !define /IfNDef MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER "$(MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER)"  
 
   PageEx custom
 
-    PageCallbacks MultiUser.InstallModePre_${MUI_UNIQUEID} MultiUser.InstallModeLeave_${MUI_UNIQUEID}
+    PageCallbacks MultiUser.InstallModePre_${UNIQUEID} MultiUser.InstallModeLeave_${UNIQUEID}
 
-    Caption " "
+    !define /IfNDef MULTIUSER_INSTALLMODEPAGE_CAPTION " "
+    Caption "${MULTIUSER_INSTALLMODEPAGE_CAPTION}"
 
   PageExEnd
 
-  !insertmacro MULTIUSER_FUNCTION_INSTALLMODEPAGE MultiUser.InstallModePre_${MUI_UNIQUEID} MultiUser.InstallModeLeave_${MUI_UNIQUEID}
+  !insertmacro MULTIUSER_FUNCTION_INSTALLMODEPAGE MultiUser.InstallModePre_${UNIQUEID} MultiUser.InstallModeLeave_${UNIQUEID}
 
   !undef MULTIUSER_INSTALLMODEPAGE_TEXT_TOP
   !undef MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS
@@ -408,17 +417,16 @@
 
 !macro MULTIUSER_PAGE_INSTALLMODE
 
-  ;Modern UI page for install mode
-
-  !verbose push
-  !verbose 3
+  !verbose push 3
   
   !ifndef MULTIUSER_EXECUTIONLEVEL_ALLUSERS
     !error "A mixed-mode installation requires MULTIUSER_EXECUTIONLEVEL to be set to Admin, Power or Highest."
   !endif
-  
-  !insertmacro MUI_PAGE_INIT
-  !insertmacro MULTIUSER_PAGEDECLARATION_INSTALLMODE
+
+  !ifmacrodef MUI_PAGE_INIT
+    !insertmacro MUI_PAGE_INIT
+  !endif
+  !insertmacro MULTIUSER_PAGEDECLARATION_INSTALLMODE "" ${__COUNTER__}
   
   !verbose pop
 
@@ -426,61 +434,75 @@
 
 !macro MULTIUSER_FUNCTION_INSTALLMODEPAGE PRE LEAVE
 
-  ;Page functions of Modern UI page
+  !include nsDialogs.nsh
 
   Function "${PRE}"
-  
+
+    !if ${MULTIUSER_MINWIN} < 0x500
     ${ifnot} ${IsNT}
       Abort
     ${endif}
-  
+    !endif
+
     ${if} $MultiUser.Privileges != "Power"
       ${andif} $MultiUser.Privileges != "Admin"
       Abort
     ${endif}
-    
-    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
-    !insertmacro MUI_HEADER_TEXT_PAGE $(MULTIUSER_TEXT_INSTALLMODE_TITLE) $(MULTIUSER_TEXT_INSTALLMODE_SUBTITLE)
-    
+
+    !insertmacro MULTIUSER_PAGE_FUNCTION_CUSTOM PRE
+    !ifmacrodef MUI_HEADER_TEXT_PAGE
+      !insertmacro MUI_HEADER_TEXT_PAGE $(MULTIUSER_TEXT_INSTALLMODE_TITLE) $(MULTIUSER_TEXT_INSTALLMODE_SUBTITLE)
+    !endif
+
     nsDialogs::Create 1018
     Pop $MultiUser.InstallModePage
 
-    ${NSD_CreateLabel} 0u 0u 300u 40u "${MULTIUSER_INSTALLMODEPAGE_TEXT_TOP}"
+    ${NSD_CreateLabel} 0 2u 100% 42u "${MULTIUSER_INSTALLMODEPAGE_TEXT_TOP}"
     Pop $MultiUser.InstallModePage.Text
 
-    ${NSD_CreateRadioButton} 20u 50u 280u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS}"
+    ${NSD_CreateRadioButton} 15u 50u -15u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS}"
     Pop $MultiUser.InstallModePage.AllUsers
-    
-    ${NSD_CreateRadioButton} 20u 70u 280u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER}"
+
+    !ifdef MULTIUSER_INSTALLMODEPAGE_SHOWUSERNAME
+    !ifdef NOSYSTEMCALLS
+    ReadEnvStr $0 USERNAME
+    !else
+    System::Call 'ADVAPI32::GetUserName(t""r0,*i${NSIS_MAX_STRLEN})'
+    !endif
+    StrCmp $0 "" +2
+      StrCpy $0 " ($0)"
+    ${NSD_CreateRadioButton} 15u 70u -15u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER}$0"
+    !else
+    ${NSD_CreateRadioButton} 15u 70u -15u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER}"
+    !endif
     Pop $MultiUser.InstallModePage.CurrentUser
-    
+
     ${if} $MultiUser.InstallMode == "AllUsers"
       SendMessage $MultiUser.InstallModePage.AllUsers ${BM_SETCHECK} ${BST_CHECKED} 0
     ${else}
       SendMessage $MultiUser.InstallModePage.CurrentUser ${BM_SETCHECK} ${BST_CHECKED} 0
     ${endif}
     
-    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
+    !insertmacro MULTIUSER_PAGE_FUNCTION_CUSTOM SHOW
     nsDialogs::Show
-    !insertmacro MUI_PAGE_FUNCTION_CUSTOM DESTROYED
+    !insertmacro MULTIUSER_PAGE_FUNCTION_CUSTOM DESTROYED
     
   FunctionEnd
 
   Function "${LEAVE}"
-     SendMessage $MultiUser.InstallModePage.AllUsers ${BM_GETCHECK} 0 0 $MultiUser.InstallModePage.ReturnValue
+     SendMessage $MultiUser.InstallModePage.AllUsers ${BM_GETCHECK} 0 0 $0
      
-     ${if} $MultiUser.InstallModePage.ReturnValue = ${BST_CHECKED}
+     ${if} $0 = ${BST_CHECKED}
         Call MultiUser.InstallMode.AllUsers
      ${else}
         Call MultiUser.InstallMode.CurrentUser
      ${endif}
   
-    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
+    !insertmacro MULTIUSER_PAGE_FUNCTION_CUSTOM LEAVE
   FunctionEnd
 
 !macroend
 
-!endif
 
 !verbose pop
 !endif
diff -Nru nsis-3.05/Contrib/MultiUser/Readme.html nsis-3.06.1/Contrib/MultiUser/Readme.html
--- nsis-3.05/Contrib/MultiUser/Readme.html	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/MultiUser/Readme.html	2020-03-24 02:01:11.000000000 +0000
@@ -4,6 +4,9 @@
     <title>Multi-User Header File (MultiUser.nsh)</title>
     <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
     <style type="text/css">
+        body { background-color: #fefefe; color: #050505; }
+        code { background-color: #f6f6f6; }
+        pre { background-color: inherit; }
         td
         {
             padding: 5px;
@@ -107,7 +110,7 @@
         Insert the MULTIUSER_INIT and MULTIUSER_UNINT macros in the .onInit and un.onInit
         function to verify these privileges. If no uninstaller is created in the script,
         set MULTIUSER_NOUNINSTALL.</p>
-    <blockquote>
+    <code>
         <pre>!define MULTIUSER_EXECUTIONLEVEL Highest
 ;!define MULTIUSER_NOUNINSTALL ;Uncomment if no uninstaller is created
 !include MultiUser.nsh
@@ -121,7 +124,7 @@
 Function un.onInit
   !insertmacro MULTIUSER_UNINIT
 FunctionEnd</pre>
-    </blockquote>
+    </code>
     <p>
         Whether the required privileges can be obtained depends on the user that starts
         the installer:</p>
@@ -260,7 +263,7 @@
             installation mode. To use this page, define MULTIUSER_MUI before including User.nsh.
             Then, the MULTIUSER_PAGE_INSTALLMODE macro can be used just like a normal Modern
             UI page (this page will automatically be skipped when running Windows 95/98/Me):</p>
-        <pre>!define MULTIUSER_EXECUTIONLEVEL Highest
+        <code><pre>!define MULTIUSER_EXECUTIONLEVEL Highest
 <b>!define MULTIUSER_MUI</b>
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
 !include MultiUser.nsh
@@ -281,7 +284,7 @@
 Function un.onInit
   !insertmacro MULTIUSER_UNINIT
 FunctionEnd
-</pre>
+</pre></code>
         <p>
             The MULTIUSER_INSTALLMODE_COMMANDLINE setting that also appears in this example
             enables the installation mode to be set using the /AllUsers or /CurrentUser command
@@ -291,36 +294,24 @@
             to the general Modern UI page settings):</p>
         <table>
             <tr>
-                <td>
-                    <b>Setting</b>
-                </td>
-                <td>
-                    <b>Description</b>
-                </td>
+                <td><b>Setting</b></td>
+                <td><b>Description</b></td>
             </tr>
             <tr>
-                <td>
-                    MULTIUSER_INSTALLMODEPAGE_TEXT_TOP
-                </td>
-                <td>
-                    Text to display on the top of the page.
-                </td>
+                <td>MULTIUSER_INSTALLMODEPAGE_TEXT_TOP</td>
+                <td>Text to display on the top of the page.</td>
             </tr>
             <tr>
-                <td>
-                    MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS
-                </td>
-                <td>
-                    Text to display on the combo button for a per-machine installation.
-                </td>
+                <td>MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS</td>
+                <td>Text to display on the radio button for a per-machine installation.</td>
             </tr>
             <tr>
-                <td>
-                    MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER
-                </td>
-                <td>
-                    Text to display on the combo button for a per-user installation.
-                </td>
+                <td>MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER</td>
+                <td>Text to display on the radio button for a per-user installation.</td>
+            </tr>
+            <tr>
+                <td>MULTIUSER_INSTALLMODEPAGE_SHOWUSERNAME</td>
+                <td>Append the username to the per-user radio button.</td>
             </tr>
         </table>
         <h3>
@@ -365,7 +356,7 @@
                     MULTIUSER_INSTALLMODE_UNFUNCTION
                 </td>
                 <td>
-                    A custom fuction to be called during the initialization of the installation mode
+                    A custom function to be called during the initialization of the installation mode
                     to set additional installer settings that depend on the mode
                 </td>
         </table>
diff -Nru nsis-3.05/Contrib/nsDialogs/browse.c nsis-3.06.1/Contrib/nsDialogs/browse.c
--- nsis-3.05/Contrib/nsDialogs/browse.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/nsDialogs/browse.c	2020-04-22 21:37:01.000000000 +0000
@@ -89,11 +89,11 @@
 
 void __declspec(dllexport) SelectFileDialog(HWND hwndParent, int string_size, TCHAR *variables, stack_t **stacktop, extra_parameters *extra)
 {
-  OPENFILENAME ofn={0,}; // XXX WTF
+  OPENFILENAME ofn={0,};
   int save;
   TCHAR type[5];
   static TCHAR path[1024];
-  static TCHAR filter[1024];
+  static TCHAR filter[1024+1];
   static TCHAR currentDirectory[1024];
   static TCHAR initialDir[1024];
   DWORD gfa;
@@ -110,7 +110,7 @@
 
   popstringn(type, COUNTOF(type));
   popstringn(path, COUNTOF(path));
-  popstringn(filter, COUNTOF(filter));
+  popstringn(filter, COUNTOF(filter)-1);
 
   save = !lstrcmpi(type, _T("save"));
 
@@ -133,7 +133,7 @@
     // Convert the filter to the format required by Windows: NULL after each
     // item followed by a terminating NULL
     TCHAR *p = filter;
-    while (*p) // XXX take care for 1024
+    while (*p)
     {
       if (*p == _T('|'))
       {
diff -Nru nsis-3.05/Contrib/nsDialogs/example.nsi nsis-3.06.1/Contrib/nsDialogs/example.nsi
--- nsis-3.05/Contrib/nsDialogs/example.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/nsDialogs/example.nsi	2020-04-23 18:31:23.000000000 +0000
@@ -176,7 +176,7 @@
 Function NotifyPage
 	!insertmacro BeginControlsTestPage "WM_NOTIFY"
 
-	nsDialogs::CreateControl "${__NSD_RichEdit_CLASS_20A}" "${__NSD_RichEdit_STYLE}" "${__NSD_RichEdit_EXSTYLE}" 1 1 -2 -2 "" ; Forcing ANSI control, see forums.winamp.com/showthread.php?p=3169999
+	nsDialogs::CreateControl "${__NSD_RichEdit_CLASS_20A}" "${__NSD_RichEdit_STYLE}" "${__NSD_RichEdit_EXSTYLE}" 1 1 -2 50u "" ; Forcing ANSI control, see forums.winamp.com/showthread.php?p=3169999
 	Pop $9
 	${NSD_OnNotify} $9 OnNotify
 	IntOp $8 ${ENM_LINK} | ${ENM_KEYEVENTS}
@@ -184,6 +184,24 @@
 	SendMessage $9 ${EM_AUTOURLDETECT} 1 0
 	${NSD_SetText} $9 "{\rtf1\ansi{\fonttbl\f0\fswiss Helvetica;}\f0\pard http://nsis.sf.net\par {\b Click the link!}\par\par Type something and I will block every other character...}"
 
+	${NSD_InitCommonControlsEx} ${ICC_DATE_CLASSES}
+	${NSD_CreateDatePicker} 1% 55u 48% 12u ""
+	Pop $1
+	${NSD_OnNotify} $1 onDateTimeNotify
+	${NSD_CreateLabel} 51% 56u 48% 12u "Change the date..."
+	Pop $9
+
+	/*
+	${NSD_CreateCalendar} 1% 23% 150u 90u ""
+	Pop $1
+	${NSD_AddStyle} $1 ${MCS_NOTODAY}
+	System::Call 'USER32::SendMessage(p$1, i${MCM_GETMINREQRECT}, p0, @r2)'
+	System::Call '*$2(i,i,i.r2,i.r3)'
+	#System::Call 'USER32::SendMessage(p$1, i${MCM_GETMAXTODAYWIDTH}, p0, *i0r4)'
+	#${IfThen} $4 > $2 ${|} StrCpy $2 $4 ${|}
+	System::Call 'USER32::SetWindowPos(p$1,p0,i,i,ir2,ir3,i0x16)'
+	*/
+
 	nsDialogs::Show
 FunctionEnd
 
@@ -217,5 +235,21 @@
 	${EndIf}
 FunctionEnd
 
+Function onDateTimeNotify
+Pop $1 ; HWND
+Pop $2 ; Code
+Pop $3 ; NMHDR*
+${If} $2 = ${DTN_DATETIMECHANGE}
+	System::Call 'USER32::SendMessage(p$1, i${DTM_GETSYSTEMTIME}, p0, @r3)i.r0'
+	${If} $0 = ${GDT_VALID}
+		System::Call '*$3(&i2.R1, &i2.R2, &i2, &i2.R3, &i2, &i2, &i2, &i2)' ; SYSTEMTIME
+		StrCpy $0 "$R1/$R2/$R3"
+	${Else}
+		StrCpy $0 "N/A"
+	${EndIf}
+	${NSD_SetText} $9 $0
+${EndIf}
+FunctionEnd
+
 Section
 SectionEnd
diff -Nru nsis-3.05/Contrib/nsDialogs/nsDialogs.nsh nsis-3.06.1/Contrib/nsDialogs/nsDialogs.nsh
--- nsis-3.05/Contrib/nsDialogs/nsDialogs.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/nsDialogs/nsDialogs.nsh	2020-05-02 21:53:41.000000000 +0000
@@ -186,6 +186,24 @@
 !define UDS_NOTHOUSANDS 0x0080
 !define UDS_HOTTRACK    0x0100 ; 98+
 
+!define MCS_DAYSTATE        0x0001
+!define MCS_MULTISELECT     0x0002
+!define MCS_WEEKNUMBERS     0x0004
+!define MCS_NOTODAYCIRCLE   0x0008
+!define MCS_NOTODAY         0x0010 ; IE4+?
+!define MCS_NOTRAILINGDATES  0x0040 ; Vista+
+!define MCS_SHORTDAYSOFWEEK  0x0080 ; Vista+
+!define MCS_NOSELCHANGEONNAV 0x0100 ; Vista+
+
+!define DTS_UPDOWN          0x01
+!define DTS_SHOWNONE        0x02
+!define DTS_SHORTDATEFORMAT 0x00
+!define DTS_LONGDATEFORMAT  0x04
+!define DTS_SHORTDATECENTURYFORMAT 0x0C
+!define DTS_TIMEFORMAT      0x09
+!define DTS_APPCANPARSE     0x10
+!define DTS_RIGHTALIGN      0x20
+
 !define /ifndef LR_DEFAULTCOLOR     0x0000
 !define /ifndef LR_MONOCHROME       0x0001
 !define /ifndef LR_COLOR            0x0002
@@ -208,14 +226,23 @@
 !define /ifndef GWL_STYLE           -16
 !define /ifndef GWL_EXSTYLE         -20
 
-!define /ifndef ICC_BAR_CLASSES      0x0004
-!define /ifndef ICC_UPDOWN_CLASS     0x0010
-!define /ifndef ICC_HOTKEY_CLASS     0x0040
-!define /ifndef ICC_ANIMATE_CLASS    0x0080
-!define /ifndef ICC_DATE_CLASSES     0x0100
-!define /ifndef ICC_USEREX_CLASSES   0x0200
-!define /ifndef ICC_INTERNET_CLASSES 0x0800
-!define /ifndef ICC_LINK_CLASS       0x8000
+#define /ifndef ICC_LISTVIEW_CLASSES 0x0001 ; SysListView32 and SysHeader32
+#define /ifndef ICC_TREEVIEW_CLASSES 0x0002 ; SysTabControl32 and tooltips_class32
+#define /ifndef ICC_BAR_CLASSES      0x0004 ; ToolbarWindow32, msctls_statusbar32, msctls_trackbar32 and tooltips_class32
+#define /ifndef ICC_TAB_CLASSES      0x0008 ; SysTabControl32 and tooltips_class32
+#define /ifndef ICC_UPDOWN_CLASS     0x0010 ; msctls_updown32
+#define /ifndef ICC_PROGRESS_CLASS   0x0020 ; msctls_progress32
+#define /ifndef ICC_HOTKEY_CLASS     0x0040 ; msctls_hotkey32
+#define /ifndef ICC_ANIMATE_CLASS    0x0080 ; SysAnimate32
+#define /ifndef ICC_WIN95_CLASSES    0x00FF
+!define /ifndef ICC_DATE_CLASSES     0x0100 ; CC4.70+ (NT4+/IE3.1+/Win95 OSR2) SysDateTimePick32, SysMonthCal32 and CC6.10+(Vista+) DropDown
+!define /ifndef ICC_USEREX_CLASSES   0x0200 ; CC4.??+ (NT4+/IE3.?+/Win95 OSR2) ComboBoxEx32
+!define /ifndef ICC_COOL_CLASSES     0x0400 ; CC4.70+ (NT4+/IE3.1+/Win95 OSR2) ReBarWindow32
+!define /ifndef ICC_INTERNET_CLASSES 0x0800 ; CC4.71+ (IE4+) SysIPAddress32
+!define /ifndef ICC_PAGESCROLLER_CLASS 0x1000 ; CC4.71+ (IE4+) SysPager
+!define /ifndef ICC_NATIVEFNTCTL_CLASS 0x2000 ; CC4.71+ (IE4+) NativeFontCtl
+!define /ifndef ICC_STANDARD_CLASSES 0x4000 ; WinXP+ Button, Static, Edit, ListBox, ComboBox, ComboLBox, ScrollBar and ReaderModeCtl
+!define /ifndef ICC_LINK_CLASS       0x8000 ; WinXP+ SysLink
 
 
 !define DEFAULT_STYLES ${WS_CHILD}|${WS_VISIBLE}|${WS_CLIPSIBLINGS}
@@ -344,10 +371,26 @@
 !define __NSD_HotKey_STYLE ${DEFAULT_STYLES}
 !define __NSD_HotKey_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
 
+!define __NSD_Calendar_CLASS SysMonthCal32
+!define __NSD_Calendar_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}
+!define __NSD_Calendar_EXSTYLE 0
+
+!define __NSD_DatePicker_CLASS SysDateTimePick32
+!define __NSD_DatePicker_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}
+!define __NSD_DatePicker_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
+!define __NSD_TimePicker_CLASS SysDateTimePick32
+!define __NSD_TimePicker_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${DTS_TIMEFORMAT}
+!define __NSD_TimePicker_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
 !define __NSD_IPAddress_CLASS SysIPAddress32 ; IE4+/CC4.71+
-!define __NSD_IPAddress_STYLE ${DEFAULT_STYLES}
+!define __NSD_IPAddress_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}
 !define __NSD_IPAddress_EXSTYLE 0
 
+!define __NSD_NetAddress_CLASS msctls_netaddress ; Vista+
+!define __NSD_NetAddress_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}
+!define __NSD_NetAddress_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
 
 !macro __NSD_DefineControl NAME
 	!define NSD_Create${NAME} "nsDialogs::CreateControl ${__NSD_${Name}_CLASS} ${__NSD_${Name}_STYLE} ${__NSD_${Name}_EXSTYLE}"
@@ -381,7 +424,11 @@
 !insertmacro __NSD_DefineControl UpDown
 !insertmacro __NSD_DefineControl AutoUpDown
 !insertmacro __NSD_DefineControl HotKey
+!insertmacro __NSD_DefineControl Calendar
+!insertmacro __NSD_DefineControl DatePicker
+!insertmacro __NSD_DefineControl TimePicker
 !insertmacro __NSD_DefineControl IPAddress
+!insertmacro __NSD_DefineControl NetAddress
 
 
 !macro __NSD_OnControlEvent EVENT HWND FUNCTION
@@ -450,10 +497,22 @@
 
 !define NSD_InitCommonControlsEx "!insertmacro __NSD_InitCommonControlsEx "
 !macro __NSD_InitCommonControlsEx ICC
+!pragma warning push
+!pragma warning disable 7070 ; Invalid number
+!if ${ICC} <> 0
+!define /ReDef /IntFmt NSD_InitCommonControlsEx_TEMP "0x%X" ${ICC}
+System::Call 'COMCTL32::InitCommonControlsEx(*l${NSD_InitCommonControlsEx_TEMP}00000008)'
+!undef NSD_InitCommonControlsEx_TEMP
+!else
 System::Int64Op ${ICC} << 32
-System::Int64Op 0x08 | 
+System::Int64Op 8 | 
 System::Call 'COMCTL32::InitCommonControlsEx(*ls)' ; INITCOMMONCONTROLSEX as UINT64
+!endif
+!pragma warning pop
 !macroend
+!define NSD_InitCommonControl_IPAddress `${NSD_InitCommonControlsEx} ${ICC_INTERNET_CLASSES}`
+!define NSD_InitCommonControl_NetAddress `System::Call SHELL32::InitNetworkAddressControl()i`
+!define NSD_InitCommonControl_SysLink `${NSD_InitCommonControlsEx} ${ICC_LINK_CLASS}`
 
 
 !define NSD_CreateTimer `!insertmacro _NSD_CreateTimer `
@@ -655,8 +714,14 @@
 !define NSD_CB_LimitText `${__NSD_MkCtlCmd_WP} CB_LIMITTEXT 0 `
 !define /IfNDef NSD_CB_Clear `${__NSD_MkCtlCmd} CB_RESETCONTENT 0 0 `
 !define /IfNDef NSD_CB_GetCount `${__NSD_MkCtlCmd_RV} CB_GETCOUNT 0 0 `
-;define /IfNDef NSD_CB_DelString    ; /IfNDef to try to stay compatible with 
-;define /IfNDef NSD_CB_GetSelection ; the ListView header from the Wiki.
+!ifndef NSD_CB_DelString
+!define NSD_CB_DelString `!insertmacro __NSD_CB_DelString `
+!macro __NSD_CB_DelString CONTROL STRING
+	System::Call 'USER32::SendMessage(p${CONTROL},i${CB_FINDSTRINGEXACT},p-1,ts)p.s' `${STRING}`
+	System::Call 'USER32::SendMessage(p${CONTROL},i${CB_DELETESTRING},ps,p0)'
+!macroend
+!endif
+;define /IfNDef NSD_CB_GetSelection
 
 
 ### ListBox ###
@@ -858,36 +923,43 @@
 !macroend
 
 
+### Date ###
+!define NSD_Date_GetDateFields `!insertmacro __NSD_Date_GetDateFields `
+!macro __NSD_Date_GetDateFields CONTROL
+Push $0
+System::Call 'USER32::SendMessage(p${CONTROL},i${DTM_GETSYSTEMTIME},p0,@r0)'
+System::Call '*$0(&i2.s,&i2.s,&i2,&i2.s)'
+Exch 3
+Pop $0
+!macroend
+
+!define NSD_Time_GetTimeFields `!insertmacro __NSD_Time_GetTimeFields `
+!macro __NSD_Time_GetTimeFields CONTROL
+Push $0
+System::Call 'USER32::SendMessage(p${CONTROL},i${DTM_GETSYSTEMTIME},p0,@r0)'
+System::Call '*$0(&i2,&i2,&i2,&i2,&i2.s,&i2.s,&i2.s)'
+Exch 3
+Pop $0
+Exch
+!macroend
+
+
 ### Static ###
 
 !macro __NSD_LoadAndSetImage _LIHINSTMODE _IMGTYPE _LIHINSTSRC _LIFLAGS CONTROL IMAGE HANDLE
-	Push $0
-	Push $R0
-
-	Push "${IMAGE}" # in case ${IMAGE} is $R0
-	StrCpy $R0 ${CONTROL} # in case ${CONTROL} is $0
-	
 	!if "${_LIHINSTMODE}" == "exeresource"
-		!undef _LIHINSTSRC     # If (internal?) _* macro params starts using $0, 
-		!define _LIHINSTSRC r0 # _LIHINSTSRC can be changed to s
-		System::Call 'kernel32::GetModuleHandle(p0)p.${_LIHINSTSRC}' 
+		LoadAndSetImage /EXERESOURCE /STRINGID "${CONTROL}" ${_IMGTYPE} ${_LIFLAGS} "${IMAGE}" ${HANDLE}
+	!else #if "${_LIHINSTMODE}" == "file"
+		LoadAndSetImage /STRINGID "${CONTROL}" ${_IMGTYPE} ${_LIFLAGS} "${IMAGE}" ${HANDLE}
 	!endif
-	
-	System::Call 'user32::LoadImage(p ${_LIHINSTSRC}, ts, i ${_IMGTYPE}, i0, i0, i${_LIFLAGS})p.r0'
-	SendMessage $R0 ${STM_SETIMAGE} ${_IMGTYPE} $0
-
-	Pop $R0
-	Exch $0
-
-	Pop ${HANDLE}
 !macroend
 
 !macro __NSD_SetIconFromExeResource CONTROL IMAGE HANDLE
-	!insertmacro __NSD_LoadAndSetImage exeresource ${IMAGE_ICON} 0 ${LR_DEFAULTSIZE} "${CONTROL}" "${IMAGE}" ${HANDLE}
+	LoadAndSetImage /EXERESOURCE /STRINGID "${CONTROL}" ${IMAGE_ICON} ${LR_DEFAULTSIZE} "${IMAGE}" ${HANDLE}
 !macroend
 
 !macro __NSD_SetIconFromInstaller CONTROL HANDLE
-	!insertmacro __NSD_SetIconFromExeResource "${CONTROL}" "#103" ${HANDLE}
+	LoadAndSetImage /EXERESOURCE "${CONTROL}" ${IMAGE_ICON} ${LR_DEFAULTSIZE} 103 ${HANDLE}
 !macroend
 
 !define NSD_SetImage `!insertmacro __NSD_LoadAndSetImage file ${IMAGE_BITMAP} 0 "${LR_LOADFROMFILE}" `
@@ -899,24 +971,9 @@
 
 
 !define NSD_SetStretchedImage `!insertmacro __NSD_SetStretchedImage `
+!define NSD_SetStretchedBitmap `!insertmacro __NSD_SetStretchedImage `
 !macro __NSD_SetStretchedImage CONTROL IMAGE HANDLE
-	Push $0
-	Push $R0
-
-	Push "${IMAGE}" # in case ${IMAGE} is $0 or $R0
-	StrCpy $R0 ${CONTROL} # in case ${CONTROL} is $0
-
-	System::Call 'user32::GetClientRect(pR0,@r0)'
-	System::Call '*$0(i,i,i.r0,i.s)'
-	Exch # swap so stack contains ImagePath and then ControlHeight
-
-	System::Call 'user32::LoadImage(p0, ts, i${IMAGE_BITMAP}, ir0, is, i${LR_LOADFROMFILE}) p.r0'
-	SendMessage $R0 ${STM_SETIMAGE} ${IMAGE_BITMAP} $0
-
-	Pop $R0
-	Exch $0
-
-	Pop ${HANDLE}
+	LoadAndSetImage /STRINGID /RESIZETOFIT "${CONTROL}" ${IMAGE_BITMAP} ${LR_LOADFROMFILE} "${IMAGE}" ${HANDLE}
 !macroend
 
 
diff -Nru nsis-3.05/Contrib/nsDialogs/Readme.html nsis-3.06.1/Contrib/nsDialogs/Readme.html
--- nsis-3.05/Contrib/nsDialogs/Readme.html	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/nsDialogs/Readme.html	2020-04-27 12:36:57.000000000 +0000
@@ -6,7 +6,7 @@
 <style type="text/css">
 body { color: #000000; background-color: #ffffff; }
 b { color: red; }
-code { margin-left: 1.2em; padding: 0.5em; background-color: #f0f0f0; }
+code { margin-left: 1.2em; padding: 0.5em; background-color: #f0f0f0; display:inline-block; font-size:95%; }
 span.inlcod i { padding: 0px 0.2em; color: #222222; font-family: monospace; font-style: normal; }
 blockquote pre { background-color: #fcfcfc; font-family: monospace; }
 abbr { font-variant: none; cursor: help; }
@@ -78,8 +78,11 @@
 <li>ComboBox &amp; DropList: 
 <a href="#mref-cbaddstring">NSD_CB_AddString</a>, 
 <a href="#mref-cbinsstring">NSD_CB_PrependString, NSD_CB_AppendString, NSD_CB_InsertString</a>, 
-<a href="#mref-cbselectstring">NSD_CB_SelectString</a>, 
-<a href="#mref-cbgetcount">NSD_CB_GetCount</a>
+NSD_CB_DelString, 
+NSD_CB_DelItem, 
+NSD_CB_Clear, 
+<a href="#mref-cbgetcount">NSD_CB_GetCount</a>, 
+<a href="#mref-cbselectstring">NSD_CB_SelectString</a>
 </li>
 <li>ListBox: 
 <a href="#mref-lbaddstring">NSD_LB_AddString</a>, 
@@ -112,11 +115,14 @@
 <li>HotKey: 
 <a href="#mref-hkgethk">NSD_HK_GetHotKey</a>, <a href="#mref-hksethk">NSD_HK_SetHotKey</a>
 </li>
+<li>DatePicker: 
+<a href="#mref-dategetdatefields">NSD_Date_GetDateFields</a>
+</li>
 <li>Bitmap: 
-<a href="#mref-setimage">NSD_SetImage</a>, 
-<a href="#mref-setsimage">NSD_SetStretchedImage</a>, 
-<a href="#mref-clearimage">NSD_ClearImage</a>, 
-<a href="#mref-freeimage">NSD_FreeImage</a>
+<a href="#mref-setbitmap">NSD_SetBitmap</a>, 
+<a href="#mref-setsbitmap">NSD_SetStretchedBitmap</a>, 
+<a href="#mref-clearbitmap">NSD_ClearBitmap</a>, 
+<a href="#mref-freebitmap">NSD_FreeBitmap</a>
 </li>
 <li>Icon: 
 <a href="#mref-seticon">NSD_SetIcon</a>, 
@@ -249,8 +255,10 @@
 HTrackBar, 
 VTrackBar, 
 UpDown, 
-HotKey,
-IPAddress.
+HotKey, 
+DatePicker, 
+IPAddress, 
+NetAddress.
 </p>
 
 <h3><a name="step-state"></a>Control State</h3>
@@ -458,9 +466,15 @@
 
 <h3><a name="ref-selectfiledialog"></a>SelectFileDialog</h3>
 <p><code>nsDialogs::SelectFileDialog <i>mode</i> <i>initial_selection</i> <i>filter</i></code></p>
-<p>Displays a file selection dialog to the user. If <i>mode</i> is set to <i>save</i>, displays a file save dialog. If <i>mode</i> is set to <i>open</i>, displays a file open dialog. <i>filter</i> is a list of available file filters separated by pipes. If an empty string is passed, the default is used - <i>All Files|*.*</i>.</p>
+<p>Displays a file selection dialog to the user. If <i>mode</i> is set to <i>save</i>, displays a file save dialog. If <i>mode</i> is set to <i>open</i>, displays a file open dialog.
 <p><i>initial_selection</i> can be used to provide the user with a default file to look for and/or a default folder to look in. If <i>initial_selection</i> is empty no default filename will be provided for the user and the dialog will start in the current working directory. If <i>initial_selection</i> specifies just a filename, for example "test.exe", the dialog will be set up to look for a file called test.exe in the current working directory. If <i>initial_selection</i> specifies just a directory, for example "C:\Program Files", the dialog starts in the provided directory with no file name provided. If <i>initial_selection</i> specifies a directory and a filename, for example "C:\Windows\System32\calc.exe", the dialog will be set up to look for a file called calc.exe in the directory C:\Windows\System32.</p>
+<i>filter</i> is a list of available file filter pairs separated by pipes. A filter pair consists of a display string and a <a href="https://blogs.msdn.microsoft.com/jeremykuhne/2017/06/04/wildcards-in-windows/">DOS-style wildcard pattern</a>. If an empty string is passed, the default is used (<i>"All Files|*.*"</i>).</p>
 <p>Returns the selected file on the stack or an empty string if the user canceled the operation.</p>
+<blockquote><pre>
+nsDialogs::SelectFileDialog open "$DOCUMENTS\Config.ini" ".ini files|*.ini|All Files|*.*"
+Pop $0
+StrCmp $0 "" ...
+</pre></blockquote>
 
 <h3><a name="ref-selectfolderdialog"></a>SelectFolderDialog</h3>
 <p><code>nsDialogs::SelectFolderDialog <i>title</i> <i>initial_selection</i></code></p>
@@ -553,7 +567,9 @@
 <li>${NSD_CreateVTrackBar}</li>
 <li>${NSD_CreateUpDown}</li>
 <li>${NSD_CreateHotKey}</li>
-<li>${NSD_CreateIPAddress} <small>(Requires <abbr title="Internet Explorer">IE</abbr>4)</small></li>
+<li>${NSD_CreateDatePicker} <small>(Requires <abbr title="Internet Explorer">IE</abbr> 3.1 and <span class="inlcod"><i>${NSD_InitCommonControlsEx}</i></span>)</small></li>
+<li>${NSD_CreateIPAddress} <small>(Requires <abbr title="Internet Explorer">IE</abbr> 4 and <span class="inlcod"><i>${NSD_InitCommonControl_IPAddress}</i></span>)</small></li>
+<li>${NSD_CreateNetAddress} <small>(Requires Vista and <span class="inlcod"><i>${NSD_InitCommonControl_NetAddress}</i></span>)</small></li>
 </ul>
 <p>Returns the new control's HWND on the stack or <i>error</i></p>
 
@@ -757,9 +773,13 @@
 <h3><a name="mref-hksethk">NSD_HK_SetHotKey</a></h3>
 <p><code>${NSD_HK_SetHotKey} <i>hk_HWND</i> <i>packedhotkey</i></code></p>
 
-<h3><a name="mref-setimage"></a>NSD_SetImage</h3>
-<p><code>${NSD_SetImage} <i>control_HWND</i> <i>image_path</i> <i>$output_variable</i></code></p>
-<p>Loads a bitmap from <i>image_path</i> and displays it on <i>control_HWND</i> created by <a href="#mref-create">${NSD_CreateBitmap}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freeimage">${NSD_FreeImage}</a> once no longer necessary.</p>
+<h3><a name="mref-dategetdatefields">NSD_Date_GetDateFields</a></h3>
+<p><code>${NSD_Date_GetDateFields} <i>HWND</i></code></p>
+<p>Returns the month, day and year on the stack.</p>
+
+<h3><a name="mref-setbitmap"></a><a name="mref-setimage"></a>NSD_SetBitmap</h3>
+<p><code>${NSD_SetBitmap} <i>control_HWND</i> <i>image_path</i> <i>$output_variable</i></code></p>
+<p>Loads a bitmap from <i>image_path</i> and displays it on <i>control_HWND</i> created by <a href="#mref-create">${NSD_CreateBitmap}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freebitmap">${NSD_FreeBitmap}</a> once no longer necessary.</p>
 <p>The image must be extracted to the user's computer prior to calling this macro. A good place to extract images is $PLUGINSDIR.</p>
 <blockquote><pre>!include nsDialogs.nsh
 
@@ -770,8 +790,8 @@
 Page instfiles
 
 Var Dialog
-Var Image
-Var ImageHandle
+Var ImageCtrl
+Var BmpHandle
 
 Function .onInit
 	InitPluginsDir
@@ -787,28 +807,28 @@
 	${EndIf}
 
 	${NSD_CreateBitmap} 0 0 100% 100% ""
-	Pop $Image
-	${NSD_SetImage} $Image $PLUGINSDIR\image.bmp $ImageHandle
+	Pop $ImageCtrl
+	${NSD_SetBitmap} $ImageCtrl $PLUGINSDIR\image.bmp $BmpHandle
 
 	nsDialogs::Show
 
-	${NSD_FreeImage} $ImageHandle
+	${NSD_FreeBitmap} $BmpHandle
 FunctionEnd
 
 Section
 SectionEnd</pre></blockquote>
 
-<h3><a name="mref-setsimage"></a>NSD_SetStretchedImage</h3>
-<p><code>${NSD_SetStretchedImage} <i>control_HWND</i> <i>image_path</i> <i>$output_variable</i></code></p>
-<p>Loads and displays a bitmap just like <a href="#mref-setimage">${NSD_SetImage}</a>, but stretched the image to fit the control.</p>
-
-<h3><a name="mref-clearimage"></a>NSD_ClearImage</h3>
-<p><code>${NSD_ClearImage} <i>control_HWND</i></code></p>
-<p>Clears an image from a control.</p>
+<h3><a name="mref-setsbitmap"></a><a name="mref-setsimage"></a>NSD_SetStretchedBitmap</h3>
+<p><code>${NSD_SetStretchedBitmap} <i>control_HWND</i> <i>image_path</i> <i>$output_variable</i></code></p>
+<p>Loads and displays a bitmap just like <a href="#mref-setbitmap">${NSD_SetImage}</a> but stretches the image to fit the control.</p>
+
+<h3><a name="mref-clearbitmap"></a><a name="mref-clearimage"></a>NSD_ClearBitmap</h3>
+<p><code>${NSD_ClearBitmap} <i>control_HWND</i></code></p>
+<p>Clears a bitmap from a image control.</p>
 
-<h3><a name="mref-freeimage"></a>NSD_FreeImage</h3>
+<h3><a name="mref-freebitmap"></a><a name="mref-freeimage"></a>NSD_FreeBitmap</h3>
 <p><code>${NSD_FreeImage} <i>image_handle</i></code></p>
-<p>Frees an image handle previously loaded with <a href="#mref-setimage">${NSD_SetImage}</a> or <a href="#mref-setsimage">${NSD_SetStretchedImage}</a>.</p>
+<p>Frees an image handle previously loaded with <a href="#mref-setbitmap">${NSD_SetImage}</a> or <a href="#mref-setsbitmap">${NSD_SetStretchedBitmap}</a>.</p>
 
 <h3><a name="mref-seticon"></a>NSD_SetIcon</h3>
 <p><code>${NSD_SetIcon} <i>control_HWND</i> <i>image_path</i> <i>$output_variable</i></code></p>
diff -Nru nsis-3.05/Contrib/nsExec/nsexec.c nsis-3.06.1/Contrib/nsExec/nsexec.c
--- nsis-3.05/Contrib/nsExec/nsexec.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/nsExec/nsexec.c	2020-01-01 21:13:57.000000000 +0000
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2002 Robert Rainwater <rrainwater@yahoo.com>
-Copyright (C) 2002-2019 Nullsoft and Contributors
+Copyright (C) 2002-2020 Nullsoft and Contributors
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
diff -Nru nsis-3.05/Contrib/nsExec/SConscript nsis-3.06.1/Contrib/nsExec/SConscript
--- nsis-3.05/Contrib/nsExec/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/nsExec/SConscript	2020-06-29 23:08:12.000000000 +0000
@@ -5,9 +5,9 @@
 """)
 
 libs = Split("""
-	kernel32
-	user32
 	advapi32
+	user32
+	kernel32
 """)
 
 examples = Split("""
diff -Nru nsis-3.05/Contrib/NSISdl/SConscript nsis-3.06.1/Contrib/NSISdl/SConscript
--- nsis-3.05/Contrib/NSISdl/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/NSISdl/SConscript	2020-06-29 23:08:12.000000000 +0000
@@ -9,10 +9,10 @@
 """)
 
 libs = Split("""
-	kernel32
-	user32
 	advapi32
 	wsock32
+	user32
+	kernel32
 """)
 
 docs = Split("""
diff -Nru nsis-3.05/Contrib/SubStart/SConscript nsis-3.06.1/Contrib/SubStart/SConscript
--- nsis-3.05/Contrib/SubStart/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/SubStart/SConscript	2020-03-03 19:57:48.000000000 +0000
@@ -15,4 +15,5 @@
 
 substart = BuildUtil(target, files, libs, cli = True, noinstall = True, nodeflib = True)
 
-env.DistributeBin(substart, names=['makensis.exe'], alias='install-compiler') # install as makensis
+if env['PLATFORM'] == 'win32':
+	env.DistributeBin(substart, names=['makensis.exe'], alias='install-compiler') # install as makensis
diff -Nru nsis-3.05/Contrib/SubStart/substart.c nsis-3.06.1/Contrib/SubStart/substart.c
--- nsis-3.05/Contrib/SubStart/substart.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/SubStart/substart.c	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * substart.c - This app runs the executable of the same name in the 'Bin' 
  *              sub-folder and passes along the command line options.
  *
- * Copyright (c) 2013-2019 Anders Kjersem
+ * Copyright (c) 2013-2020 Anders Kjersem
  *
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Contrib/System/Source/Call-amd64.S nsis-3.06.1/Contrib/System/Source/Call-amd64.S
--- nsis-3.05/Contrib/System/Source/Call-amd64.S	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/System/Source/Call-amd64.S	2020-01-01 21:13:57.000000000 +0000
@@ -1,7 +1,7 @@
 ;# 
 ;# This file is a part of NSIS.
 ;#
-;# Copyright (C) 2014-2019 Anders Kjersem
+;# Copyright (C) 2014-2020 Anders Kjersem
 ;#
 ;# Licensed under the zlib/libpng license (the "License");
 ;# you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Contrib/System/Source/Call.S nsis-3.06.1/Contrib/System/Source/Call.S
--- nsis-3.05/Contrib/System/Source/Call.S	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/System/Source/Call.S	2020-01-01 21:13:57.000000000 +0000
@@ -1,5 +1,5 @@
 ;# Copyright (c) 2008 Thomas Gaugler <thomas@dadie.net>
-;# Copyright (c) 2008-2019 NSIS Contributors
+;# Copyright (c) 2008-2020 NSIS Contributors
 ;#
 ;# Permission is hereby granted, free of charge, to any person
 ;# obtaining a copy of this software and associated documentation
diff -Nru nsis-3.05/Contrib/System/System.html nsis-3.06.1/Contrib/System/System.html
--- nsis-3.05/Contrib/System/System.html	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/System/System.html	2020-07-31 20:07:43.000000000 +0000
@@ -7,7 +7,7 @@
 <body>
 <h1>NSIS System Plug-in</h1>
 <p>
-<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2019 NSIS Contributors</i>
+<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2020 NSIS Contributors</i>
 </p>
 
 <h2>Table of Contents</h2>
@@ -36,12 +36,12 @@
 <h4>Usage Examples From The Wiki</h4>
 
 <ul>
-<li><a href="http://nsis.sourceforge.net/wiki/Get_Local_Time">Get local time</a></li>
-<li><a href="http://nsis.sourceforge.net/wiki/Registering_a_Palm_Com_Conduit">Register conduits with Palm HotSync</a></li>
-<li><a href="http://nsis.sourceforge.net/wiki/Determining_free_memory_using_the_System_plugin">Get free memory</a></li>
-<li><a href="http://nsis.sourceforge.net/wiki/REG_MULTI_SZ_Reader">Read REG_MULTI_SZ</a></li>
-<li><a href="http://nsis.sourceforge.net/wiki/Get_Disk_Volume_Serial_Number">Get disk serial number</a></li>
-<li><i><a href="http://nsis.sourceforge.net/Special:Search?search=System%3A%3ACall">Search all...</a></i></li>
+<li><a href="https://nsis.sourceforge.io/wiki/Get_Local_Time">Get local time</a></li>
+<li><a href="https://nsis.sourceforge.io/wiki/Registering_a_Palm_Com_Conduit">Register conduits with Palm HotSync</a></li>
+<li><a href="https://nsis.sourceforge.io/wiki/Determining_free_memory_using_the_System_plugin">Get free memory</a></li>
+<li><a href="https://nsis.sourceforge.io/wiki/REG_MULTI_SZ_Reader">Read REG_MULTI_SZ</a></li>
+<li><a href="https://nsis.sourceforge.io/wiki/Get_Disk_Volume_Serial_Number">Get disk serial number</a></li>
+<li><i><a href="https://nsis.sourceforge.io/Special:Search?search=System%3A%3ACall">Search all...</a></i></li>
 </ul>
 
 <h2><a name="funcs"></a>Available Functions</h2>
diff -Nru nsis-3.05/Contrib/UserInfo/SConscript nsis-3.06.1/Contrib/UserInfo/SConscript
--- nsis-3.05/Contrib/UserInfo/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/UserInfo/SConscript	2020-06-29 23:08:12.000000000 +0000
@@ -5,9 +5,9 @@
 """)
 
 libs = Split("""
-	kernel32
 	advapi32
 	user32
+	kernel32
 """)
 
 examples = Split("""
diff -Nru nsis-3.05/Contrib/UserInfo/UserInfo.c nsis-3.06.1/Contrib/UserInfo/UserInfo.c
--- nsis-3.05/Contrib/UserInfo/UserInfo.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/UserInfo/UserInfo.c	2020-06-29 23:08:12.000000000 +0000
@@ -13,6 +13,24 @@
 typedef BOOL (WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember);
 CHECKTOKENMEMBERSHIP _CheckTokenMembership=NULL;
 
+static FARPROC GetAA32ProcAddress(LPCSTR FuncName)
+{
+  return GetProcAddress(GetModuleHandleA("ADVAPI32"), FuncName);
+}
+
+#if defined(NSIS_FORCERUNTIMELINKING) //__MINGW64_VERSION_MAJOR+0 >= 1
+// OpenThreadToken is exported by kernel32.lib in mingw-w64 breaking < Win7 where it only exists in advapi32.
+// sourceforge.net/p/mingw-w64/bugs/235/# & 821 with fix adapted from the negrutiu NSIS fork.
+// We try to work around this by specifying advapi32 before kernel32 in the list of libraries but if that fails, set the preceding define.
+#define OpenThreadToken DelayedOpenThreadToken
+static BOOL WINAPI DelayedOpenThreadToken(HANDLE Thread, DWORD Access, BOOL OpenAsSelf, HANDLE*Token)
+{
+  typedef BOOL (WINAPI*OTT)(HANDLE, DWORD, BOOL, HANDLE*);
+  OTT func = (OTT) GetAA32ProcAddress("OpenThreadToken");
+  return func(Thread, Access, OpenAsSelf, Token);
+}
+#endif
+
 void __declspec(dllexport) GetName(HWND hwndParent, int string_size, 
                                    TCHAR *variables, stack_t **stacktop)
 {
@@ -74,8 +92,7 @@
       // GetUserName is in advapi32.dll so we can avoid Load/Freelibrary
       _CheckTokenMembership=
       #ifndef _WIN64
-        (CHECKTOKENMEMBERSHIP) GetProcAddress(
-          GetModuleHandle(_T("ADVAPI32")), "CheckTokenMembership");
+        (CHECKTOKENMEMBERSHIP) GetAA32ProcAddress("CheckTokenMembership");
       #else
         CheckTokenMembership;
       #endif
diff -Nru nsis-3.05/Contrib/zip2exe/SConscript nsis-3.06.1/Contrib/zip2exe/SConscript
--- nsis-3.05/Contrib/zip2exe/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Contrib/zip2exe/SConscript	2020-06-29 23:08:12.000000000 +0000
@@ -14,12 +14,12 @@
 rc = 'res.rc'
 
 libs = Split("""
-	user32
-	gdi32
-	comctl32
-	comdlg32
 	advapi32
 	shell32
+	comctl32
+	comdlg32
+	user32
+	gdi32
 	z
 """)
 
diff -Nru nsis-3.05/COPYING nsis-3.06.1/COPYING
--- nsis-3.05/COPYING	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/COPYING	2020-01-01 21:13:57.000000000 +0000
@@ -1,7 +1,7 @@
 COPYRIGHT
 ---------
 
-Copyright (C) 1999-2019 Contributors
+Copyright (C) 1999-2020 Contributors
 
 More detailed copyright information can be found in the individual source code files.
 
diff -Nru nsis-3.05/debian/changelog nsis-3.06.1/debian/changelog
--- nsis-3.05/debian/changelog	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/changelog	2020-08-29 19:32:12.000000000 +0000
@@ -1,7 +1,20 @@
+nsis (3.06.1-1) unstable; urgency=medium
+
+  * New upstream version 3.06.1
+  * Adapted patches for version '3.06.1'
+  * Python equality vs identity fix within scons scripts
+  * Set CCACHE_DIR after initialization of default environment
+  * Exclude POSIX incompatible install-(per-user|shared) test scripts
+  * Increase to debhelper compatibility level 13
+  * Plugin/nsis: override repeated-path-segment lintian warning
+  * Mark SEH patch as not needed for upstream
+
+ -- Thomas Gaugler <thomas@dadie.net>  Sat, 29 Aug 2020 21:32:12 +0200
+
 nsis (3.05-4) unstable; urgency=medium
 
   [ Thomas Gaugler ]
-  * Define halibut version string as external variable 
+  * Define halibut version string as external variable
     GCC 10 uses -fno-common by default and as a result the global version
     variable of halibut was considered to be defined multiple times.
     (Closes: #966870)
diff -Nru nsis-3.05/debian/control nsis-3.06.1/debian/control
--- nsis-3.05/debian/control	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/control	2020-08-29 19:32:12.000000000 +0000
@@ -12,7 +12,7 @@
                scons,
                xsltproc,
                zlib1g-dev,
-               debhelper-compat (= 12)
+               debhelper-compat (= 13)
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/debian/nsis
diff -Nru nsis-3.05/debian/nsis-doc.lintian-overrides nsis-3.06.1/debian/nsis-doc.lintian-overrides
--- nsis-3.05/debian/nsis-doc.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ nsis-3.06.1/debian/nsis-doc.lintian-overrides	2020-08-29 19:32:12.000000000 +0000
@@ -0,0 +1 @@
+nsis-doc: repeated-path-segment nsis usr/share/doc/nsis/Examples/Plugin/nsis/
diff -Nru nsis-3.05/debian/patches/dont-generate-msvcrt-memmove-calls.patch nsis-3.06.1/debian/patches/dont-generate-msvcrt-memmove-calls.patch
--- nsis-3.05/debian/patches/dont-generate-msvcrt-memmove-calls.patch	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/patches/dont-generate-msvcrt-memmove-calls.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-From f764d9f356089f869faaf83eb30a5d511e72b6cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marius=20Negru=C8=9Biu?= <marius.negrutiu@protonmail.com>
-Date: Tue, 23 Jun 2020 10:19:52 +0300
-Subject: [PATCH] Fixed `memmove` linker errors caused by the gcc/10 compiler
- optimizations in stubs
-
----
- SCons/Config/gnu | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/SCons/Config/gnu b/SCons/Config/gnu
-index bfcb362d6..f1dc0cd7a 100644
---- a/SCons/Config/gnu
-+++ b/SCons/Config/gnu
-@@ -103,6 +103,10 @@ stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG'])    # no standard libraries
- stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])        # 512 bytes align
- stub_env.Append(LINKFLAGS = ['$MAP_FLAG'])          # generate map file
- 
-+conf = FlagsConfigure(stub_env)
-+conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns')  # don't generate msvcrt!memmove calls
-+conf.Finish()
-+
- stub_uenv = stub_env.Clone()
- stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
- 
diff -Nru nsis-3.05/debian/patches/fix-unaligned-access.patch nsis-3.06.1/debian/patches/fix-unaligned-access.patch
--- nsis-3.05/debian/patches/fix-unaligned-access.patch	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/patches/fix-unaligned-access.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-Description: Fix unaligned memory accesses on arm64 machines
- memcpy and memset are deployed to avoid the unaligned double word memory
- accesses on arm64 machines.
-Bug: https://sourceforge.net/p/nsis/patches/290/
-Bug-Debian: https://bugs.debian.org/918376
-Author: Thomas Gaugler <thomas@dadie.net>
-
---- a/Source/icon.cpp	(revision 7072)
-+++ b/Source/icon.cpp	(working copy)
-@@ -381,19 +381,18 @@
-   for (i = 0; i < icon2.size(); i++)
-   {
-     Icon* icon = &icon2[order[i].index2];
--    DWORD size = FIX_ENDIAN_INT32(icon->meta.dwRawSize);
-+    DWORD size = icon->meta.dwRawSize;
-
--    *(LPDWORD) seeker = FIX_ENDIAN_INT32(size);
-+    memcpy(seeker, &size, sizeof(size));
-+    seeker += sizeof(size);
-+    memset(seeker, 0, sizeof(DWORD));
-     seeker += sizeof(DWORD);
--    *(LPDWORD) seeker = 0;
--    seeker += sizeof(DWORD);
--
-     memcpy(seeker, icon->data, size);
--    seeker += size;
-+    seeker += FIX_ENDIAN_INT32(size);
-   }
-
-   // add terminator
--  *(LPDWORD) seeker = 0;
-+  memset(seeker, 0, sizeof(DWORD));
-
-   // done
-   destroy_icon_group(group);
diff -Nru nsis-3.05/debian/patches/keep-seh.patch nsis-3.06.1/debian/patches/keep-seh.patch
--- nsis-3.05/debian/patches/keep-seh.patch	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/patches/keep-seh.patch	2020-08-29 19:32:12.000000000 +0000
@@ -1,4 +1,5 @@
 Description: Keep Structured Exception Handling (SEH) flag
+Forwarded: not-needed
 Author: Thomas Gaugler <thomas@dadie.net>
 
 ---
@@ -9,7 +10,7 @@
 index 372f8ae..05b304c 100755
 --- a/SCons/utils.py
 +++ b/SCons/utils.py
-@@ -204,8 +204,8 @@ def SetPESecurityFlagsWorker(filepath):
+@@ -240,8 +240,8 @@ def SetPESecurityFlagsWorker(filepath):
  		pe.WriteCharacteristics(ifh_c)
  		ioh_dc = pe.ReadDllCharacteristics()
  		ioh_dc |= 0x0100 # +IMAGE_DLLCHARACTERISTICS_NX_COMPAT (DEP)
@@ -24,7 +25,7 @@
 index ee13532..c7330bf 100755
 --- a/Source/build.cpp
 +++ b/Source/build.cpp
-@@ -3845,7 +3845,7 @@ int CEXEBuild::set_target_architecture_data()
+@@ -3916,7 +3916,7 @@ int CEXEBuild::set_target_architecture_data()
  
    WORD dc = DefaultPEDllCharacteristics;
    if ((dc & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && t64) dc |= IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA;
diff -Nru nsis-3.05/debian/patches/propagate-environment-vars.patch nsis-3.06.1/debian/patches/propagate-environment-vars.patch
--- nsis-3.05/debian/patches/propagate-environment-vars.patch	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/patches/propagate-environment-vars.patch	2020-08-29 19:32:12.000000000 +0000
@@ -1,58 +1,19 @@
-
-Description: Propagate environment variables
-  Propagate CCACHE_DIR and SOURCE_DATE_EPOCH environment variables to
-  SCons build system.
-Bug: https://sourceforge.net/p/nsis/patches/294/
+Description: Propagate CCACHE_DIR environment variable
+   Support buildng via compiler cache (ccache)
+Forwarded: https://sourceforge.net/p/nsis/patches/298/
 Author: Thomas Gaugler <thomas@dadie.net>
 
 diff --git a/SConstruct b/SConstruct
 index e8252c9..e419ef9 100755
 --- a/SConstruct
 +++ b/SConstruct
-@@ -64,20 +64,29 @@ doctypes = [
- #######  Build Environment                                         ###
- ######################################################################
- 
-+import os
- path = ARGUMENTS.get('PATH', '')
- toolset = ARGUMENTS.get('TOOLSET', '')
--arch = ARGUMENTS.get('TARGET_ARCH', 'x86')
-+defenv = {
-+	'TARGET_ARCH': ARGUMENTS.get('TARGET_ARCH', 'x86'),
-+	'ENV': {}
-+}
+@@ -201,6 +201,9 @@
+ opts.Update(defenv)
+ Help(opts.GenerateHelpText(defenv))
  
--if toolset and path:
--	defenv = Environment(TARGET_ARCH = arch, ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
-+for key in ['CCACHE_DIR', 'SOURCE_DATE_EPOCH']:
-+	if key in os.environ:
-+		defenv['ENV'][key] = os.environ[key]
-+if path:
-+	defenv['ENV']['PATH'] = path
-+elif len(defenv['ENV']) == 0:
-+	del defenv['ENV']
- else:
--	if path:
--		defenv = Environment(TARGET_ARCH = arch, ENV = {'PATH' : path})
--	if toolset:
--		defenv = Environment(TARGET_ARCH = arch, TOOLS = toolset.split(',') + ['zip'])
--if not toolset and not path:
--	defenv = Environment(TARGET_ARCH = arch)
-+	# Propgate PATH if at least one environment variable is set
-+	defenv['ENV']['PATH'] = os.environ['PATH']
- 
-+if toolset:
-+	defenv['TOOLS'] = toolset.split(',') + ['zip']
++for key in(filter(lambda key: key in os.environ, ['CCACHE_DIR'])):
++	defenv['ENV'][key] = os.environ[key]
 +
-+defenv = Environment(**defenv)
- Export('defenv')
- 
- ######################################################################
-@@ -90,7 +99,6 @@ SConscript('SCons/utils.py')
- #######  Options                                                   ###
- ######################################################################
+ if defenv['TARGET_ARCH'] != 'x86':
+ 	defenv['UNICODE'] = True
  
--import os
- default_doctype = 'html'
- if defenv.WhereIs('hhc', os.environ['PATH']):
- 	default_doctype = 'chm'
diff -Nru nsis-3.05/debian/patches/py3-fixes.patch nsis-3.06.1/debian/patches/py3-fixes.patch
--- nsis-3.05/debian/patches/py3-fixes.patch	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/patches/py3-fixes.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-Description: Python 3 fixes
-Origin: https://sourceforge.net/p/nsis/patches/296/attachment/py3-fixes.patch
-Bug: https://sourceforge.net/p/nsis/patches/296
-Applied-Upstream: https://sourceforge.net/p/nsis/code/7161/
-
-diff --git a/Contrib/Graphics/SConscript b/Contrib/Graphics/SConscript
-index b8588d7..0f9fbe2 100755
---- a/Contrib/Graphics/SConscript
-+++ b/Contrib/Graphics/SConscript
-@@ -90,8 +90,8 @@ wizards = Split("""
- 
- Import('defenv')
- 
--def join(prefix, list):
--	return map(lambda x: '%s/%s' % (prefix, x), list)
-+def join(prefix, list_):
-+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
- 
- def dist(dir, files):
- 	defenv.DistributeContrib(join(dir, files), path='Graphics/%s' % dir)
-diff --git a/Contrib/Modern UI 2/SConscript b/Contrib/Modern UI 2/SConscript
-index a3d9083..abab407 100755
---- a/Contrib/Modern UI 2/SConscript	
-+++ b/Contrib/Modern UI 2/SConscript	
-@@ -34,8 +34,8 @@ pages = Split("""
- 
- Import('defenv')
- 
--def join(prefix, list):
--	return map(lambda x: '%s/%s' % (prefix, x), list)
-+def join(prefix, list_):
-+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
- 
- defenv.DistributeDocs(docs, path=target)
- defenv.DistributeDocs(join('../Modern UI/images',doc_images), path='%s/%s'%(target,'images'))
-diff --git a/Contrib/Modern UI/SConscript b/Contrib/Modern UI/SConscript
-index 551aa78..fa3d129 100755
---- a/Contrib/Modern UI/SConscript	
-+++ b/Contrib/Modern UI/SConscript	
-@@ -22,8 +22,8 @@ contribs = Split("""
- 
- Import('defenv')
- 
--def join(prefix, list):
--	return map(lambda x: '%s/%s' % (prefix, x), list)
-+def join(prefix, list_):
-+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
- 
- defenv.DistributeDocs(docs, path=target)
- path = 'images'
-diff --git a/SConstruct b/SConstruct
-index e8252c9..01915c9 100755
---- a/SConstruct
-+++ b/SConstruct
-@@ -366,7 +366,7 @@ defenv.Execute(Delete('$TESTDISTDIR'))
- def Distribute(files, names, component, path, subpath, alias, install_alias=None):
- 	files = MakeFileList(files)
- 
--	names = names or map(lambda x: x.name, files)
-+	names = names or list(map(lambda x: x.name, files))
- 	if isinstance(names, str):
- 		names = [names]
- 
diff -Nru nsis-3.05/debian/patches/py-equality-vs-identity.patch nsis-3.06.1/debian/patches/py-equality-vs-identity.patch
--- nsis-3.05/debian/patches/py-equality-vs-identity.patch	1970-01-01 00:00:00.000000000 +0000
+++ nsis-3.06.1/debian/patches/py-equality-vs-identity.patch	2020-08-29 19:32:12.000000000 +0000
@@ -0,0 +1,26 @@
+Description: Python equality vs identity fix
+Applied-Upstream: https://sourceforge.net/p/nsis/code/7214/
+Applied-Upstream: https://sourceforge.net/p/nsis/code/7215/
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -213,7 +213,7 @@
+ 	defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DATA', '"%s"' % defenv.subst('$PREFIX_DATA'))])
+ 	defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DOC', '"%s"' % defenv.subst('$PREFIX_DOC'))])
+ 
+-if defenv.get('SOURCE_DATE_EPOCH','') is not '':
++if defenv.get('SOURCE_DATE_EPOCH','') != '':
+ 	defenv['ENV']['SOURCE_DATE_EPOCH'] = defenv['SOURCE_DATE_EPOCH'] = int(defenv['SOURCE_DATE_EPOCH'], 0) # Normalize and apply to ENV for child processes
+ 	defenv.Append(NSIS_CPPDEFINES = [('NSIS_SOURCE_DATE_EPOCH', '%s' % defenv['SOURCE_DATE_EPOCH'])]) # Display in /HDRINFO
+ 
+--- a/Scons/utils.py
++++ b/SCons/utils.py
+@@ -262,7 +262,7 @@
+ 		return
+ 
+ def MakeReproducibleAction(target, source, env):
+-	if env.get('SOURCE_DATE_EPOCH','') is not '':
++	if env.get('SOURCE_DATE_EPOCH','') != '':
+ 		SetPETimestamp(target[0].path, env['SOURCE_DATE_EPOCH'])
+ 
+ def SilentActionEcho(target, source, env):
diff -Nru nsis-3.05/debian/patches/series nsis-3.06.1/debian/patches/series
--- nsis-3.05/debian/patches/series	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/patches/series	2020-08-29 19:32:12.000000000 +0000
@@ -1,7 +1,4 @@
 # list of patch file names in the order they are applied
-py3-fixes.patch
+py-equality-vs-identity.patch
 propagate-environment-vars.patch
-fix-unaligned-access.patch
 keep-seh.patch
-dont-generate-msvcrt-memmove-calls.patch
-version_as_external.patch
diff -Nru nsis-3.05/debian/patches/version_as_external.patch nsis-3.06.1/debian/patches/version_as_external.patch
--- nsis-3.05/debian/patches/version_as_external.patch	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/patches/version_as_external.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-Description: Define halibut version string as external variable
-  GCC 10 uses -fno-common by default resulting in the placement of
-  unintialized global variables in the BSS section of the object file.
-  By expliciting defining the version variable as external the compiler
-  no longer have the issue of multiple definitions of the version
-  variable.
-Origin: https://sourceforge.net/p/nsis/patches/296
-Applied-Upstream: https://sourceforge.net/p/nsis/code/7182/
-
---- a/Docs/src/bin/halibut/halibut.h
-+++ b/Docs/src/bin/halibut/halibut.h
-@@ -269,7 +269,7 @@
-  * version.c
-  */
- void initversionstring(void);
--const char *const version;
-+extern const char *const version;
- 
- /*
-  * misc.c
diff -Nru nsis-3.05/debian/rules nsis-3.06.1/debian/rules
--- nsis-3.05/debian/rules	2020-08-06 15:33:42.000000000 +0000
+++ nsis-3.06.1/debian/rules	2020-08-29 19:32:12.000000000 +0000
@@ -110,7 +110,7 @@
   SKIPUTILS=$(IGNORE_UTILS_COMMON) SKIPDOC=COPYING
 
 # Exclude test scripts which are not appropriate for POSIX platforms.
-IGNORE_TESTS = makensis.nsi|gfx.nsi
+IGNORE_TESTS = gfx.nsi|install-per-user.nsi|install-shared.nsi|makensis.nsi
 
 # Path to .nsi scripts
 SCRIPTS_PATH = $(DOCDIR)/Examples
diff -Nru nsis-3.05/Docs/src/basic.but nsis-3.06.1/Docs/src/basic.but
--- nsis-3.05/Docs/src/basic.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/basic.but	2020-07-31 20:07:43.000000000 +0000
@@ -40,7 +40,7 @@
 
 \c [/INVOKEIDLIST] action command [parameters] [SW_SHOWDEFAULT | SW_SHOWNORMAL | SW_SHOWMAXIMIZED | SW_SHOWMINIMIZED | SW_HIDE]
 
-Execute the specified program using ExecShell and wait for executed process to quit. It will only wait for executable files and not other file types nor URLs.
+Execute the specified program using ExecShell and wait for executed process to quit. It will only wait for executable files, not other file types nor URLs.
 
 \S2{execwait} ExecWait
 
@@ -156,7 +156,7 @@
 \c RMDir $TEMP\dir
 
 \NsisWarnBlockContainerBegin
-\\<b\\>Warning:\\</b\\> Using \e{RMDir /r $INSTDIR} in the uninstaller is not safe. Though it is unlikely, the user might select to install to the root of the Program Files folder and this command would wipe out the entire Program Files folder, including all other installed programs! The user can also put other files in the installation folder and wouldn't expect them to get deleted along with the program. Solutions are \W{http://nsis.sourceforge.net/Uninstall_only_installed_files}{available} for easily uninstalling only files which were installed by the installer.
+\\<b\\>Warning:\\</b\\> Using \e{RMDir /r $INSTDIR} in the uninstaller is not safe. Though it is unlikely, the user might select to install to the root of the Program Files folder and this command would wipe out the entire Program Files folder, including all other installed programs! The user can also put other files in the installation folder and wouldn't expect them to get deleted along with the program. Solutions are \W{https://nsis.sourceforge.io/Uninstall_only_installed_files}{available} for easily uninstalling only files which were installed by the installer.
 \NsisWarnBlockContainerEnd
 
 \NsisWarnBlockContainerBegin
diff -Nru nsis-3.05/Docs/src/bin/halibut/halibut.h nsis-3.06.1/Docs/src/bin/halibut/halibut.h
--- nsis-3.05/Docs/src/bin/halibut/halibut.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/bin/halibut/halibut.h	2020-05-17 21:37:57.000000000 +0000
@@ -269,7 +269,7 @@
  * version.c
  */
 void initversionstring(void);
-const char *const version;
+extern const char *const version;
 
 /*
  * misc.c
diff -Nru nsis-3.05/Docs/src/build.but nsis-3.06.1/Docs/src/build.but
--- nsis-3.05/Docs/src/build.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/build.but	2020-07-31 20:07:43.000000000 +0000
@@ -119,4 +119,4 @@
 
 \H{build_nightly} Nightly Builds
 
-There is no need to manually build the latest SVN version for Windows. A \W{http://nsis.sourceforge.net/nightly/nsis.zip}{nightly build} is available. The nightly build is automatically generated every night, using the latest version of the source code from SVN. There is no official nightly build for other platforms.
+There is no need to manually build the latest SVN version for Windows. A \W{https://nsis.sourceforge.io/nightly/nsis.zip}{nightly build} is available. The nightly build is automatically generated every night, using the latest version of the source code from SVN. There is no official nightly build for other platforms.
diff -Nru nsis-3.05/Docs/src/config.but nsis-3.06.1/Docs/src/config.but
--- nsis-3.05/Docs/src/config.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/config.but	2020-07-31 20:07:43.000000000 +0000
@@ -2,13 +2,13 @@
 \#{* Common config shared by all output formats *}
 \#{**********************************************}
 
-\define{NsisCopyright} Copyright (C) 1999-2019 Contributors
+\define{NsisCopyright} Copyright (C) 1999-2020 Contributors
 
 \copyright \NsisCopyright
 
-\preamble Check \W{http://nsis.sourceforge.net/}{http://nsis.sf.net} for news, information, support, examples, tutorials and more.
+\preamble Check \W{https://nsis.sourceforge.io/}{http://nsis.sf.net} for news, information, support, examples, tutorials and more.
 
-\preamble Quick links:\\<br\\>\W{http://nsis.sourceforge.net/support/faq/}{FAQ} - A list of frequently asked questions\\<br\\>\W{http://nsis.sourceforge.net/wiki/}{NSIS Wiki} - Examples, functions, tutorials, plug-ins, software and more\\<br\\>\W{http://forums.winamp.com/forumdisplay.php?forumid=65}{Forum} - Post questions or discuss NSIS features
+\preamble Quick links:\\<br\\>\W{https://nsis.sourceforge.io/support/faq/}{FAQ} - A list of frequently asked questions\\<br\\>\W{https://nsis.sourceforge.io/wiki/}{NSIS Wiki} - Examples, functions, tutorials, plug-ins, software and more\\<br\\>\W{http://forums.winamp.com/forumdisplay.php?forumid=65}{Forum} - Post questions or discuss NSIS features
 
 \define{NsisFuncReqU} This function is only available when building a \R{intro-unicode}{Unicode installer}.
 
diff -Nru nsis-3.05/Docs/src/credits.but nsis-3.06.1/Docs/src/credits.but
--- nsis-3.05/Docs/src/credits.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/credits.but	2020-06-07 21:05:16.000000000 +0000
@@ -154,7 +154,7 @@
 
 Catalan - \e{falanko}
 
-Chinese (Simplified) - \e{Kii Ali}
+Chinese (Simplified) - \e{Kii Ali, Tyson Tan\#{sf.net/u/tysontan}}
 
 Chinese (Traditional) - \e{Kii Ali, Walter Cheuk}
 
diff -Nru nsis-3.05/Docs/src/defines.but nsis-3.06.1/Docs/src/defines.but
--- nsis-3.05/Docs/src/defines.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/defines.but	2020-04-22 21:14:55.000000000 +0000
@@ -10,15 +10,17 @@
 
 \S1{define} !define
 
-\c [/ifndef | /redef] ([/date|/utcdate] gflag [value]) | (/math gflag val1 OP val2) | (/file gflag filename.txt)
+\c [/ifndef | /redef] ([/date|/utcdate] gflag [value]) | (/file gflag filename.txt) | (/intfmt gflag fmtstr value) | (/math gflag val1 OP val2)
 
 This command will add \e{gflag} to the global define list. This will have a similar effect as using the /D switch on the command line (the define only becomes effective after the !define command).
 
 If \e{/date} or \e{/utcdate} are used, \e{value} will be passed to strftime() and the result will be used as the value of \e{gflag}. strftime converts special symbols into certain parts of the current time or date. For example, %H will be converted into the current hour in 24-hour format. For a complete list of available symbols, search for strftime on \W{http://msdn.microsoft.com/}{MSDN}. On POSIX, you can get the list by using \c{man strftime}.
 
-If \e{/math} is used, the result of 'val1 OP val2', where OP may be +,-,*,/,%,<<,>>,>>>,&,|,^,~,!,&& or ||, will be used as the value of \e{gflag}. Note that val1 AND val2 MUST be integer values!
+If \e{/file} is used, the entire text file specified (including whitespace and newlines) will be read and placed into \e{gflag}.
+
+If \e{/intfmt} is used, \e{value} is interpreted as a integer and formated using the same syntax as \R{intfmt}{IntFmt}.
 
-If \e{/file} is used, the entire text file specified (including whitespace and newlines) will be read and stuffed into \e{gflag}.
+If \e{/math} is used, the result of 'val1 OP val2', where OP may be +,-,*,/,%,<<,>>,>>>,&,|,^,~,!,&& or ||, will be used as the value of \e{gflag}. Note that val1 AND val2 MUST be integer values!
 
 \c !define USE_SOMETHING
 \c !define VERSION 1.2
@@ -27,6 +29,7 @@
 \c !define /math REST 15 % ${RESULT}
 \c !define /file BunchaStuff somesourcefile.cpp
 \c !define /redef USE_SOMETHING ${RESULT} ;redefine USE_SOMETHING
+\c !define /intfmt HEX "0x%X" 3133078222
 
 \S1{undef} !undef
 
diff -Nru nsis-3.05/Docs/src/flowcontrol.but nsis-3.06.1/Docs/src/flowcontrol.but
--- nsis-3.05/Docs/src/flowcontrol.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/flowcontrol.but	2020-03-10 18:16:39.000000000 +0000
@@ -161,6 +161,22 @@
 \c IfSilent +2
 \c   ExecWait '"$INSTDIR\nonsilentprogram.exe"'
 
+\S2{ifshellvarcontextall} IfShellVarContextAll
+
+\c jump_if_true [jump_if_false]
+
+Checks if \R{setshellvarcontext}{SetShellVarContext} is set to \e{all}.
+
+\S2{ifrtllanguage} IfRtlLanguage
+
+\c jump_if_true [jump_if_false]
+
+Checks if active language is a RTL language.
+
+\NsisWarnBlockContainerBegin
+\\<b\\>Warning:\\</b\\> Do not call this in [un].onInit because the language file has not been fully initialized.
+\NsisWarnBlockContainerEnd
+
 \S2{intcmp} IntCmp
 
 \c val1 val2 jump_if_equal [jump_if_val1_less] [jump_if_val1_more]
diff -Nru nsis-3.05/Docs/src/generalpurpose.but nsis-3.06.1/Docs/src/generalpurpose.but
--- nsis-3.05/Docs/src/generalpurpose.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/generalpurpose.but	2020-04-06 18:04:10.000000000 +0000
@@ -81,6 +81,24 @@
 
 This is similar to \R{getfiletime}{GetFileTime}, only it acts on the system building the installer (it actually compiles into two \R{StrCpy}{StrCpy} commands). Sets the two output variables with the file timestamp of the file on the build system.
 
+\S2{getknownfolderpath} GetKnownFolderPath
+
+\c user_var(output) knownfolderid
+
+Get the path of a \W{https://docs.microsoft.com/en-us/windows/win32/shell/knownfolderid}{known folder}. The error flag is set and the output variable is empty if the call fails or the knownfolderid guid is not available. This function is only able to resolve known folders on Windows Vista or higher.
+
+\c !include WinCore.nsh
+\c !include LogicLib.nsh
+\c 
+\c Function .onInit
+\c ${If} $InstDir == ""
+\c   GetKnownFolderPath $InstDir ${FOLDERID_UserProgramFiles} ; This exists on Win7+
+\c   StrCmp $InstDir "" 0 +2 
+\c   StrCpy $InstDir "$LocalAppData\Programs" ; Fallback directory
+\c   StrCpy $InstDir "$InstDir\$(^Name)"
+\c ${EndIf}
+\c FunctionEnd
+
 \S2{getfullpathname} GetFullPathName
 
 \c [/SHORT] user_var(output) path_or_file
diff -Nru nsis-3.05/Docs/src/headers.but nsis-3.06.1/Docs/src/headers.but
--- nsis-3.05/Docs/src/headers.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/headers.but	2020-07-31 20:07:43.000000000 +0000
@@ -1,5 +1,11 @@
 \A{headers} Useful Headers
 
+\b \R{tut-logic}{LogicLib} - Evalute various logic statements with helper macros.
+
+\b \R{modernui}{Modern User Interface} - A MSI inspired interface.
+
+\b \L{../Docs/MultiUser/Readme.html}{Multi-User} - Install for a single user or for all users on the computer.
+
 
 \H{filefunc} File Functions Header
 
@@ -257,7 +263,7 @@
 \c 	Push $0
 \c FunctionEnd
 
-\\<b\\>Example (Locate with banner - \W{http://nsis.sourceforge.net/Nxs_plug-in}{NxS plugin} required):\\</b\\>
+\\<b\\>Example (Locate with banner - \W{https://nsis.sourceforge.io/Nxs_plug-in}{NxS plugin} required):\\</b\\>
 
 \c Section
 \c 	nxs::Show /NOUNLOAD `$(^Name) Setup` /top \
@@ -833,7 +839,7 @@
 \c 	Push $0
 \c FunctionEnd
 
-\\<b\\>Example (\W{http://nsis.sourceforge.net/Nxs_plug-in}{NxS plugin}):\\</b\\>
+\\<b\\>Example (\W{https://nsis.sourceforge.io/Nxs_plug-in}{NxS plugin}):\\</b\\>
 
 \c !include "FileFunc.nsh"
 \c 
@@ -2376,17 +2382,17 @@
 \\<b\\>Example (Filter4):\\</b\\>
 
 \c Section
-\c 	${StrFilter} "123abc��� 456DEF��� 7890|%#" "+12rus" "�" "��" $R0
-\c 	; $R0="123���456�7890"  ;only Digits + Letters + � - ��
+\c 	${StrFilter} "123abcְֱֲ 456DEFדהו 7890|%#" "+12rus" "ה" "דו" $R0
+\c 	; $R0="123ְֱֲ456ה7890"  ;only Digits + Letters + ה - דו
 \c SectionEnd
 
 \\<b\\>Example (English + Russian Letters):\\</b\\>
 
 \c Section
-\c 	${StrFilter} "123abc��� 456DEF��� 7890|%#" "2rus" "" "" $R0
-\c 	; $R0="������"        ;only Russian Letters
-\c 	${StrFilter} "123abc��� 456DEF��� 7890|%#" "2" "$R0" "" $R0
-\c 	; $R0="abc���DEF���"  ;only English + Russian Letters
+\c 	${StrFilter} "123abcְֱֲ 456DEFדהו 7890|%#" "2rus" "" "" $R0
+\c 	; $R0="ְֱֲדהו"        ;only Russian Letters
+\c 	${StrFilter} "123abcְֱֲ 456DEFדהו 7890|%#" "2" "$R0" "" $R0
+\c 	; $R0="abcְֱֲDEFדהו"  ;only English + Russian Letters
 \c SectionEnd
 
 \\<b\\>Example (Word Capitalize):\\</b\\>
diff -Nru nsis-3.05/Docs/src/history.but nsis-3.06.1/Docs/src/history.but
--- nsis-3.05/Docs/src/history.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/history.but	2020-08-01 02:09:58.000000000 +0000
@@ -1,5 +1,59 @@
 \A{history} Changelog and Release Notes
 
+\H{v3.06.1} 3.06.1
+
+Released on July 31st, 2020
+
+\S1{v3.06.1-rl} Release Notes
+
+20th anniversary! The first public release of NSIS was v1.0f on July 31st, 2000.
+
+\S1{v3.06.1-cl} Changelog
+
+\S2{} Major Changes
+
+\b Fixed \R{setbrandingimage}{SetBrandingImage} crash
+
+\H{v3.06} 3.06
+
+Released on July 31st, 2020
+
+\S1{v3.06-cl} Changelog
+
+\S2{} Major Changes
+
+\b \cw{DeleteRegKey /ifempty} now also checks for values, not just subkeys. Use \cw{/ifnosubkeys} for the old behavior.
+
+\b Added \R{getknownfolderpath}{GetKnownFolderPath}
+
+\b Added UnpinShortcut macro (Integration.nsh)
+
+\S2{} Minor Changes
+
+\b Added \R{ifshellvarcontextall}{IfShellVarContextAll} and \R{ifrtllanguage}{IfRtlLanguage}
+
+\# Undocumented: \b Added GetShellVarContext, IfAltRegView and GetRegView | Documenting these would require documenting the parameter name to number mapping
+
+\# Undocumented: \b Added ManifestAppendCustomString
+
+\b Added \cw{!define /intfmt}
+
+\b Added Date/Time \L{../Docs/nsDialogs/Readme.html}{nsDialogs} controls and macros
+
+\b \L{../Docs/MultiUser/Readme.html}{MultiUser}: Fixed INSTALLMODE_FUNCTION and added INSTALLMODEPAGE_SHOWUSERNAME
+
+\S2{} Translations
+
+\b Updated German (SebStange PR\#{github.com/SebStange}) and Simplified Chinese (\W{http://sf.net/p/nsis/patches/297}{patch #297})
+
+\S2{} Build System
+
+\b Primitive SOURCE_DATE_EPOCH support (\W{http://sf.net/p/nsis/patches/294}{patch #294})
+
+\b Python 3 fixes (\W{http://sf.net/p/nsis/patches/296}{patch #296})
+
+\b GCC 10 memmove workaround (\W{http://sf.net/p/nsis/bugs/1248}{bug #1248})
+
 \H{v3.05} 3.05
 
 Released on December 15th, 2019
@@ -76,7 +130,7 @@
 
 \b Fixed !macroundef of last defined macro bug
 
-\b Fixed MultiUser caption string bug (\W{http://sf.net/p/nsis/bugs/1012}{bug #1012})
+\b Fixed \L{../Docs/MultiUser/Readme.html}{MultiUser} caption string bug (\W{http://sf.net/p/nsis/bugs/1012}{bug #1012})
 
 \b !undef issues warnings instead of errors
 
@@ -906,7 +960,7 @@
 
 \b Brazilian Portuguese corrections
 
-\b Consistency fixes for Simple Chinese (\W{http://sourceforge.net/support/tracker.php?aid=2189117}{patch #2189117})
+\b Consistency fixes for Simplified Chinese (\W{http://sourceforge.net/support/tracker.php?aid=2189117}{patch #2189117})
 
 \S2{} Build System
 
@@ -1426,7 +1480,7 @@
 
 \S1{v2.29-rl} Release Notes
 
-\b The most notable addition in this release is nsDialogs - a faster and far more capable replacement for InstallOptions. It allows creating controls of any type directly from the script and removes the need to mess with slow INI files. It integrates directly into the script by calling functions for notification, including change notification for edit boxes. \W{http://nsis.sourceforge.net/Community}{Speak up} if you have any suggestions/comments/patches for it.
+\b The most notable addition in this release is nsDialogs - a faster and far more capable replacement for InstallOptions. It allows creating controls of any type directly from the script and removes the need to mess with slow INI files. It integrates directly into the script by calling functions for notification, including change notification for edit boxes. \W{https://nsis.sourceforge.io/Community}{Speak up} if you have any suggestions/comments/patches for it.
 
 \S1{v2.29-cl} Changelog
 
@@ -1774,7 +1828,7 @@
 
 \S1{v2.22-rl} Release Notes
 
-\b Some changes have been made to the credit and license files in order to avoid copyrights and license related confusions. This does not change in any way how NSIS should or could be used. NSIS itself is still licensed with the permissive BSD-like \W{http://nsis.sourceforge.net/License}{zlib license}.
+\b Some changes have been made to the credit and license files in order to avoid copyrights and license related confusions. This does not change in any way how NSIS should or could be used. NSIS itself is still licensed with the permissive BSD-like \W{https://nsis.sourceforge.io/License}{zlib license}.
 
 \b Upgrade is recommended for early adopters of WinVer.nsh, due to a bug in Windows 98 and ME detection.
 
@@ -2398,7 +2452,7 @@
 
 \b Fixed typos in Thai translation
 
-\b Updated Simple Chinese translation
+\b Updated Simplified Chinese translation
 
 \S2{} Build System
 
@@ -2460,7 +2514,7 @@
 
 \S1{v2.08-rn} Release Notes
 
-\b The Archive has been replaced with a \W{http://nsis.sourceforge.net/wiki/}{Wiki}. The new Wiki allows everyone to edit all pages so there's no longer need to hunt for the original author. It also allows everyone to upload plug-ins and not just administrators. And as if that's not enough, it looks better and provides easier and more feature-rich syntax.
+\b The Archive has been replaced with a \W{https://nsis.sourceforge.io/wiki/}{Wiki}. The new Wiki allows everyone to edit all pages so there's no longer need to hunt for the original author. It also allows everyone to upload plug-ins and not just administrators. And as if that's not enough, it looks better and provides easier and more feature-rich syntax.
 
 \S1{v2.08-cl} Changelog
 
@@ -2513,7 +2567,7 @@
 
 \b Solid compression is no longer the default for bzip2 and lzma, use \c{SetCompressor /SOLID bzip2} or \c{SetCompressor /SOLID lzma} for solid compression.
 
-\b Source code is no longer supplied with the installer package. Source code can be downloaded from CVS or from the \W{http://nsis.sourceforge.net/download/}{download page}.
+\b Source code is no longer supplied with the installer package. Source code can be downloaded from CVS or from the \W{https://nsis.sourceforge.io/download/}{download page}.
 
 \b The directory structure of the installation has been changed. All documentation is now in the Docs folder and all examples are in the Examples folder.
 
diff -Nru nsis-3.05/Docs/src/intro.but nsis-3.06.1/Docs/src/intro.but
--- nsis-3.05/Docs/src/intro.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/intro.but	2020-07-31 20:07:43.000000000 +0000
@@ -31,7 +31,7 @@
 
 \\<b\\>Script based\\</b\\>
 
-Unlike other systems that can only generate installers based on a list of files and registry keys, NSIS has a powerful scripting language. This script language is designed for installers and has commands that help you to perform many installation tasks. You can easily add custom logic and handle different upgrades, version checks and more. On the \W{http://nsis.sourceforge.net/wiki/}{NSIS Wiki} you can find a lot more.
+Unlike other systems that can only generate installers based on a list of files and registry keys, NSIS has a powerful scripting language. This script language is designed for installers and has commands that help you to perform many installation tasks. You can easily add custom logic and handle different upgrades, version checks and more. On the \W{https://nsis.sourceforge.io/wiki/}{NSIS Wiki} you can find a lot more.
 
 \\<b\\>Multiple languages in one installer\\</b\\>
 
diff -Nru nsis-3.05/Docs/src/library.but nsis-3.06.1/Docs/src/library.but
--- nsis-3.05/Docs/src/library.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/library.but	2020-07-31 20:07:43.000000000 +0000
@@ -251,7 +251,7 @@
 \H{library_vb6} Visual Basic 6 Run-Time Files
 
 A new VB6RunTime.nsh header file is available for the setup of the VB6 run-time files.
-To obtain the latest run-time files, download \W{http://nsis.sourceforge.net/vb6runtime.zip}{vb6runtime.zip} and extract this file.
+To obtain the latest run-time files, download \W{https://nsis.sourceforge.io/vb6runtime.zip}{vb6runtime.zip} and extract this file.
 
 \c  !include VB6RunTime.nsh
 \c
diff -Nru nsis-3.05/Docs/src/registry.but nsis-3.06.1/Docs/src/registry.but
--- nsis-3.05/Docs/src/registry.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/registry.but	2020-04-13 19:16:10.000000000 +0000
@@ -29,9 +29,9 @@
 
 \S2{deleteregkey} DeleteRegKey
 
-\c [/ifempty] root_key subkey
+\c [/ifempty | /ifnosubkeys | /ifnovalues] root_key subkey
 
-Deletes a registry key. If /ifempty is specified, the registry key will only be deleted if it has no subkeys (otherwise, the whole registry tree will be removed). Valid values for root_key are listed under \R{writeregstr}{WriteRegStr}. The error flag is set if the key could not be removed from the registry (or if it didn't exist to begin with).
+Deletes a registry key. If /ifempty is specified, the registry key will only be deleted if it has no subkeys and no values (otherwise, the whole registry tree will be removed). Valid values for root_key are listed under \R{writeregstr}{WriteRegStr}. The error flag is set if the key could not be removed from the registry (or if it didn't exist to begin with).
 
 \c DeleteRegKey HKLM "Software\My Company\My Software"
 \c DeleteRegKey /ifempty HKLM "Software\A key that might have subkeys"
@@ -144,6 +144,12 @@
 
 \c WriteRegBin HKLM "Software\My Company\My Software" "Binary Value" DEADBEEF01223211151
 
+\S2{writeregnone} WriteRegNone
+
+\c root_key subkey key_name
+
+Writes a value without data to the registry.
+
 \S2{writeregdword} WriteRegDWORD
 
 \c root_key subkey key_name value
@@ -221,11 +227,4 @@
 \c   ReadRegStr $0 HKLM Software\Microsoft\Windows\CurrentVersion ProgramFilesDir
 \c   DetailPrint $0 # prints C:\Program Files
 \c ${EndIf}
-
-\c Function .onInit
-\c   ${If} ${RunningX64}
-\c     SetRegView 64
-\c     ReadRegStr $INSTDIR HKLM Software\NSIS ""
-\c     SetRegView Default
-\c   ${EndIf}
-\c FunctionEnd
+\c SetRegView Default
diff -Nru nsis-3.05/Docs/src/tutorial.but nsis-3.06.1/Docs/src/tutorial.but
--- nsis-3.05/Docs/src/tutorial.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/tutorial.but	2020-07-31 20:07:43.000000000 +0000
@@ -203,7 +203,7 @@
 
 \S2{tutdebug} Debugging Scripts
 
-The more you work with NSIS the more complex the scripts will become. This will increase the potential of mistakes, especially when dealing with lots of variables. There are a few possibilities to help you debugging the code. To display the contents of variables you should use \R{messagebox}{MessageBoxes} or \R{detailprint}{DetailPrint}. To get a brief overview about all variables you should use the plug-in \W{http://nsis.sourceforge.net/DumpState}{DumpState}. By default all actions of the Installer are printed out in the Log Window. You can access the log if you right-click in the Log Window and select "Copy Details To Clipboard". There is also a way to write it directly to a file, see \R{dumplogtofile}{here}.
+The more you work with NSIS the more complex the scripts will become. This will increase the potential of mistakes, especially when dealing with lots of variables. There are a few possibilities to help you debugging the code. To display the contents of variables you should use \R{messagebox}{MessageBoxes} or \R{detailprint}{DetailPrint}. To get a brief overview about all variables you should use the plug-in \W{https://nsis.sourceforge.io/DumpState}{DumpState}. By default all actions of the Installer are printed out in the Log Window. You can access the log if you right-click in the Log Window and select "Copy Details To Clipboard". There is also a way to write it directly to a file, see \R{dumplogtofile}{here}.
 
 \S1{tutscriptexecution} Script Execution
 
diff -Nru nsis-3.05/Docs/src/ui.but nsis-3.06.1/Docs/src/ui.but
--- nsis-3.05/Docs/src/ui.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/ui.but	2020-05-01 13:15:03.000000000 +0000
@@ -73,9 +73,11 @@
 
 \S2{loadandsetimage} LoadAndSetImage
 
-\c [/EXERESOURCE] [/STRINGID] [/RESIZETOFIT[WIDTH|HEIGHT]] ctrl imagetype lrflags image
+\c [/EXERESOURCE] [/STRINGID] [/RESIZETOFIT[WIDTH|HEIGHT]] ctrl imagetype lrflags imageid [user_var(imagehandle)]
 
-Loads and sets a image on a static control. \cw{ctrl} is the handle of the control. \cw{imagetype} must 0 for bitmaps and 1 for icons (and the control style must match the image type). \cw{lrflags} should be 0x10 to load from a file or 0 to load from a resource. \cw{image} specifies the file path or resource name. Use \cw{/EXERESOURCE} to load a resource from the installer .EXE. Use \cw{/STRINGID} if \cw{image} is a string, otherwise it is interpreted as a number. Use \cw{/RESIZETOFIT[WIDTH|HEIGHT]} to resize the image to the dimensions of the control.
+Loads and sets a image on a static control. \cw{ctrl} is the handle of the control. \cw{imagetype} must 0 for bitmaps and 1 for icons (and the control style must match the image type). \cw{lrflags} should be 0x10 to load from a file or 0 to load from a resource. \cw{imageid} specifies the file path or resource name. Use \cw{/EXERESOURCE} to load a resource from the installer .EXE. Use \cw{/STRINGID} if \cw{imageid} is a string, otherwise it is interpreted as a number. Use \cw{/RESIZETOFIT[WIDTH|HEIGHT]} to resize the image to the dimensions of the control. \cw{imagehandle} can optionally recieve the handle of the loaded image.
+
+Images loaded on individual pages should be destroyed to minimize resource leaks. If images are loaded into the same control multiple times, the previous image will only be destroyed if it is a bitmap image. Previous icons and 32-bit ARGB bitmaps must be retrieved with \cw{STM_GETIMAGE} and destroyed.
 
 \c LoadAndSetImage /EXERESOURCE $hIconStatic 1 0 103
 \c LoadAndSetImage /STRINGID /RESIZETOFITWIDTH $hBmpStatic 0 0x10 "$PluginsDir\myimg.bmp"
@@ -109,7 +111,7 @@
 
 \c [/IMGID=item_id_in_dialog] [/RESIZETOFIT] path_to_bitmap_file.bmp
 
-Sets the current bitmap file displayed as the branding image. If no IMGID is specified, the first image control found will be used, or the image control created by \R{aaddbrandingimage}{AddBrandingImage}. Note that this bitmap must be present on the user's machine. Use File first to put it there. If /RESIZETOFIT is specified the image will be automatically resized (very poorly) to the image control size. If you used \R{aaddbrandingimage}{AddBrandingImage} you can get this size by compiling your script and watching for \R{aaddbrandingimage}{AddBrandingImage} output, it will tell you the size. SetBrandingImage will not work when called from .onInit!
+Sets the current bitmap file displayed as the branding image. If no IMGID is specified, the first image control found will be used, or the image control created by \R{aaddbrandingimage}{AddBrandingImage}. Note that this bitmap must be present on the user's machine. Use \cw{File} first to put it there. If /RESIZETOFIT is specified the image will be automatically resized (very poorly) to the image control size. If you used \R{aaddbrandingimage}{AddBrandingImage} you can get this size by compiling your script and watching for \R{aaddbrandingimage}{AddBrandingImage} output, it will tell you the size. SetBrandingImage will not work when called from .onInit!
 
 \S2{setdetailsview} SetDetailsView
 
diff -Nru nsis-3.05/Docs/src/usefulfunc.but nsis-3.06.1/Docs/src/usefulfunc.but
--- nsis-3.05/Docs/src/usefulfunc.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/usefulfunc.but	2020-07-31 20:07:43.000000000 +0000
@@ -2,102 +2,80 @@
 
 \H{getieversion} Get Internet Explorer version
 
-\c  ; GetIEVersion
-\c  ;
-\c  ; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
-\c  ; Returns 1-6 (IE Version) or '' (IE is not installed) on top of the stack
-\c  ;
-\c  ; Usage:
-\c  ;   Call GetIEVersion
-\c  ;   Pop $R0 ; at this point $R0 is "5" or whatnot
-\c
-\c  Function GetIEVersion
-\c  Push $R0
-\c    ClearErrors
-\c    ReadRegStr $R0 HKLM "Software\Microsoft\Internet Explorer" "Version"
-\c    IfErrors lbl_123 lbl_456
-\c
-\c    lbl_456: ; ie 4+
-\c      Strcpy $R0 $R0 1
-\c    Goto lbl_done
-\c
-\c    lbl_123: ; older ie version
-\c      ClearErrors
-\c      ReadRegStr $R0 HKLM "Software\Microsoft\Internet Explorer" "IVer"
-\c      IfErrors lbl_error
-\c
-\c        StrCpy $R0 $R0 3
-\c        StrCmp $R0 '100' lbl_ie1
-\c        StrCmp $R0 '101' lbl_ie2
-\c        StrCmp $R0 '102' lbl_ie2
+\c ; GetIEVersion
+\c ;
+\c ; Returns 1-11 (IE Version) or '' (IE is not installed) on top of the stack
+\c ;
+\c ; Usage:
+\c ;   Call GetIEVersion
+\c ;   Pop $R0 ; $R0 is "5" etc.
 \c
-\c        StrCpy $R0 '3' ; default to ie3 if not 100, 101, or 102.
-\c        Goto lbl_done
-\c          lbl_ie1:
-\c            StrCpy $R0 '1'
-\c          Goto lbl_done
-\c          lbl_ie2:
-\c            StrCpy $R0 '2'
-\c          Goto lbl_done
-\c      lbl_error:
-\c        StrCpy $R0 ''
-\c    lbl_done:
-\c    Exch $R0
-\c  FunctionEnd
+\c Function GetIEVersion
+\c   Push $R0
+\c   ReadRegStr $R0 HKLM "Software\Microsoft\Internet Explorer" "svcVersion" ; IE v10+
+\c   StrCpy $R0 $R0 2
+\c   IntCmp $R0 9 "" "" lbl_done
+\c   ClearErrors
+\c   ReadRegStr $R0 HKLM "Software\Microsoft\Internet Explorer" "Version" ; IE v4..9
+\c   IfErrors lbl_123
+\c     StrCpy $R0 $R0 1 ; Note: This truncates 5.50 to 5 etc.
+\c     Goto lbl_done
+\c   lbl_123:
+\c   !if "${NSIS_PTR_SIZE}" > 4
+\c   StrCpy $R0 ""
+\c   !else
+\c   ReadRegStr $R0 HKLM "Software\Microsoft\Internet Explorer" "IVer" ; IE v1..3
+\c   IntCmp $R0 99 "" "" +3
+\c     StrCpy $R0 ""
+\c     Goto lbl_done
+\c   IntOp $R0 $R0 & 3 ; 100..103->0..3
+\c   IntCmp $R0 2 +2 "" +2
+\c     IntOp $R0 $R0 + 1 ; Bump 100->v1 and 101->v2 (Is 101 v1.5 or 2.0?)
+\c   !endif
+\c   lbl_done:
+\c   Exch $R0
+\c FunctionEnd
 
 \H{detect.netframework} Is .NET Framework installed?
 
-\c  ; IsDotNETInstalled
-\c  ;
-\c  ; Based on GetDotNETVersion
-\c  ;   http://nsis.sourceforge.net/Get_.NET_Version
-\c  ;
-\c  ; Usage:
-\c  ;   Call IsDotNETInstalled
-\c  ;   Pop $0
-\c  ;   StrCmp $0 1 found_dotNETFramework no_dotNETFramework
-\c
-\c  Function IsDotNETInstalled
-\c    Push $0
-\c    Push $1
-\c
-\c    StrCpy $0 1
-\c    System::Call "mscoree::GetCORVersion(w, i ${NSIS_MAX_STRLEN}, *i) i .r1"
-\c    StrCmp $1 0 +2
-\c      StrCpy $0 0
-\c
-\c    Pop $1
-\c    Exch $0
-\c  FunctionEnd
+\c ; IsDotNETInstalled
+\c ;
+\c ; NOTE: This is only able to detect .NET v1.x and v2.x!
+\c ;
+\c ; Based on GetDotNETVersion
+\c ;   https://nsis.sourceforge.io/Get_.NET_Version
+\c ;
+\c ; Usage:
+\c ;   Call IsDotNETInstalled
+\c ;   Pop $0 ; 0 or 1
+\c ;   StrCmp $0 1 found_dotNETFramework_v1_or_v2 no_dotNETFramework
+\c 
+\c Function IsDotNETInstalled
+\c   Push $0
+\c   System::Call '"$SysDir\MSCOREE.dll"::GetCORVersion(w,i${NSIS_MAX_STRLEN},*i)i.r0?u'
+\c   IntOp $0 $0 ! ; HRESULT (S_OK) -> BOOL
+\c   Exch $0
+\c FunctionEnd
 
 \H{isflashinstalled} Is Macromedia Flash Player installed?
 
-\c  ; IsFlashInstalled
-\c  ;
-\c  ; By Yazno, http://yazno.tripod.com/powerpimpit/
-\c  ; Returns the result on top of the stack
-\c  ;
-\c  ; Usage:
-\c  ;   Call IsFlashInstalled
-\c  ;   Pop $R0 ; $R0 is "1" or "0" at this point 
-\c
-\c  Function IsFlashInstalled
-\c   Push $R0
-\c   ClearErrors
-\c   ReadRegStr $R0 HKCR "CLSID\{D27CDB6E-AE6D-11cf-96B8-444553540000}" ""
-\c   IfErrors lbl_na
-\c     StrCpy $R0 1
-\c   Goto lbl_end
-\c   lbl_na:
-\c     StrCpy $R0 0
-\c   lbl_end:
-\c   Exch $R0
-\c  FunctionEnd
+\c ; IsFlashInstalled
+\c ;
+\c ; Usage:
+\c ;   Call IsFlashInstalled
+\c ;   Pop $R0 ; 1 or ""
+\c
+\c Function IsFlashInstalled
+\c Push $R0
+\c ReadRegStr $R0 HKCR "CLSID\{D27CDB6E-AE6D-11cf-96B8-444553540000}" ""
+\c StrCmp $R0 "" +2
+\c   StrCpy $R0 "1"
+\c Exch $R0
+\c FunctionEnd
 
 \H{connectinternet} Connect to the Internet
 
-\c  ; ConnectInternet (uses Dialer plug-in)
-\c  ; Written by Joost Verburg 
+\c  ; ConnectInternet (uses Dialer plug-in) - Written by Joost Verburg 
 \c  ;
 \c  ; This function attempts to make a connection to the internet if there is no
 \c  ; connection available. If you are not sure that a system using the installer
@@ -118,7 +96,7 @@
 \c      Pop $R0
 \c      StrCmp $R0 "online" connected
 \c        MessageBox MB_OK|MB_ICONSTOP "Cannot connect to the internet."
-\c        Quit ;This will quit the installer. You might want to add your own error handling.
+\c        Quit ; This will quit the installer. You might want to add your own error handling.
 \c      
 \c      noie3:
 \c    
@@ -131,11 +109,6 @@
 \c    
 \c  FunctionEnd
 
-\H{installerfilename} Get Installer Filename
-
-\c  System::Call 'kernel32::GetModuleFileName(p 0, t .R0, i ${NSIS_MAX_STRLEN}) i.r1'
-\c  ;$R0 will contain the installer filename
-
 \H{multipleinstances} Prevent Multiple Instances
 
 Put the following code in your \R{oninit}{.onInit function}:
@@ -147,8 +120,8 @@
 \c    MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
 \c    Abort
 
-'myMutex' must be replaced by a unique value!
+'myMutex' \e{must} be replaced by a unique string or GUID!
 
 \H{morefuncs} More
 
-You can find more useful scripts on \W{http://nsis.sourceforge.net/wiki/}{the NSIS Wiki}, \W{http://forums.winamp.com/forumdisplay.php?s=&forumid=65}{the NSIS forum} and the \W{http://nsis.sourceforge.net/}{NSIS development page}.
\ No newline at end of file
+You can find more useful scripts on \W{https://nsis.sourceforge.io/wiki/}{the NSIS Wiki}, \W{http://forums.winamp.com/forumdisplay.php?s=&forumid=65}{the NSIS forum} and the \W{https://nsis.sourceforge.io/}{NSIS development page}.
\ No newline at end of file
diff -Nru nsis-3.05/Docs/src/usefulinfos.but nsis-3.06.1/Docs/src/usefulinfos.but
--- nsis-3.05/Docs/src/usefulinfos.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/usefulinfos.but	2020-04-21 19:02:30.000000000 +0000
@@ -170,7 +170,6 @@
 The following code fragment will install 'condmgr.dll' to a temporary directory, execute the CmGetHotSyncExecPath function and display returned data.
 Save this script
 
-\c ; **** snip ****
 \c Function loadDll
 \c
 \c   SetOutPath $TEMP\eInspect             ; create temp directory
@@ -182,7 +181,6 @@
 \c   DetailPrint "Return value: $2"
 \c
 \c FunctionEnd
-\c ; **** snip ****
 
 
 and this function produces the following output in the 'details' page:
@@ -194,11 +192,11 @@
 Return value: 0
 
 
-Written by \W{http://nsis.sourceforge.net/archive/profile.php?userid=78}{djc}
+Written by \W{https://web.archive.org/web/2018/http://nsis.sourceforge.net/archive/profile.php?userid=78}{djc}
 
-\\<u\\>Acknowledgements & Thanks\\</u\\> \\<br\\>
-Lots of thanks go to \\<b\\>kichik\\</b\\> and \\<b\\>Sunjammer\\</b\\> for spending a lot of time assisting in solving this problem. Also to \\<b\\>brainsucker\\</b\\> for creating the System.dll plug-in in the first place.
-Good Luck!
+\# \\<u\\>Acknowledgements & Thanks\\</u\\> \\<br\\>
+\# Lots of thanks go to \\<b\\>kichik\\</b\\> and \\<b\\>Sunjammer\\</b\\> for spending a lot of time assisting in solving this problem. Also to \\<b\\>brainsucker\\</b\\> for creating the System.dll plug-in in the first place.
+\# Good Luck! 
 
 \H{dumplogtofile} Dump Content of Log Window to File
 
@@ -208,66 +206,24 @@
 
 
 \c GetTempFileName $0
+\c DetailPrint "Writing log to $0"
 \c Push $0
 \c Call DumpLog
 
-Here is the function:
-
-
+If you're building a \R{intro-unicode}{Unicode installer} you can \cw{!define DumpLog_As_UTF16LE} to output as UTF-16LE or \cw{!define DumpLog_As_UTF16LE "/BOM"} to output as UTF-16LE with a BOM.
 
-\c !define LVM_GETITEMCOUNT 0x1004
-\c !define LVM_GETITEMTEXTA 0x102D
-\c
-\c Function DumpLog # Written by KiCHiK
-\c   Exch $5
-\c   Push $0
-\c   Push $1
-\c   Push $2
-\c   Push $3
-\c   Push $4
-\c   Push $6
-\c
-\c   FindWindow $0 "#32770" "" $HWNDPARENT
-\c   GetDlgItem $0 $0 1016
-\c   StrCmp $0 0 error
-\c   FileOpen $5 $5 "w"
-\c   StrCmp $5 0 error
-\c     SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
-\c     System::StrAlloc ${NSIS_MAX_STRLEN}
-\c     Pop $3
-\c     StrCpy $2 0
-\c     System::Call "*(i, i, i, i, i, i, i, i, i) p \
-\c       (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
-\c     loop: StrCmp $2 $6 done
-\c       System::Call "User32::SendMessageA(p, i, p, p) i \
-\c         ($0, ${LVM_GETITEMTEXTA}, $2, r1)"
-\c       System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
-\c       FileWrite $5 "$4$\r$\n"
-\c       IntOp $2 $2 + 1
-\c       Goto loop
-\c     done:
-\c       FileClose $5
-\c       System::Free $1
-\c       System::Free $3
-\c       Goto exit
-\c   error:
-\c     MessageBox MB_OK error
-\c   exit:
-\c     Pop $6
-\c     Pop $4
-\c     Pop $3
-\c     Pop $2
-\c     Pop $1
-\c     Pop $0
-\c     Exch $5
-\c FunctionEnd
-
-Here's the function to generate a UTF-16LE file if you're building a \R{intro-unicode}{Unicode installer}.
+Here is the function:
 
-\c !define LVM_GETITEMCOUNT 0x1004
-\c !define LVM_GETITEMTEXTW 0x1073
-\c 
-\c Function DumpLog # Written by KiCHiK, modified by Jim Park
+\c !define /IfNDef LVM_GETITEMCOUNT 0x1004
+\c !define /IfNDef LVM_GETITEMTEXTA 0x102D
+\c !define /IfNDef LVM_GETITEMTEXTW 0x1073
+\c !if "${NSIS_CHAR_SIZE}" > 1
+\c !define /IfNDef LVM_GETITEMTEXT ${LVM_GETITEMTEXTW}
+\c !else
+\c !define /IfNDef LVM_GETITEMTEXT ${LVM_GETITEMTEXTA}
+\c !endif
+\c  
+\c Function DumpLog
 \c   Exch $5
 \c   Push $0
 \c   Push $1
@@ -275,33 +231,29 @@
 \c   Push $3
 \c   Push $4
 \c   Push $6
-\c 
 \c   FindWindow $0 "#32770" "" $HWNDPARENT
 \c   GetDlgItem $0 $0 1016
-\c   StrCmp $0 0 error
+\c   StrCmp $0 0 exit
 \c   FileOpen $5 $5 "w"
-\c   FileWriteWord $5 0xfeff ; Write the BOM
-\c   StrCmp $5 0 error
+\c   StrCmp $5 "" exit
 \c     SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
-\c     System::StrAlloc ${NSIS_MAX_STRLEN}
-\c     Pop $3
+\c     System::Call '*(&t${NSIS_MAX_STRLEN})p.r3'
 \c     StrCpy $2 0
-\c     System::Call "*(i, i, i, i, i, i, i, i, i) p \
-\c       (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
+\c     System::Call "*(i, i, i, i, i, p, i, i, i) i  (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
 \c     loop: StrCmp $2 $6 done
-\c       System::Call "User32::SendMessageW(p, i, p, p) i \
-\c         ($0, ${LVM_GETITEMTEXTW}, $2, r1)"
+\c       System::Call "User32::SendMessage(i, i, i, i) i ($0, ${LVM_GETITEMTEXT}, $2, r1)"
 \c       System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
-\c       FileWriteUTF16LE $5 "$4$\r$\n"
+\c       !ifdef DumpLog_As_UTF16LE
+\c       FileWriteUTF16LE ${DumpLog_As_UTF16LE} $5 "$4$\r$\n"
+\c       !else
+\c       FileWrite $5 "$4$\r$\n" ; Unicode will be translated to ANSI!
+\c       !endif
 \c       IntOp $2 $2 + 1
 \c       Goto loop
 \c     done:
 \c       FileClose $5
 \c       System::Free $1
 \c       System::Free $3
-\c       Goto exit
-\c   error:
-\c     MessageBox MB_OK error
 \c   exit:
 \c     Pop $6
 \c     Pop $4
@@ -309,13 +261,12 @@
 \c     Pop $2
 \c     Pop $1
 \c     Pop $0
-\c     Exch $5
+\c     Pop $5
 \c FunctionEnd
 
 \H{readreg_multi_sz} How to Read REG_MULTI_SZ Values
 
-KiCHiK wrote this script to help rpetges in \W{http://forums.winamp.com/showthread.php?s=&threadid=131154}{this forum thread}. It reads a registry value of the type REG_MULTI_SZ and prints it out. Don't forget to edit where it says "Edit this!" when you test this script. The values must point to a REG_MULTI_SZ value or the example will spit out an error.
-
+\#{KiCHiK wrote this script to help rpetges in \W{http://forums.winamp.com/showthread.php?s=&threadid=131154}{this forum thread}.} This example reads a registry value of the type REG_MULTI_SZ and prints it out. Don't forget to edit where it says "Edit this!" when you test this script. The values must point to a REG_MULTI_SZ value or the example will spit out an error.
 
 \c OutFile "REG_MULTI_SZ Reader.exe"
 \c Name "REG_MULTI_SZ Reader"
@@ -342,25 +293,24 @@
 \c !define REG_LINK                 6
 \c !define REG_MULTI_SZ             7
 \c
-\c !define RegOpenKeyEx     "Advapi32::RegOpenKeyExA(i, t, i, i, *i) i"
-\c !define RegQueryValueEx  "Advapi32::RegQueryValueExA(i, t, i, *i, i, *i) i"
-\c !define RegCloseKey      "Advapi32::RegCloseKeyA(i) i"
+\c !define RegOpenKeyEx     "Advapi32::RegOpenKeyEx(p, t, i, i, *p) i"
+\c !define RegQueryValueEx  "Advapi32::RegQueryValueEx(p, t, p, *i, p, *i) i"
+\c !define RegCloseKey      "Advapi32::RegCloseKeyA(p) i"
 \c
 \c ####### Edit this!
 \c
-\c !define ROOT_KEY         ${HKEY_CURRENT_USER}
-\c !define SUB_KEY          "Software\Joe Software"
-\c !define VALUE            "Strings"
+\c !define ROOT_KEY         ${HKEY_LOCAL_MACHINE}
+\c !define SUB_KEY          "SYSTEM\CurrentControlSet\Control\Lsa"
+\c !define VALUE            "Security Packages"
 \c
 \c ####### Stop editing
 \c
 \c Section "Read"
-\c   StrCpy $0 ""
 \c   StrCpy $1 ""
 \c   StrCpy $2 ""
 \c   StrCpy $3 ""
 \c   System::Call "${RegOpenKeyEx}(${ROOT_KEY}, '${SUB_KEY}', \
-\c     0, ${KEY_QUERY_VALUE}|${KEY_ENUMERATE_SUB_KEYS}, .r0) .r3"
+\c     0, ${KEY_QUERY_VALUE}|${KEY_ENUMERATE_SUB_KEYS}, 0 r0) .r3"
 \c  
 \c   StrCmp $3 0 goon
 \c     MessageBox MB_OK|MB_ICONSTOP "Can't open registry key! ($3)"
@@ -376,7 +326,7 @@
 \c read:
 \c  
 \c   StrCmp $1 ${REG_MULTI_SZ} multisz
-\c     MessageBox MB_OK|MB_ICONSTOP "Registry value no REG_MULTI_SZ! ($3)"
+\c     MessageBox MB_OK|MB_ICONSTOP "Registry value not a REG_MULTI_SZ! ($3)"
 \c     Goto done
 \c  
 \c multisz:
@@ -412,8 +362,11 @@
 \c     StrCmp $3 "" done
 \c     DetailPrint $3
 \c     StrLen $5 $3
-\c     IntOp $4 $4 + $5
-\c     IntOp $4 $4 + 1
+\c     !if "${NSIS_CHAR_SIZE}" > 1
+\c     IntOp $5 $5 * ${NSIS_CHAR_SIZE}
+\c     !endif
+\c     IntPtrOp $4 $4 + $5
+\c     IntPtrOp $4 $4 + ${NSIS_CHAR_SIZE}
 \c     Goto loop
 \c  
 \c done:
@@ -429,4 +382,4 @@
 
 \H{unicode_defines}Predefined Macros for Unicode support
 
-There are two macros that can help you write scripts that work for both Unicode and ANSI installers. To figure out if the script is being compiled to generate a Unicode installer, use !ifdef to check for $\{NSIS_UNICODE\}. To see what the size of a character is, use $\{NSIS_CHAR_SIZE\}. It will be 1 for ANSI and 2 for Unicode installers.
+There are two macros that can help you write scripts that work for both Unicode and ANSI installers. To figure out if the script is being compiled to generate a Unicode installer, use !ifdef to check for NSIS_UNICODE. To see what the size of a character is, use $\{NSIS_CHAR_SIZE\}. It will be 1 for ANSI and 2 for Unicode installers.
diff -Nru nsis-3.05/Docs/src/var.but nsis-3.06.1/Docs/src/var.but
--- nsis-3.05/Docs/src/var.but	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Docs/src/var.but	2020-07-31 20:07:43.000000000 +0000
@@ -1,6 +1,6 @@
 \H{variables} Variables
 
-All variables are global and can be used in Sections or Functions. Note that by default, variables are limited to 1024 characters. To extend this limit, \R{build}{build NSIS} with a bigger value of the NSIS_MAX_STRLEN build setting or use the \W{http://nsis.sourceforge.net/download/specialbuilds/}{special build}.
+All variables are global and can be used in Sections or Functions. Note that by default, variables are limited to 1024 characters. To extend this limit, \R{build}{build NSIS} with a bigger value of the NSIS_MAX_STRLEN build setting or use the \W{https://nsis.sourceforge.io/download/specialbuilds/}{special build}.
 
 \S1{varuser} User Variables
 
@@ -141,7 +141,7 @@
 
 The user's music files directory. The context of this constant (All Users or Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} setting. The default is the current user.
 
-This constant is available on Windows XP, ME and above.
+This constant is available on Windows ME, XP and above.
 
 \e{$PICTURES}
 
@@ -153,7 +153,7 @@
 
 The user's video files directory. The context of this constant (All Users or Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} setting. The default is the current user.
 
-This constant is available on Windows XP, ME and above.
+This constant is available on Windows ME, XP and above.
 
 \e{$NETHOOD}
 
@@ -171,13 +171,13 @@
 
 \e{$APPDATA}
 
-The application data directory. Detection of the current user path requires Internet Explorer 4 and above. Detection of the all users path requires Internet Explorer 5 and above. The context of this constant (All Users or Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} setting. The default is the current user.
+The (roaming) application data directory.\#{ Detection of the current user path requires Internet Explorer 4 and above. Detection of the all users path requires Internet Explorer 5 and above. The context of this constant (All Users or Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} setting. The default is the current user.}
 
 This constant is not available on Windows 95 unless Internet Explorer 4 with Active Desktop is installed.
 
 \e{$LOCALAPPDATA}
 
-The local (non-roaming) application data directory. The context of this constant (All Users or Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} setting. The default is the current user.
+The local (non-roaming) application data directory. The context of this constant (All Users or Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} setting. The default is the current user. The All Users location is also known as \cw{%ProgramData%} on Vista and above.
 
 This constant is available on Windows ME, 2000 and above.
 
diff -Nru nsis-3.05/Examples/example1.nsi nsis-3.06.1/Examples/example1.nsi
--- nsis-3.05/Examples/example1.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Examples/example1.nsi	2020-04-13 19:16:10.000000000 +0000
@@ -4,6 +4,8 @@
 ; optional settings are left to their default settings. The installer simply 
 ; prompts the user asking them where to install, and drops a copy of example1.nsi
 ; there. 
+;
+; example2.nsi expands on this by adding a uninstaller and start menu shortcuts.
 
 ;--------------------------------
 
diff -Nru nsis-3.05/Examples/example2.nsi nsis-3.06.1/Examples/example2.nsi
--- nsis-3.05/Examples/example2.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Examples/example2.nsi	2020-04-13 19:16:10.000000000 +0000
@@ -3,7 +3,10 @@
 ; This script is based on example1.nsi, but it remember the directory, 
 ; has uninstall support and (optionally) installs start menu shortcuts.
 ;
-; It will install example2.nsi into a directory that the user selects,
+; It will install example2.nsi into a directory that the user selects.
+;
+; See install-shared.nsi for a more robust way of checking for administrator rights.
+; See install-per-user.nsi for a file association example.
 
 ;--------------------------------
 
@@ -13,7 +16,7 @@
 ; The file to write
 OutFile "example2.exe"
 
-; Request application privileges for Windows Vista
+; Request application privileges for Windows Vista and higher
 RequestExecutionLevel admin
 
 ; Build Unicode installer
@@ -66,9 +69,9 @@
 Section "Start Menu Shortcuts"
 
   CreateDirectory "$SMPROGRAMS\Example2"
-  CreateShortcut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortcut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" "$INSTDIR\example2.nsi" "" "$INSTDIR\example2.nsi" 0
-  
+  CreateShortcut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+  CreateShortcut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" "$INSTDIR\example2.nsi"
+
 SectionEnd
 
 ;--------------------------------
@@ -86,9 +89,9 @@
   Delete $INSTDIR\uninstall.exe
 
   ; Remove shortcuts, if any
-  Delete "$SMPROGRAMS\Example2\*.*"
+  Delete "$SMPROGRAMS\Example2\*.lnk"
 
-  ; Remove directories used
+  ; Remove directories
   RMDir "$SMPROGRAMS\Example2"
   RMDir "$INSTDIR"
 
diff -Nru nsis-3.05/Examples/install-per-user.nsi nsis-3.06.1/Examples/install-per-user.nsi
--- nsis-3.05/Examples/install-per-user.nsi	1970-01-01 00:00:00.000000000 +0000
+++ nsis-3.06.1/Examples/install-per-user.nsi	2020-07-31 22:40:03.000000000 +0000
@@ -0,0 +1,168 @@
+/*
+
+This example script installs a simple application for a single user.
+
+If multiple users on the same machine run this installer, each user
+will end up with a separate install that is not affected by
+update/removal operations performed by other users.
+
+Per-user installers should only write to HKCU and 
+folders inside the users profile.
+
+*/
+
+!define NAME "Per-User example"
+!define REGPATH_UNINSTSUBKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
+Name "${NAME}"
+OutFile "Install ${NAME}.exe"
+Unicode True
+RequestExecutionLevel User ; We don't need UAC elevation
+InstallDir "" ; Don't set a default $InstDir so we can detect /D= and InstallDirRegKey
+InstallDirRegKey HKCU "${REGPATH_UNINSTSUBKEY}" "UninstallString"
+
+!include LogicLib.nsh
+!include WinCore.nsh
+!include Integration.nsh
+
+
+Page Directory
+Page InstFiles
+
+Uninstpage UninstConfirm
+Uninstpage InstFiles
+
+
+Function .onInit
+  SetShellVarContext Current
+
+  ${If} $InstDir == "" ; No /D= nor InstallDirRegKey?
+    GetKnownFolderPath $InstDir ${FOLDERID_UserProgramFiles} ; This folder only exists on Win7+
+    StrCmp $InstDir "" 0 +2 
+    StrCpy $InstDir "$LocalAppData\Programs" ; Fallback directory
+
+    StrCpy $InstDir "$InstDir\$(^Name)"
+  ${EndIf}
+FunctionEnd
+
+Function un.onInit
+  SetShellVarContext Current
+FunctionEnd
+
+Section "Program files (Required)"
+  SectionIn Ro
+
+  SetOutPath $InstDir
+  WriteUninstaller "$InstDir\Uninst.exe"
+  WriteRegStr HKCU "${REGPATH_UNINSTSUBKEY}" "DisplayName" "${NAME}"
+  WriteRegStr HKCU "${REGPATH_UNINSTSUBKEY}" "DisplayIcon" "$InstDir\MyApp.exe,0"
+  WriteRegStr HKCU "${REGPATH_UNINSTSUBKEY}" "UninstallString" '"$InstDir\Uninst.exe"'
+  WriteRegDWORD HKCU "${REGPATH_UNINSTSUBKEY}" "NoModify" 1
+  WriteRegDWORD HKCU "${REGPATH_UNINSTSUBKEY}" "NoRepair" 1
+
+  File "/oname=$InstDir\MyApp.exe" "${NSISDIR}\Bin\MakeLangId.exe" ; Pretend that we have a real application to install
+SectionEnd
+
+Section "Start Menu shortcut"
+  CreateShortcut /NoWorkingDir "$SMPrograms\${NAME}.lnk" "$InstDir\MyApp.exe"
+SectionEnd
+
+/*
+This Section registers a fictional .test-nullsoft file extension and the Nullsoft.Test ProgId. 
+Proprietary file types are encouraged (by Microsoft) to use long file extensions and ProgIds that include the company name.
+
+When registering with "Open With" your executable should ideally have a somewhat unique name, 
+otherwise there could be a naming collision with a different application (with the same name) installed on the same machine.
+
+REGISTER_DEFAULTPROGRAMS is not defined because proprietary file types do not typically use the Default Programs functionality. 
+If your application registers a standard file type such as .mp3 or .html or a protocol like HTTP it should register as a Default Program. 
+It should also register as a client (https://docs.microsoft.com/en-us/windows/win32/shell/reg-middleware-apps#common-registration-elements-for-all-client-types).
+*/
+!define ASSOC_EXT ".test-nullsoft"
+!define ASSOC_PROGID "Nullsoft.Test"
+!define ASSOC_VERB "MyApp"
+!define ASSOC_APPEXE "MyApp.exe"
+Section -ShellAssoc
+  # Register file type
+  WriteRegStr ShCtx "Software\Classes\${ASSOC_PROGID}\DefaultIcon" "" "$InstDir\${ASSOC_APPEXE},0"
+  ;WriteRegStr ShCtx "Software\Classes\${ASSOC_PROGID}\shell\${ASSOC_VERB}" "" "Nullsoft Test App" [Optional]
+  ;WriteRegStr ShCtx "Software\Classes\${ASSOC_PROGID}\shell\${ASSOC_VERB}" "MUIVerb" "@$InstDir\${ASSOC_APPEXE},-42" ; WinXP+ [Optional] Localizable verb display name
+  WriteRegStr ShCtx "Software\Classes\${ASSOC_PROGID}\shell\${ASSOC_VERB}\command" "" '"$InstDir\${ASSOC_APPEXE}" "%1"'
+  WriteRegStr ShCtx "Software\Classes\${ASSOC_EXT}" "" "${ASSOC_PROGID}"
+
+  # Register "Open With" [Optional]
+  WriteRegNone ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithList" "${ASSOC_APPEXE}" ; Win2000+ [Optional]
+  ;WriteRegNone ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithProgids" "${ASSOC_PROGID}" ; WinXP+ [Optional]
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\shell\open\command" "" '"$InstDir\${ASSOC_APPEXE}" "%1"'
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}" "FriendlyAppName" "Nullsoft Test App" ; [Optional]
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}" "ApplicationCompany" "Nullsoft" ; [Optional]
+  WriteRegNone ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\SupportedTypes" "${ASSOC_EXT}" ; [Optional] Only allow "Open With" with specific extension(s) on WinXP+
+
+  # Register "Default Programs" [Optional]
+  !ifdef REGISTER_DEFAULTPROGRAMS
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\Capabilities" "ApplicationDescription" "Shell association example test application"
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\Capabilities\FileAssociations" "${ASSOC_EXT}" "${ASSOC_PROGID}"
+  WriteRegStr ShCtx "Software\RegisteredApplications" "Nullsoft Test App" "Software\Classes\Applications\${ASSOC_APPEXE}\Capabilities"
+  !endif
+
+  ${NotifyShell_AssocChanged}
+SectionEnd
+
+
+Section -un.ShellAssoc
+  # Unregister file type
+  ClearErrors
+  DeleteRegKey ShCtx "Software\Classes\${ASSOC_PROGID}\shell\${ASSOC_VERB}"
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_PROGID}\shell"
+  ${IfNot} ${Errors}
+    DeleteRegKey ShCtx "Software\Classes\${ASSOC_PROGID}\DefaultIcon"
+  ${EndIf}
+  ReadRegStr $0 ShCtx "Software\Classes\${ASSOC_EXT}" ""
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_PROGID}"
+  ${IfNot} ${Errors}
+  ${AndIf} $0 == "${ASSOC_PROGID}"
+    DeleteRegValue ShCtx "Software\Classes\${ASSOC_EXT}" ""
+    DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_EXT}"
+  ${EndIf}
+
+  # Unregister "Open With"
+  DeleteRegKey ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}"
+  DeleteRegValue ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithList" "${ASSOC_APPEXE}"
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithList"
+  DeleteRegValue ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithProgids" "${ASSOC_PROGID}"
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithProgids"
+  DeleteRegKey /IfEmpty  ShCtx "Software\Classes\${ASSOC_EXT}"
+
+  # Unregister "Default Programs"
+  !ifdef REGISTER_DEFAULTPROGRAMS
+  DeleteRegValue ShCtx "Software\RegisteredApplications" "Nullsoft Test App"
+  DeleteRegKey ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\Capabilities"
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}"
+  !endif
+
+  # Attempt to clean up junk left behind by the Windows shell
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Search\JumplistData" "$InstDir\${ASSOC_APPEXE}"
+  DeleteRegValue HKCU "Software\Classes\Local Settings\Software\Microsoft\Windows\Shell\MuiCache" "$InstDir\${ASSOC_APPEXE}.FriendlyAppName"
+  DeleteRegValue HKCU "Software\Classes\Local Settings\Software\Microsoft\Windows\Shell\MuiCache" "$InstDir\${ASSOC_APPEXE}.ApplicationCompany"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\ShellNoRoam\MUICache" "$InstDir\${ASSOC_APPEXE}" ; WinXP
+  DeleteRegValue HKCU "Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Compatibility Assistant\Store" "$InstDir\${ASSOC_APPEXE}"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts" "${ASSOC_PROGID}_${ASSOC_EXT}"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts" "Applications\${ASSOC_APPEXE}_${ASSOC_EXT}"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\${ASSOC_EXT}\OpenWithProgids" "${ASSOC_PROGID}"
+  DeleteRegKey /IfEmpty HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\${ASSOC_EXT}\OpenWithProgids"
+  DeleteRegKey /IfEmpty HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\${ASSOC_EXT}\OpenWithList"
+  DeleteRegKey /IfEmpty HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\${ASSOC_EXT}"
+  ;DeleteRegKey HKCU "Software\Microsoft\Windows\Roaming\OpenWith\FileExts\${ASSOC_EXT}"
+  ;DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\RecentDocs\${ASSOC_EXT}"
+
+  ${NotifyShell_AssocChanged}
+SectionEnd
+
+Section -Uninstall
+  ${UnpinShortcut} "$SMPrograms\${NAME}.lnk"
+  Delete "$SMPrograms\${NAME}.lnk"
+
+  Delete "$InstDir\MyApp.exe"
+  Delete "$InstDir\Uninst.exe"
+  RMDir "$InstDir"
+  DeleteRegKey HKCU "${REGPATH_UNINSTSUBKEY}"
+SectionEnd
diff -Nru nsis-3.05/Examples/install-shared.nsi nsis-3.06.1/Examples/install-shared.nsi
--- nsis-3.05/Examples/install-shared.nsi	1970-01-01 00:00:00.000000000 +0000
+++ nsis-3.06.1/Examples/install-shared.nsi	2020-07-31 22:40:03.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+
+This example script installs a simple application for all users on a machine.
+
+All-users installers should only write to HKLM, $ProgramFiles, $CommonFiles and the 
+"All context" versions of $LocalAppData, $Templates, $SMPrograms etc.
+
+It should not write to HKCU nor any folders in the users profile!
+If the application requires writable template data in $AppData it 
+must copy the required files from a shared location the 
+first time a user launches the application.
+
+*/
+
+!define NAME "All-users example"
+!define REGPATH_UNINSTSUBKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
+Name "${NAME}"
+OutFile "Install ${NAME}.exe"
+Unicode True
+RequestExecutionLevel Admin ; Request admin rights on WinVista+ (when UAC is turned on)
+InstallDir "$ProgramFiles\$(^Name)"
+InstallDirRegKey HKLM "${REGPATH_UNINSTSUBKEY}" "UninstallString"
+
+!include LogicLib.nsh
+!include Integration.nsh
+
+Page Directory
+Page InstFiles
+
+Uninstpage UninstConfirm
+Uninstpage InstFiles
+
+!macro EnsureAdminRights
+  UserInfo::GetAccountType
+  Pop $0
+  ${If} $0 != "admin" ; Require admin rights on WinNT4+
+    MessageBox MB_IconStop "Administrator rights required!"
+    SetErrorLevel 740 ; ERROR_ELEVATION_REQUIRED
+    Quit
+  ${EndIf}
+!macroend
+
+Function .onInit
+  SetShellVarContext All
+  !insertmacro EnsureAdminRights
+FunctionEnd
+
+Function un.onInit
+  SetShellVarContext All
+  !insertmacro EnsureAdminRights
+FunctionEnd
+
+
+Section "Program files (Required)"
+  SectionIn Ro
+
+  SetOutPath $InstDir
+  WriteUninstaller "$InstDir\Uninst.exe"
+  WriteRegStr HKLM "${REGPATH_UNINSTSUBKEY}" "DisplayName" "${NAME}"
+  WriteRegStr HKLM "${REGPATH_UNINSTSUBKEY}" "DisplayIcon" "$InstDir\MyApp.exe,0"
+  WriteRegStr HKLM "${REGPATH_UNINSTSUBKEY}" "UninstallString" '"$InstDir\Uninst.exe"'
+  WriteRegDWORD HKLM "${REGPATH_UNINSTSUBKEY}" "NoModify" 1
+  WriteRegDWORD HKLM "${REGPATH_UNINSTSUBKEY}" "NoRepair" 1
+
+  File "/oname=$InstDir\MyApp.exe" "${NSISDIR}\Bin\MakeLangId.exe" ; Pretend that we have a real application to install
+SectionEnd
+
+Section "Start Menu shortcut"
+  CreateShortcut /NoWorkingDir "$SMPrograms\${NAME}.lnk" "$InstDir\MyApp.exe"
+SectionEnd
+
+
+Section -Uninstall
+  ${UnpinShortcut} "$SMPrograms\${NAME}.lnk"
+  Delete "$SMPrograms\${NAME}.lnk"
+
+  Delete "$InstDir\MyApp.exe"
+  Delete "$InstDir\Uninst.exe"
+  RMDir "$InstDir"
+  DeleteRegKey HKLM "${REGPATH_UNINSTSUBKEY}"
+SectionEnd
diff -Nru nsis-3.05/Examples/makensis.nsi nsis-3.06.1/Examples/makensis.nsi
--- nsis-3.05/Examples/makensis.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Examples/makensis.nsi	2020-07-31 20:07:43.000000000 +0000
@@ -49,12 +49,7 @@
 !include "Memento.nsh"
 !include "WordFunc.nsh"
 !include "Util.nsh"
-
-;--------------------------------
-;Definitions
-
-!define SHCNE_ASSOCCHANGED 0x8000000
-!define SHCNF_IDLIST 0
+!include "Integration.nsh"
 
 ;--------------------------------
 ;Configuration
@@ -213,6 +208,7 @@
   File ..\Include\MultiUser.nsh
   File ..\Include\VB6RunTime.nsh
   File ..\Include\Util.nsh
+  File ..\Include\Integration.nsh
   File ..\Include\WinCore.nsh
 
   SetOutPath $INSTDIR\Include\Win
@@ -296,7 +292,7 @@
     WriteRegStr HKCR "NSIS.Header\shell\open\command" "" 'notepad.exe "%1"'
   ${EndIf}
 
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p0, p0)'
+  ${NotifyShell_AssocChanged}
 
 ${MementoSectionEnd}
 
@@ -311,7 +307,8 @@
   File ..\Examples\makensis.nsi
   File ..\Examples\example1.nsi
   File ..\Examples\example2.nsi
-  File ..\Examples\viewhtml.nsi
+  File ..\Examples\install-per-user.nsi
+  File ..\Examples\install-shared.nsi
   File ..\Examples\waplugin.nsi
   File ..\Examples\bigtest.nsi
   File ..\Examples\primes.nsi
@@ -321,7 +318,6 @@
   File ..\Examples\languages.nsi
   File ..\Examples\Library.nsi
   File ..\Examples\VersionInfo.nsi
-  File ..\Examples\UserVars.nsi
   File ..\Examples\LogicLib.nsi
   File ..\Examples\silent.nsi
   File ..\Examples\StrFunc.nsi
@@ -850,8 +846,8 @@
   WriteRegDWORD HKLM "${REG_UNINST_KEY}" "VersionMinor" "${VER_MINOR}" ; Required by WACK
 !endif
   WriteRegStr HKLM "${REG_UNINST_KEY}" "Publisher" "Nullsoft and Contributors" ; Required by WACK
-  WriteRegStr HKLM "${REG_UNINST_KEY}" "URLInfoAbout" "http://nsis.sourceforge.net/"
-  WriteRegStr HKLM "${REG_UNINST_KEY}" "HelpLink" "http://nsis.sourceforge.net/Support"
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "URLInfoAbout" "https://nsis.sourceforge.io/"
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "HelpLink" "https://nsis.sourceforge.io/Support"
   WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoModify" "1"
   WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoRepair" "1"
   ${MakeARPInstallDate} $1
@@ -1038,7 +1034,7 @@
   ${If} ${FileExists} $0
     Exec '"$0" mk:@MSITStore:$INSTDIR\NSIS.chm::/SectionF.1.html'
   ${Else}
-    ExecShell "" "http://nsis.sourceforge.net/Docs/AppendixF.html#F.1"
+    ExecShell "" "https://nsis.sourceforge.io/Docs/AppendixF.html#F.1"
   ${EndIf}
 FunctionEnd
 
@@ -1071,7 +1067,7 @@
   !insertmacro AssocDeleteFileExtAndProgId HKLM ".nsi" "NSIS.Script"
   !insertmacro AssocDeleteFileExtAndProgId HKLM ".nsh" "NSIS.Header"
 
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p0, p0)'
+  ${NotifyShell_AssocChanged}
 
   DeleteRegKey HKLM "${REG_UNINST_KEY}"
   DeleteRegKey HKLM "Software\NSIS"
diff -Nru nsis-3.05/Examples/NSISMenu.nsi nsis-3.06.1/Examples/NSISMenu.nsi
--- nsis-3.05/Examples/NSISMenu.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Examples/NSISMenu.nsi	2020-07-31 20:07:43.000000000 +0000
@@ -13,13 +13,31 @@
 CompletedText " "
 LangString ^ClickInstall 0 " "
 Caption "$(^Name)"
-!ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_BUILD
+
+!macro UNPACKVERFIELD out in shr mask fmt
+!define /redef /math ${out} ${in} >>> ${shr}
+!define /redef /math ${out} ${${out}} & ${mask}
+!define /redef /intfmt ${out} "${fmt}" ${${out}}
+!macroend
+
+!ifndef VER_MAJOR & VER_MINOR
+!ifdef NSIS_PACKEDVERSION
+!insertmacro UNPACKVERFIELD VER_MAJOR ${NSIS_PACKEDVERSION} 24 0x0ff "%X"
+!insertmacro UNPACKVERFIELD VER_MINOR ${NSIS_PACKEDVERSION} 12 0xfff "%X"
+!insertmacro UNPACKVERFIELD VER_REVISION ${NSIS_PACKEDVERSION} 4 255 "%X"
+!insertmacro UNPACKVERFIELD VER_BUILD ${NSIS_PACKEDVERSION} 00 0x00f "%X"
+!endif
+!endif
+!ifdef VER_MAJOR & VER_MINOR
+!define /ifndef VER_REVISION 0
+!define /ifndef VER_BUILD 0
 !searchreplace VERSTR "${NSIS_VERSION}" "v" ""
 VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}
 VIAddVersionKey "ProductName" "NSIS"
 VIAddVersionKey "ProductVersion" "${VERSTR}"
 VIAddVersionKey "FileVersion" "${VERSTR}"
 VIAddVersionKey "FileDescription" "NSIS Menu"
+VIAddVersionKey "LegalCopyright" "http://nsis.sf.net/License"
 !endif
 
 !include nsDialogs.nsh
@@ -222,7 +240,7 @@
 Pop $0
 ${SetCtlColors} $0 ${CT_FOOTER} transparent transparent
 SendMessage $0 ${WM_SETFONT} ${HF_HEADER} 1
-nsDialogs::SetUserData $0 "http://nsis.sourceforge.net"
+nsDialogs::SetUserData $0 "https://nsis.sourceforge.io"
 ${NSD_OnClick} $0 OnLinkClick
 
 nsDialogs::Show
diff -Nru nsis-3.05/Examples/SConscript nsis-3.06.1/Examples/SConscript
--- nsis-3.05/Examples/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Examples/SConscript	2020-03-29 19:10:02.000000000 +0000
@@ -6,6 +6,8 @@
 	FileFunc.nsi
 	FileFuncTest.nsi
 	gfx.nsi
+	install-per-user.nsi
+	install-shared.nsi
 	languages.nsi
 	Library.nsi
 	LogicLib.nsi
@@ -21,9 +23,7 @@
 	TextFunc.nsi
 	TextFuncTest.nsi
 	unicode.nsi
-	UserVars.nsi
 	VersionInfo.nsi
-	viewhtml.nsi
 	waplugin.nsi
 	WordFunc.ini
 	WordFunc.nsi
diff -Nru nsis-3.05/Examples/unicode.nsi nsis-3.06.1/Examples/unicode.nsi
--- nsis-3.05/Examples/unicode.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Examples/unicode.nsi	2020-03-26 00:19:55.000000000 +0000
@@ -1,14 +1,14 @@
-; unicode is not enabled by default
-; unicode installers will not be able to run on Windows 9x!
+; Unicode is not enabled by default
+; Unicode installers will not be able to run on Windows 9x!
 Unicode true
 
 Name "Unicode Games"
 OutFile "unicode.exe"
-
+RequestExecutionLevel User
 ShowInstDetails show
-
 XPStyle on
 
+
 Section "Unicode in UI"
 
 	DetailPrint "Hello World!"
@@ -23,8 +23,26 @@
 
 SectionEnd
 
+
 Section "Unicode in Files"
 
-	# TODO add file I/O unicode function examples
+	Var /Global Message
+
+	InitPluginsDir
+	FileOpen $0 "$PluginsDir\Test.txt" w
+	IfErrors done
+	FileWriteUTF16LE /BOM $0 "Hello World "
+	FileWriteWord $0 0xD83C # Manually write ${U+1F30D}
+	FileWriteWord $0 0xDF0D # as surrogate-pair
+	FileWriteUTF16LE $0 " and Sun ${U+2600}$\r$\n"
+	FileClose $0
+
+	FileOpen $0 "$PluginsDir\Test.txt" r
+	IfErrors done
+	FileReadUTF16LE $0 $Message
+	FileClose $0
+
+	DetailPrint "Message: $Message"
+	done:
 
 SectionEnd
diff -Nru nsis-3.05/Examples/UserVars.nsi nsis-3.06.1/Examples/UserVars.nsi
--- nsis-3.05/Examples/UserVars.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Examples/UserVars.nsi	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-; UserVars.nsi
-;
-; This script shows you how to declare and user variables.
-
-;--------------------------------
-
-  Name "User Variables Text"
-  OutFile "UserVars.exe"
-  
-  InstallDir "$PROGRAMFILES\User Variables Test"
-  
-  RequestExecutionLevel admin
-  
-;--------------------------------
-
-  ;Pages
-  Page directory
-  Page instfiles
-  
-  UninstPage uninstConfirm
-  UninstPage instfiles
-
-;--------------------------------
-; Declaration of user variables (Var command), allowed charaters for variables names : [a-z][A-Z][0-9] and '_'
-
-  Var "Name"
-  Var "Serial"
-  Var "Info"
-
-;--------------------------------
-; Installer
-
-Section "Dummy Section" SecDummy
-
-     StrCpy $0 "Admin"
-     StrCpy "$Name" $0
-     StrCpy "$Serial" "12345"
-     MessageBox MB_OK "User Name: $Name $\n$\nSerial Number: $Serial"
-
-     CreateDirectory $INSTDIR
-     WriteUninstaller "$INSTDIR\Uninst.exe"
-     
-SectionEnd
-
-Section "Another Section"
-
-     Var /GLOBAL "AnotherVar"
-
-     StrCpy $AnotherVar "test"
-
-SectionEnd
-
-;--------------------------------
-; Uninstaller
-
-Section "Uninstall"
-
-     StrCpy $Info "User variables test uninstalled successfully."
-     Delete "$INSTDIR\Uninst.exe"
-     RmDir $INSTDIR
-
-SectionEnd
-
-Function un.OnUninstSuccess
-
-     HideWindow
-     MessageBox MB_OK "$Info"
-     
-FunctionEnd
diff -Nru nsis-3.05/Examples/viewhtml.nsi nsis-3.06.1/Examples/viewhtml.nsi
--- nsis-3.05/Examples/viewhtml.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Examples/viewhtml.nsi	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-; viewhtml.nsi
-;
-; This script creates a silent installer which extracts one (or more) HTML
-; files to a temporary directory, opens Internet Explorer to view the file(s),
-; and when Internet Explorer has quit, deletes the file(s).
-
-;--------------------------------
-
-; The name of the installer (not really used in a silent install)
-Name "ViewHTML"
-
-; Set to silent mode
-SilentInstall silent
-
-; The file to write
-OutFile "viewhtml.exe"
-
-; Request application privileges for Windows Vista
-RequestExecutionLevel user
-
-;--------------------------------
-
-; The stuff to install
-Section ""
-
-  ; Get a temporary filename (in the Windows Temp directory)
-  GetTempFileName $R0
-  
-  ; Extract file
-  ; Lets skip this one, it's not built to be showin in IE
-  ; File /oname=$R0 "..\Menu\compiler.html"
-  ; and write our own! :)
-  FileOpen $0 $R0 "w"
-  FileWrite $0 "<HTML><BODY><H1>HTML page for viewhtml.nsi</H1></BODY></HTML>"
-  FileClose $0
-  
-  ; View file
-  ExecWait '"$PROGRAMFILES\Internet Explorer\iexplore.exe" "$R0"'
-
-  ; Note: another way of doing this would be to use ExecShell, but then you
-  ; really couldn't get away with deleting the files. Here is the ExecShell
-  ; line that you would want to use:
-  ;
-  ; ExecShell "open" '"$R0"'
-  ;
-  ; The advantage of this way is that it would use the default browser to
-  ; open the HTML.
-  ;
-  
-  ; Delete the files (on reboot if file is in use)
-  Delete /REBOOTOK $R0
-
-SectionEnd
\ No newline at end of file
diff -Nru nsis-3.05/Include/Integration.nsh nsis-3.06.1/Include/Integration.nsh
--- nsis-3.05/Include/Integration.nsh	1970-01-01 00:00:00.000000000 +0000
+++ nsis-3.06.1/Include/Integration.nsh	2020-07-31 22:53:37.000000000 +0000
@@ -0,0 +1,44 @@
+!verbose push 3
+!ifndef INTEGRATION_INCLUDED
+!define INTEGRATION_INCLUDED 1
+
+!include "Util.nsh"
+
+
+!define NotifyShell_AssocChanged `System::Call 'SHELL32::SHChangeNotify(i0x8000000,i0,p0,p0)'` ; Notify the shell with SHCNE_ASSOCCHANGED
+
+
+!define UnpinShortcut "!insertmacro UnpinShortcut "
+!macro UnpinShortcut lnkpath
+Push "${lnkpath}"
+${CallArtificialFunction} UnpinShortcut_Implementation
+!macroend
+!macro UnpinShortcut_Implementation
+!include "LogicLib.nsh"
+!include "Win\COM.nsh"
+Exch $0
+Push $1
+!insertmacro ComHlpr_CreateInProcInstance ${CLSID_StartMenuPin} ${IID_IStartMenuPinnedList} r1 ""
+${If} $1 P<> 0
+    System::Call 'SHELL32::SHCreateItemFromParsingName(wr0,p0,g"${IID_IShellItem}",*p0r0)'
+    ${If} $0 P<> 0
+        ${IStartMenuPinnedList::RemoveFromList} $1 '(r0)'
+        ${IUnknown::Release} $0 ""
+    ${EndIf}
+    ${IUnknown::Release} $1 ""
+!ifdef NSIS_IX86 | NSIS_AMD64
+${Else}
+  !insertmacro ComHlpr_CreateInProcInstance ${CLSID_StartMenuPin} "{ec35e37a-6579-4f3c-93cd-6e62c4ef7636}" r1 ""
+  ${If} $1 P<> 0
+    ExecShellWait /INVOKEIDLIST "unpin" $0 ; WinXP
+    ${IUnknown::Release} $1 ""
+  ${EndIf}
+!endif
+${EndIf}
+Pop $1
+Pop $0
+!macroend
+
+
+!endif #!INCLUDED
+!verbose pop
diff -Nru nsis-3.05/Include/LangFile.nsh nsis-3.06.1/Include/LangFile.nsh
--- nsis-3.05/Include/LangFile.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/LangFile.nsh	2020-01-01 21:13:57.000000000 +0000
@@ -5,7 +5,7 @@
 Header file to create language files that can be
 included with a single command.
 
-Copyright 2008-2019 Joost Verburg, Anders Kjersem
+Copyright 2008-2020 Joost Verburg, Anders Kjersem
 
 * Either LANGFILE_INCLUDE or LANGFILE_INCLUDE_WITHDEFAULT
   can be called from the script to include a language file.
diff -Nru nsis-3.05/Include/LogicLib.nsh nsis-3.06.1/Include/LogicLib.nsh
--- nsis-3.05/Include/LogicLib.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/LogicLib.nsh	2020-04-06 18:04:10.000000000 +0000
@@ -57,7 +57,8 @@
 ;       size_t integer tests
 ;         a Z= b; a Z<> b; a Z< b; a Z>= b; a Z> b; a Z<= b
 ;       Built-in NSIS flag tests:
-;         ${Abort}; ${Errors}; ${RebootFlag}; ${Silent}
+;         ${Abort}; ${Errors}; ${RebootFlag}; ${Silent}; ${RtlLanguage};
+;         ${ShellVarContextAll}
 ;       Built-in NSIS other tests:
 ;         ${FileExists} a
 ;       Any conditional NSIS instruction test:
@@ -67,6 +68,8 @@
 ;         ${SectionIsSectionGroupEnd} a; ${SectionIsBold} a;
 ;         ${SectionIsReadOnly} a; ${SectionIsExpanded} a;
 ;         ${SectionIsPartiallySelected} a
+;       Additional tests:
+;         HK RegKeyIsEmpty SubKey
 ;
 ; Examples:
 ;   See LogicLib.nsi in the Examples folder for lots of example usage.
@@ -335,6 +338,37 @@
   !macroend
   !define Silent `"" Silent ""`
 
+  !macro _ShellVarContextAll _a _b _t _f
+    IfShellVarContextAll `${_t}` `${_f}`
+  !macroend
+  !define ShellVarContextAll `"" ShellVarContextAll ""`
+
+  !macro _RtlLanguage _a _b _t _f
+    IfRtlLanguage `${_t}` `${_f}`
+  !macroend
+  !define RtlLanguage `"" RtlLanguage ""`
+
+  !macro _AltRegView _a _b _t _f
+    IfAltRegView `${_t}` `${_f}`
+  !macroend
+  !define AltRegView `"" AltRegView ""`
+
+  !macro _RegKeyIsEmpty _a _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    ClearErrors
+    EnumRegValue $_LOGICLIB_TEMP ${_a} `${_b}` ""
+    !if `${_f}` != ``
+    IfErrors "" `${_f}` ; Skip calls to EnumRegKey and _== if possible
+    !else
+    IfErrors +3
+    StrCpy $_LOGICLIB_TEMP "1" ; The default value is also named "", make sure we don't mistake it as empty
+    Goto +2
+    !endif
+    EnumRegKey $_LOGICLIB_TEMP ${_a} `${_b}` ""
+    !insertmacro _== $_LOGICLIB_TEMP "" `${_t}` `${_f}`
+  !macroend
+  !define RegKeyIsEmpty `RegKeyIsEmpty`
+
   ; "Any instruction" test
   !macro _Cmd _a _b _t _f
     !define _t=${_t}
diff -Nru nsis-3.05/Include/SConscript nsis-3.06.1/Include/SConscript
--- nsis-3.05/Include/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/SConscript	2020-05-21 00:44:39.000000000 +0000
@@ -1,6 +1,7 @@
 includes = Split("""
 	Colors.nsh
 	FileFunc.nsh
+	Integration.nsh
 	LangFile.nsh
 	Library.nsh
 	LogicLib.nsh
diff -Nru nsis-3.05/Include/Sections.nsh nsis-3.06.1/Include/Sections.nsh
--- nsis-3.05/Include/Sections.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/Sections.nsh	2020-07-31 20:07:43.000000000 +0000
@@ -148,7 +148,7 @@
 ;
 ; Written by Robert Kehl
 ;
-; For details, see http://nsis.sourceforge.net/wiki/SetSectionInInstType%2C_ClearSectionInInstType
+; For details, see https://nsis.sourceforge.io/wiki/SetSectionInInstType%2C_ClearSectionInInstType
 ;
 ; Use the defines below for the WANTED_INSTTYPE parameter.
 
diff -Nru nsis-3.05/Include/VB6RunTime.nsh nsis-3.06.1/Include/VB6RunTime.nsh
--- nsis-3.05/Include/VB6RunTime.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/VB6RunTime.nsh	2020-07-31 20:07:43.000000000 +0000
@@ -4,10 +4,10 @@
 
 Setup of Visual Basic 6.0 run-time files, including the Oleaut32.dll security update
 
-Copyright 2008-2019 Joost Verburg
+Copyright 2008-2020 Joost Verburg
 
 To obtain the run-time files, download and extract
-http://nsis.sourceforge.net/vb6runtime.zip
+https://nsis.sourceforge.io/vb6runtime.zip
 
 Script code for installation:
 
diff -Nru nsis-3.05/Include/WinCore.nsh nsis-3.06.1/Include/WinCore.nsh
--- nsis-3.05/Include/WinCore.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/WinCore.nsh	2020-03-12 23:43:51.000000000 +0000
@@ -227,5 +227,37 @@
 
 
 
+
+
+/**************************************************
+ShlGuid.h
+**************************************************/
+!ifndef __WIN_NOINC_SHLGUID
+!define FOLDERID_Public {DFDF76A2-C82A-4D63-906A-5644AC457385} ; Vista+ Fixed=%SystemDrive%\Users\Public
+!define FOLDERID_Games {CAC52C1A-B53D-4edc-92D7-6B2E8AC19434} ; Vista+ && < 10 (1803) Virtual
+!define FOLDERID_SavedGames {4C5C32FF-BB9D-43b0-B5B4-2D72E54EAAA4} ; Vista+ PerUser=%USERPROFILE%\Saved Games
+!define FOLDERID_GameTasks {054FAE61-4DD8-4787-80B6-090220C4B700} ; Vista+ PerUser=%LOCALAPPDATA%\Microsoft\Windows\GameExplorer
+!define FOLDERID_PublicGameTasks {DEBF2536-E1A8-4c59-B6A2-414586476AEA} ; Vista+ Common=%ALLUSERSPROFILE%\Microsoft\Windows\GameExplorer
+!define FOLDERID_Contacts {56784854-C6CB-462b-8169-88E350ACB882} ; Vista+ PerUser=%USERPROFILE%\Contacts
+!define FOLDERID_Downloads {374DE290-123F-4565-9164-39C4925E467B} ; Vista+ PerUser=%USERPROFILE%\Downloads
+!define FOLDERID_PublicDownloads {3D644C9B-1FB8-4f30-9B45-F670235F79C0} ; Vista+ Common=%PUBLIC%\Downloads
+!define FOLDERID_UserProfiles {0762D272-C50A-4BB0-A382-697DCD729B80} ; Vista+ Fixed=%SystemDrive%\Users
+!define FOLDERID_UserProgramFiles {5CD7AEE2-2219-4A67-B85D-6C9CE15660CB} ; 7+ PerUser=%LOCALAPPDATA%\Programs
+!define FOLDERID_UserProgramFilesCommon {BCBD3057-CA5C-4622-B42D-BC56DB0AE516} ; 7+ PerUser=%LOCALAPPDATA%\Programs\Common
+!define FOLDERID_PublicLibraries {48DAF80B-E6CF-4F4E-B800-0E69D84EE384} ; 7+ Common=%ALLUSERSPROFILE%\Microsoft\Windows\Libraries
+!define FOLDERID_UserPinned {9E3995AB-1F9C-4F13-B827-48B24B6C7174} ; 7+ PerUser=%APPDATA%\Microsoft\Internet Explorer\Quick Launch\User Pinned
+!define FOLDERID_ImplicitAppShortcuts {BCB5256F-79F6-4CEE-B725-DC34E402FD46} ; 7+ PerUser=%APPDATA%\Microsoft\Internet Explorer\Quick Launch\User Pinned\ImplicitAppShortcuts
+!define FOLDERID_DeviceMetadataStore {5CE4A5E9-E4EB-479D-B89F-130C02886155} ; 7+ Common=%ALLUSERSPROFILE%\Microsoft\Windows\DeviceMetadataStore
+!define FOLDERID_ApplicationShortcuts {A3918781-E5F2-4890-B3D9-A7E54332328C} ; 8.0+ PerUser=%LOCALAPPDATA%\Microsoft\Windows\Application Shortcuts
+!define FOLDERID_RoamingTiles {00BCFC5A-ED94-4e48-96A1-3F6217F21990} ; 8.0+ PerUser=%LOCALAPPDATA%\Microsoft\Windows\RoamingTiles
+!define FOLDERID_RoamedTileImages {AAA8D5A5-F1D6-4259-BAA8-78E7EF60835E} ; 8.0+ PerUser=%LOCALAPPDATA%\Microsoft\Windows\RoamedTileImages
+!define FOLDERID_PublicUserTiles {0482af6c-08f1-4c34-8c90-e17ec98b1e17} ; 8.0+ Common=%PUBLIC%\AccountPictures
+!define FOLDERID_AccountPictures {008ca0b1-55b4-4c56-b8a8-4de4b299d3be} ; 8.0+ PerUser=%APPDATA%\Microsoft\Windows\AccountPictures
+!define FOLDERID_Screenshots {b7bede81-df94-4682-a7d8-57a52620b86f} ; 8.0+ PerUser=%USERPROFILE%\Pictures\Screenshots
+!define FOLDERID_SkyDrive {A52BBA46-E9E1-435f-B3D9-28DAA648C0F6} ; 8.1+ PerUser=%USERPROFILE%\OneDrive
+!define FOLDERID_AppDataProgramData {559D40A3-A036-40FA-AF61-84CB430A4D34} ; 10 (1709)+ PerUser=%LOCALAPPDATA%\ProgramData
+!endif /* __WIN_NOINC_SHLGUID */
+
+
 !verbose pop
 !endif /* __WIN_WINDOWS__INC */
\ No newline at end of file
diff -Nru nsis-3.05/Include/WinMessages.nsh nsis-3.06.1/Include/WinMessages.nsh
--- nsis-3.05/Include/WinMessages.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/WinMessages.nsh	2020-04-23 18:31:23.000000000 +0000
@@ -54,8 +54,6 @@
 CBEM    Extended combo box control
 CDM     Common dialog box
 DL      Drag list box
-DTM     Date and time picker control
-MCM     Month calendar control
 PGM     Pager control
 PSM     Property sheet
 RB      Rebar control
@@ -831,5 +829,62 @@
 !define /math NCM_GETALLOWTYPE ${WM_USER} + 3
 !define /math NCM_DISPLAYERRORTIP ${WM_USER} + 4
 
+#Month calendar control#
+!define MCM_FIRST 0x1000
+!define /math MCM_GETCURSEL       ${MCM_FIRST} + 1
+!define /math MCM_SETCURSEL       ${MCM_FIRST} + 2
+!define /math MCM_GETMAXSELCOUNT  ${MCM_FIRST} + 3
+!define /math MCM_SETMAXSELCOUNT  ${MCM_FIRST} + 4
+!define /math MCM_GETSELRANGE     ${MCM_FIRST} + 5
+!define /math MCM_SETSELRANGE     ${MCM_FIRST} + 6
+!define /math MCM_GETMONTHRANGE   ${MCM_FIRST} + 7
+!define /math MCM_SETDAYSTATE     ${MCM_FIRST} + 8
+!define /math MCM_GETMINREQRECT   ${MCM_FIRST} + 9
+!define /math MCM_SETCOLOR            ${MCM_FIRST} + 10
+!define /math MCM_GETCOLOR            ${MCM_FIRST} + 11
+!define /math MCM_SETTODAY    ${MCM_FIRST} + 12
+!define /math MCM_GETTODAY    ${MCM_FIRST} + 13
+!define /math MCM_HITTEST          ${MCM_FIRST} + 14
+!define /math MCM_SETFIRSTDAYOFWEEK ${MCM_FIRST} + 15
+!define /math MCM_GETFIRSTDAYOFWEEK ${MCM_FIRST} + 16
+!define /math MCM_GETRANGE ${MCM_FIRST} + 17
+!define /math MCM_SETRANGE ${MCM_FIRST} + 18
+!define /math MCM_GETMONTHDELTA ${MCM_FIRST} + 19
+!define /math MCM_SETMONTHDELTA ${MCM_FIRST} + 20
+!define /math MCM_GETMAXTODAYWIDTH ${MCM_FIRST} + 21
+!define MCM_SETUNICODEFORMAT ${CCM_SETUNICODEFORMAT} ; IE4+
+!define MCM_GETUNICODEFORMAT ${CCM_SETUNICODEFORMAT} ; IE4+
+!define /math MCM_GETCURRENTVIEW ${MCM_FIRST} + 22 ; Vista+
+!define /math MCM_GETCALENDARCOUNT ${MCM_FIRST} + 23
+!define /math MCM_GETCALENDARGRIDINFO ${MCM_FIRST} + 24
+!define /math MCM_GETCALID ${MCM_FIRST} + 27
+!define /math MCM_SETCALID ${MCM_FIRST} + 28
+!define /math MCM_SIZERECTTOMIN ${MCM_FIRST} + 29
+!define /math MCM_SETCALENDARBORDER ${MCM_FIRST} + 30
+!define /math MCM_GETCALENDARBORDER ${MCM_FIRST} + 31
+!define /math MCM_SETCURRENTVIEW ${MCM_FIRST} + 32
+!define MCN_SELCHANGE   -749
+!define MCN_GETDAYSTATE -747
+!define MCN_SELECT      -746
+!define MCN_VIEWCHANGE  -750 ; Vista+?
+
+#DateTime control#
+!define DTM_FIRST 0x1000
+!define /math DTM_GETSYSTEMTIME ${DTM_FIRST} + 1
+!define /math DTM_SETSYSTEMTIME ${DTM_FIRST} + 2
+!define /math DTM_SETFORMATA ${DTM_FIRST} + 5
+!define /math DTM_SETFORMATW ${DTM_FIRST} + 50
+${_NSIS_DEFAW} DTM_SETFORMAT
+!define /math DTM_GETMONTHCAL ${DTM_FIRST} + 8
+!define /math DTM_SETMCFONT ${DTM_FIRST} + 9 ; IE4+?
+!define /math DTM_GETMCFONT ${DTM_FIRST} + 10 ; IE4+?
+!define /math DTM_SETMCSTYLE ${DTM_FIRST} + 11 ; Vista+?
+!define /math DTM_GETMCSTYLE ${DTM_FIRST} + 12 ; Vista+?
+!define /math DTM_CLOSEMONTHCAL ${DTM_FIRST} + 13 ; Vista+?
+!define DTN_DATETIMECHANGE -759
+!define /IfNDef GDT_ERROR -1
+!define /IfNDef GDT_VALID 0
+!define /IfNDef GDT_NONE 1
+
 !verbose pop
-!endif
\ No newline at end of file
+!endif
diff -Nru nsis-3.05/Include/WinVer.nsh nsis-3.06.1/Include/WinVer.nsh
--- nsis-3.05/Include/WinVer.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/WinVer.nsh	2020-05-17 21:21:15.000000000 +0000
@@ -532,16 +532,16 @@
 !macroend
 
 !macro _WinVer_WaaS op id _t _f
-  !insertmacro WinVer_WaaS "${id}" 10240 1507 "Threshold"   "RTM"
-  !insertmacro WinVer_WaaS "${id}" 10586 1511 "Threshold 2" "November Update"
-  !insertmacro WinVer_WaaS "${id}" 14393 1607 "Redstone"    "Anniversary Update"
-  !insertmacro WinVer_WaaS "${id}" 15063 1703 "Redstone 2"  "Creators Update"
-  !insertmacro WinVer_WaaS "${id}" 16299 1709 "Redstone 3"  "Fall Creators Update"
-  !insertmacro WinVer_WaaS "${id}" 17134 1803 "Redstone 4"  "April 2018 Update"
-  !insertmacro WinVer_WaaS "${id}" 17763 1809 "Redstone 5"  "October 2018 Update"
-  !insertmacro WinVer_WaaS "${id}" 18362 1903 "19H1"        "May 2019 Update"
-  !insertmacro WinVer_WaaS "${id}" 18363 1909 "19H2"        "November 2019 Update"
-  ;insertmacro WinVer_WaaS "${id}" ????? 20?? "20H1"        "????"
+  !insertmacro WinVer_WaaS "${id}" 10240 1507 "Threshold"   "RTM" ; 10240.16384
+  !insertmacro WinVer_WaaS "${id}" 10586 1511 "Threshold 2" "November Update" ; 10586.0?
+  !insertmacro WinVer_WaaS "${id}" 14393 1607 "Redstone"    "Anniversary Update" ; 14393.10
+  !insertmacro WinVer_WaaS "${id}" 15063 1703 "Redstone 2"  "Creators Update" ; 15063.13
+  !insertmacro WinVer_WaaS "${id}" 16299 1709 "Redstone 3"  "Fall Creators Update" ; 16299.19
+  !insertmacro WinVer_WaaS "${id}" 17134 1803 "Redstone 4"  "April 2018 Update" ; 17134.1
+  !insertmacro WinVer_WaaS "${id}" 17763 1809 "Redstone 5"  "October 2018 Update" ; 17763.1
+  !insertmacro WinVer_WaaS "${id}" 18362 1903 "19H1"        "May 2019 Update" ; 18362.116
+  !insertmacro WinVer_WaaS "${id}" 18363 1909 "19H2"        "November 2019 Update" ; 18363.418
+  !insertmacro WinVer_WaaS "${id}" 19041 2004 "20H1"        "May 2020 Update" ; 19041.264?
   !ifmacrodef WinVerExternal_WaaS_MapToBuild
     !insertmacro WinVerExternal_WaaS_MapToBuild ${op} "${id}" WinVer_WaaS_Build
   !endif
diff -Nru nsis-3.05/Include/x64.nsh nsis-3.06.1/Include/x64.nsh
--- nsis-3.05/Include/x64.nsh	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Include/x64.nsh	2020-04-06 18:04:10.000000000 +0000
@@ -23,6 +23,15 @@
 ;     Abort "Unsupported CPU architecture!"
 ;   ${EndIf}
 ;
+;   ${If} ${IsNativeAMD64}
+;       File "amd64\myapp.exe"
+;   ${ElseIf} ${IsNativeIA32}
+;   ${OrIf} ${IsWow64}
+;       File "x86\myapp.exe"
+;   ${Else}
+;       Abort "Unsupported CPU architecture!"
+;   ${EndIf}
+;
 ; DisableX64FSRedirection disables file system redirection.
 ; EnableX64FSRedirection enables file system redirection.
 ;
Binary files /tmp/tmp4fFHT6/3qtKD2nE5m/nsis-3.05/Menu/images/header.gif and /tmp/tmp4fFHT6/1_clpwvWOn/nsis-3.06.1/Menu/images/header.gif differ
diff -Nru nsis-3.05/Menu/index.html nsis-3.06.1/Menu/index.html
--- nsis-3.05/Menu/index.html	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Menu/index.html	2020-07-31 20:07:43.000000000 +0000
@@ -18,7 +18,7 @@
 				<p>
 					<font size="+1" color="#333333"><b>Developer Center</b></font><br>
 					Many more examples, tutorials, plug-ins and NSIS-related software are available
-					at the on-line <a href="WEB:http://nsis.sourceforge.net/Developer_Center">Developer Center</a>.
+					at the on-line <a href="WEB:https://nsis.sourceforge.io/Developer_Center">Developer Center</a>.
 				</p>
 				</td>
 			<td width="150" valign="top">
@@ -32,7 +32,7 @@
 				<p>
 					<font size="+1" color="#333333"><b>On-line help</b></font><br>
 					<a href="WEB:http://forums.winamp.com/forumdisplay.php?s=&forumid=65">Forum</a><br>
-					<a href="WEB:http://nsis.sourceforge.net/FAQ">FAQ</a><br>
+					<a href="WEB:https://nsis.sourceforge.io/FAQ">FAQ</a><br>
 					<!-- a href="WEB:irc://irc.landoleet.org/nsis">IRC Channel</a><br -->
 					<a href="WEB:http://sourceforge.net/tracker/?group_id=22049&atid=373085">Bug Tracker</a><br>
 			</td>
@@ -58,7 +58,7 @@
 		<img src="images/line.gif" width="598" height="3">
 	</p>
 	<div align="right">
-		<a href="WEB:http://nsis.sourceforge.net/"><img src="images/site.gif" width="200" height="25"></a>
+		<a href="WEB:https://nsis.sourceforge.io/"><img src="images/site.gif" width="200" height="25"></a>
 	</div>
 </body>
 </html>
diff -Nru nsis-3.05/README.md nsis-3.06.1/README.md
--- nsis-3.05/README.md	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/README.md	2020-07-31 20:07:43.000000000 +0000
@@ -6,6 +6,6 @@
 
 ## External Links
 
-   * [Simple tutorial](http://nsis.sourceforge.net/Simple_tutorials)
-   * [NSIS Homepage](http://nsis.sourceforge.net/)
-   * [User Manual](http://nsis.sourceforge.net/Docs/)
+   * [Simple tutorial](https://nsis.sourceforge.io/Simple_tutorials)
+   * [NSIS Homepage](https://nsis.sourceforge.io/)
+   * [User Manual](https://nsis.sourceforge.io/Docs/)
diff -Nru nsis-3.05/SCons/Config/gnu nsis-3.06.1/SCons/Config/gnu
--- nsis-3.05/SCons/Config/gnu	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/SCons/Config/gnu	2020-06-27 23:18:45.000000000 +0000
@@ -4,13 +4,13 @@
 
 ### imports
 
-Import('FlagsConfigure GetOptionOrEnv')
+Import('FlagsConfigure GetOptionOrEnv GetStdSysEnvVarList')
 
 ### HACKS!
 if GetOptionOrEnv('NSIS_SCONS_GNU_ENVPATHHACK'):
 	import os
 	defenv['ENV']['PATH'] = os.getenv('PATH') # Major hack!
-	import_env = ['SystemDrive', 'SystemRoot', 'TEMP', 'TMP', 'PATHEXT']
+	import_env = GetStdSysEnvVarList(path=True, temp=True)
 	for var in import_env: 
 		if var in os.environ:
 			defenv['ENV'][var] = os.environ.get(var, '')
@@ -103,6 +103,10 @@
 stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])        # 512 bytes align
 stub_env.Append(LINKFLAGS = ['$MAP_FLAG'])          # generate map file
 
+conf = FlagsConfigure(stub_env)
+conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns')  # GCC 10: Don't generate msvcrt!memmove calls (bug #1248)
+conf.Finish()
+
 stub_uenv = stub_env.Clone()
 stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
 
diff -Nru nsis-3.05/SCons/Tools/mstoolkit.py nsis-3.06.1/SCons/Tools/mstoolkit.py
--- nsis-3.05/SCons/Tools/mstoolkit.py	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/SCons/Tools/mstoolkit.py	2020-06-26 22:52:09.000000000 +0000
@@ -290,7 +290,7 @@
 	targ_arc = env.get('TARGET_ARCH', 'x86')
 
 	if "None" == env.get('MSVC_USE_SCRIPT', '!'):
-		for x in ['INCLUDE', 'LIB', 'PATH', 'CL', 'LINK', 'ML']: env['ENV'][x] = ""
+		for x in ['INCLUDE', 'LIB', 'PATH', 'CL', '_CL_', 'LINK', '_LINK_', 'ML']: env['ENV'][x] = ""
 		if not env.WhereIs('cl', os.environ['PATH']):
 			raise SCons.Errors.InternalError("CL not found in %s" % os.environ['PATH'])
 		include_path = os.environ['INCLUDE']
@@ -312,6 +312,7 @@
 	env.PrependENVPath('INCLUDE', include_path)
 	env.PrependENVPath('LIB', lib_path)
 	env.PrependENVPath('PATH', exe_path)
+	# 'LIBPATH' = ?
 
 	env['ENV']['CPU'] = (targ_arc.upper(), 'i386')['x86' in targ_arc.lower()] # AMD64/ARM64 or i386
 	env['ENV']['TARGETOS'] = 'BOTH'
diff -Nru nsis-3.05/SCons/utils.py nsis-3.06.1/SCons/utils.py
--- nsis-3.05/SCons/utils.py	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/SCons/utils.py	2020-06-26 22:52:09.000000000 +0000
@@ -1,3 +1,31 @@
+def IsExecutingOnWindows():
+	import sys, os
+	if sys.platform.startswith('win') or os.name == 'nt': return True
+	return False
+
+def GetWindowsStdSysEnvVarList(path=False, temp=True, user=True, os=True, shell=True, cpu=True):
+	ret = []
+	if os: ret += 'OS WINDIR SYSTEMDRIVE SYSTEMROOT ALLUSERSPROFILE Public ProgramData CommonProgramFiles CommonProgramFiles(x86) CommonProgramW6432 ProgramFiles ProgramFiles(x86) ProgramW6432'.split()
+	if cpu: ret += 'NUMBER_OF_PROCESSORS PROCESSOR_ARCHITECTURE PROCESSOR_ARCHITEW6432 PROCESSOR_IDENTIFIER PROCESSOR_LEVEL PROCESSOR_REVISION'.split()
+	if user: ret += 'COMPUTERNAME USERNAME USERPROFILE APPDATA LOCALAPPDATA HOMEDRIVE HOMESHARE HOMEPATH LOGONSERVER USERDNSDOMAIN USERDOMAIN USERDOMAIN_ROAMINGPROFILE ClientName SessionName'.split()
+	if shell: ret += 'COMSPEC PATHEXT PSModulePath'.split() # PROMPT
+	if temp: ret += 'TEMP TMP'.split()
+	if path: ret += 'PATH'.split()
+	return ret
+def GetPosixStdSysEnvVarList(path=False, temp=True, user=True, os=True, shell=True, cpu=True):
+	ret = []
+	if os: ret += 'HOSTALIASES'.split()
+	if user: ret += 'HOME USER LOGNAME DATEMSK UID'.split() # XDG_* TZ LANGUAGE LANG LC_* NLSPATH
+	if shell: ret += 'SHELL TERM TERMCAP'.split()
+	if temp: ret += 'TMPDIR'.split()
+	if path: ret += 'PATH MANPATH'.split()
+	return ret
+def GetStdSysEnvVarList(path=False, temp=True, user=True, os=True, shell=True, cpu=True):
+	func = GetPosixStdSysEnvVarList
+	if IsExecutingOnWindows(): func = GetWindowsStdSysEnvVarList
+	return func(path=path, temp=temp, user=user, os=os, shell=shell, cpu=cpu)
+
+
 def AddAvailableLibs(env, libs):
 	"""
 	Scans through a list of libraries and adds
@@ -145,10 +173,10 @@
 	return FileUnpackRead("<I", 4, f, fpos, defval)
 def WriteU16LE(f, v, fpos):
 	if not fpos is None: f.seek(fpos)
-	f.write(struct.pack("<H", v))
+	return f.write(struct.pack("<H", v))
 def WriteU32LE(f, v, fpos):
 	if not fpos is None: f.seek(fpos)
-	f.write(struct.pack("<I", v))
+	return f.write(struct.pack("<I", v))
 
 class MSPE:
 	def __init__(self, path=None, open_for_write=False):
@@ -177,16 +205,24 @@
 		self.IsPEP = 0x20b == self.NTOHMagic # IMAGE_NT_OPTIONAL_HDR64_MAGIC?
 	def ReadMachine(self):
 		return ReadU16LE(self._f, self.NTHOffset+4+0)
+	def WriteTimeDateStamp(self, value):
+		return WriteU32LE(self._f, value, self.NTHOffset+4+4)
 	def ReadCharacteristics(self):
 		return ReadU16LE(self._f, self.NTHOffset+4+18)
 	def WriteCharacteristics(self, value):
-		WriteU16LE(self._f, value, self.NTHOffset+4+18)
+		return WriteU16LE(self._f, value, self.NTHOffset+4+18)
 	def ReadDllCharacteristics(self):
 		return ReadU16LE(self._f, self.NTHOffset+4+20+70)
 	def WriteDllCharacteristics(self, value):
-		WriteU16LE(self._f, value, self.NTHOffset+4+20+70)
+		return WriteU16LE(self._f, value, self.NTHOffset+4+20+70)
 	def WriteChecksum(self, value):
-		WriteU32LE(self._f, value, self.NTHOffset+4+20+64)
+		return WriteU32LE(self._f, value, self.NTHOffset+4+20+64)
+	def InvalidateChecksum(self):
+		return self.WriteChecksum(0) and 0
+
+def IsPE(pe):
+	if not isinstance(pe, MSPE): pe = MSPE(pe)
+	if not pe.NTOHMagic is None: return True
 
 def IsPEExecutable(pe):
 	if not isinstance(pe, MSPE): pe = MSPE(pe)
@@ -211,8 +247,25 @@
 			ioh_dc |= 0x0040 # +IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE (ASLR)
 			if pe.IsPEP: ioh_dc |= 0x0020 # +IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA (HEASLR)
 		pe.WriteDllCharacteristics(ioh_dc)
-		pe.WriteChecksum(0)
+		pe.InvalidateChecksum()
 	finally:
 		return
 
-Export('AddAvailableLibs AddZLib FlagsConfigure GetAvailableLibs GetOptionOrEnv IsPEExecutable SetPESecurityFlagsWorker')
+def SetPETimestamp(filepath, timestamp):
+	pe = MSPE(filepath, open_for_write=True)
+	try:
+		if not IsPE(pe): return
+		pe.WriteTimeDateStamp(int(timestamp or 0))
+		pe.InvalidateChecksum()
+		return True
+	finally:
+		return
+
+def MakeReproducibleAction(target, source, env):
+	if env.get('SOURCE_DATE_EPOCH','') is not '':
+		SetPETimestamp(target[0].path, env['SOURCE_DATE_EPOCH'])
+
+def SilentActionEcho(target, source, env):
+	return None
+
+Export('GetStdSysEnvVarList AddAvailableLibs AddZLib FlagsConfigure GetAvailableLibs GetOptionOrEnv SilentActionEcho IsPEExecutable SetPESecurityFlagsWorker MakeReproducibleAction')
diff -Nru nsis-3.05/SConstruct nsis-3.06.1/SConstruct
--- nsis-3.05/SConstruct	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/SConstruct	2020-06-26 22:52:09.000000000 +0000
@@ -64,20 +64,20 @@
 #######  Build Environment                                         ###
 ######################################################################
 
+import os
 path = ARGUMENTS.get('PATH', '')
 toolset = ARGUMENTS.get('TOOLSET', '')
-arch = ARGUMENTS.get('TARGET_ARCH', 'x86')
 
-if toolset and path:
-	defenv = Environment(TARGET_ARCH = arch, ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
-else:
-	if path:
-		defenv = Environment(TARGET_ARCH = arch, ENV = {'PATH' : path})
-	if toolset:
-		defenv = Environment(TARGET_ARCH = arch, TOOLS = toolset.split(',') + ['zip'])
-if not toolset and not path:
-	defenv = Environment(TARGET_ARCH = arch)
+defenv = {
+	'TARGET_ARCH': ARGUMENTS.get('TARGET_ARCH', 'x86'),
+	'ENV': {}
+}
+
+if path: defenv['ENV']['PATH'] = path
+if toolset: defenv['TOOLS'] = toolset.split(',') + ['zip']
 
+if len(defenv['ENV']) == 0: del defenv['ENV']
+defenv = Environment(**defenv)
 Export('defenv')
 
 ######################################################################
@@ -85,12 +85,12 @@
 ######################################################################
 
 SConscript('SCons/utils.py')
+Import('GetOptionOrEnv')
 
 ######################################################################
 #######  Options                                                   ###
 ######################################################################
 
-import os
 default_doctype = 'html'
 if defenv.WhereIs('hhc', os.environ['PATH']):
 	default_doctype = 'chm'
@@ -195,6 +195,8 @@
 opts.Add(('PREFIX_DOC','Path to install nsis README / INSTALL / TODO files to.', dirs['doc']))
 opts.Add(('PREFIX_PLUGINAPI_INC','Path to install plugin API headers to.', None))
 opts.Add(('PREFIX_PLUGINAPI_LIB','Path to install plugin static library to.', None))
+# reproducible builds
+opts.Add(('SOURCE_DATE_EPOCH', 'UNIX timestamp (in seconds)', os.environ.get('SOURCE_DATE_EPOCH')))
 
 opts.Update(defenv)
 Help(opts.GenerateHelpText(defenv))
@@ -211,6 +213,10 @@
 	defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DATA', '"%s"' % defenv.subst('$PREFIX_DATA'))])
 	defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DOC', '"%s"' % defenv.subst('$PREFIX_DOC'))])
 
+if defenv.get('SOURCE_DATE_EPOCH','') is not '':
+	defenv['ENV']['SOURCE_DATE_EPOCH'] = defenv['SOURCE_DATE_EPOCH'] = int(defenv['SOURCE_DATE_EPOCH'], 0) # Normalize and apply to ENV for child processes
+	defenv.Append(NSIS_CPPDEFINES = [('NSIS_SOURCE_DATE_EPOCH', '%s' % defenv['SOURCE_DATE_EPOCH'])]) # Display in /HDRINFO
+
 # Need this early for the config header files to be placed in
 if defenv['UNICODE']:
 	if defenv['DEBUG']:
@@ -278,12 +284,15 @@
 	Exit(1)
 f.write('#define NSIS_PACKEDVERSION _T("%s")\n' % defenv['VER_PACKED'])
 
-if 'VER_MAJOR' in defenv and defenv.get('VERSION','') == '':
+if defenv.get('VERSION','') == '' and 'VER_MAJOR' in defenv:
 	defenv['VERSION'] = defenv['VER_MAJOR']
 	if 'VER_MINOR' in defenv:
 		defenv['VERSION'] += '.' + defenv['VER_MINOR']
 	if 'VER_REVISION' in defenv:
 		defenv['VERSION'] += '.' + defenv['VER_REVISION']
+if defenv.get('VERSION','') == '' and int(defenv['VER_PACKED'], 0) > int('0x02000000', 0):
+	defenv['VERSION'] = '%i.%i.%i' % (int(defenv['VER_PACKED'][2:][:2]), int(defenv['VER_PACKED'][4:][:3]), int(defenv['VER_PACKED'][7:][:2]))
+	print('WARNING: VERSION not set, defaulting to %s!' % defenv['VERSION'])
 f.write('#define NSIS_VERSION _T("v%s")\n' % defenv['VERSION'])
 
 f.close()
@@ -366,7 +375,7 @@
 def Distribute(files, names, component, path, subpath, alias, install_alias=None):
 	files = MakeFileList(files)
 
-	names = names or map(lambda x: x.name, files)
+	names = names or list(map(lambda x: x.name, files))
 	if isinstance(names, str):
 		names = [names]
 
@@ -438,7 +447,7 @@
 			a = defenv.Action('$CODESIGNER "%s"' % t.path)
 			defenv.AddPostAction(t, a)
 
-Import('IsPEExecutable SetPESecurityFlagsWorker')
+Import('SilentActionEcho IsPEExecutable SetPESecurityFlagsWorker MakeReproducibleAction')
 def SetPESecurityFlagsAction(target, source, env):
 	for t in target:
 		SetPESecurityFlagsWorker(t.path)
@@ -451,6 +460,10 @@
 		a = defenv.Action(SetPESecurityFlagsAction, strfunction=SetPESecurityFlagsActionEcho)
 		defenv.AddPostAction(t, a)
 
+def MakeReproducible(targets):
+	for t in targets:
+		defenv.AddPostAction(t, defenv.Action(MakeReproducibleAction, strfunction=SilentActionEcho))
+
 def TestScript(scripts):
 	defenv.Install('$TESTDISTDIR/Tests', scripts)
 
@@ -468,6 +481,7 @@
 defenv.DistributeExamples = DistributeExamples
 defenv.Sign = Sign
 defenv.SetPESecurityFlags = SetPESecurityFlags
+defenv.MakeReproducible = MakeReproducible
 defenv.TestScript = TestScript
 
 def DistributeExtras(env, target, examples, docs):
@@ -481,7 +495,6 @@
 ######################################################################
 
 if defenv['MSTOOLKIT']:
-	Import('GetOptionOrEnv')
 	if GetOptionOrEnv('MSVC_USE_SCRIPT', '!') != '!':
 		defenv['MSVC_USE_SCRIPT'] = GetOptionOrEnv('MSVC_USE_SCRIPT')
 	defenv.Tool('mstoolkit', toolpath = [Dir('SCons/Tools').rdir()])
@@ -556,6 +569,7 @@
 	nsis_menu_target = defenv.Command(os.path.join('$ZIPDISTDIR', 'NSIS.exe'),
 																		os.path.join('$ZIPDISTDIR', 'Examples', 'NSISMenu.nsi'),
 																		build_nsis_menu_for_zip)
+	defenv.MakeReproducible(nsis_menu_target)
 	defenv.Sign(nsis_menu_target)
 
 dist_zip = 'nsis-${VERSION}${DISTSUFFIX}.zip'
@@ -638,6 +652,7 @@
 	target = defenv.SConscript(dirs = 'Source/exehead', variant_dir = build_dir, duplicate = False, exports = exports)
 	env.SideEffect('%s/stub_%s.map' % (build_dir, stub), target)
 
+	env.MakeReproducible(target)
 	env.DistributeStubs(target, names=compression+suffix)
 
 	defenv.Alias(compression, target)
@@ -669,6 +684,7 @@
 
 makensis_env.SideEffect('%s/makensis.map' % build_dir, makensis)
 
+defenv.MakeReproducible(makensis)
 defenv.Alias('makensis', makensis)
 
 if defenv['PLATFORM'] == 'win32': 
@@ -706,6 +722,7 @@
 	defenv.Alias('plugins', plugin)
 
 	defenv.SetPESecurityFlags(plugin)
+	defenv.MakeReproducible(plugin)
 	defenv.Sign(plugin)
 
 	CleanMap(env, plugin, target)
@@ -800,6 +817,7 @@
 	defenv.Alias(target, util)
 	defenv.Alias('utils', util)
 
+	defenv.MakeReproducible(util)
 	defenv.Sign(util)
 
 	CleanMap(env, util, target)
diff -Nru nsis-3.05/Scripts/release.py nsis-3.06.1/Scripts/release.py
--- nsis-3.05/Scripts/release.py	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Scripts/release.py	2020-07-31 20:07:43.000000000 +0000
@@ -33,8 +33,8 @@
 SFTP="C:\Program Files\PuTTY\psftp.exe" -2 -l kichik,nsis -batch -b %s frs.sourceforge.net
 
 [wiki]
-PURGE_URL=http://nsis.sourceforge.net/%s?action=purge
-UPDATE_URL=http://nsis.sourceforge.net/Special:Simpleupdate?action=raw
+PURGE_URL=https://nsis.sourceforge.io/%s?action=purge
+UPDATE_URL=https://nsis.sourceforge.io/Special:Simpleupdate?action=raw
 
 [svn2cl]
 SVN2CL_XSL=svn2cl.xsl
@@ -62,6 +62,8 @@
 """
 
 import os
+import os.path
+import shutil
 import sys
 import time
 import Image, ImageFont, ImageDraw
@@ -71,6 +73,10 @@
 
 ### read config
 
+if not os.path.isfile('release.cfg'):
+    print 'Unable to find release.cfg. Is this the right working directory?'
+    sys.exit(1)
+
 cfg = ConfigParser()
 cfg.read('release.cfg')
 
@@ -161,6 +167,12 @@
 
 def StartLog():
 	open('release-%s.log' % VERSION, 'w').write('releasing version %s at %s\n\n' % (VERSION, time.ctime()))
+	
+def DeleteOldFolders():
+    for d in ['strlen_8192', 'log', 'insttest', 'insttestscons']:
+        if os.path.isdir(d):
+            log('Deleting %s' % d)
+            shutil.rmtree(d)
 
 def RunTests():
 	print 'running tests...'
@@ -445,6 +457,7 @@
 def ToDo():
 	print 'automatic phase done\n'
 	print """
+ * Make new release files the default download
  * Edit update.php
  * Post news item
  * http://en.wikipedia.org/w/index.php?title=Nullsoft_Scriptable_Install_System&action=edit
@@ -459,6 +472,7 @@
 
 Confirm()
 StartLog()
+DeleteOldFolders()
 RunTests()
 TestSubversionEOL()
 CreateMenuImage()
diff -Nru nsis-3.05/Source/7zip/7zGuids.cpp nsis-3.06.1/Source/7zip/7zGuids.cpp
--- nsis-3.05/Source/7zip/7zGuids.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zGuids.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Common/InBuffer.cpp nsis-3.06.1/Source/7zip/7zip/Common/InBuffer.cpp
--- nsis-3.05/Source/7zip/7zip/Common/InBuffer.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Common/InBuffer.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Common/InBuffer.h nsis-3.06.1/Source/7zip/7zip/Common/InBuffer.h
--- nsis-3.05/Source/7zip/7zip/Common/InBuffer.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Common/InBuffer.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Common/OutBuffer.cpp nsis-3.06.1/Source/7zip/7zip/Common/OutBuffer.cpp
--- nsis-3.05/Source/7zip/7zip/Common/OutBuffer.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Common/OutBuffer.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Common/OutBuffer.h nsis-3.06.1/Source/7zip/7zip/Common/OutBuffer.h
--- nsis-3.05/Source/7zip/7zip/Common/OutBuffer.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Common/OutBuffer.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Common/StreamUtils.cpp nsis-3.06.1/Source/7zip/7zip/Common/StreamUtils.cpp
--- nsis-3.05/Source/7zip/7zip/Common/StreamUtils.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Common/StreamUtils.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Common/StreamUtils.h nsis-3.06.1/Source/7zip/7zip/Common/StreamUtils.h
--- nsis-3.05/Source/7zip/7zip/Common/StreamUtils.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Common/StreamUtils.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/IMatchFinder.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/IMatchFinder.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/IMatchFinder.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/IMatchFinder.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp nsis-3.06.1/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/LZInWindow.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/LZInWindow.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/LZInWindow.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/LZInWindow.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp nsis-3.06.1/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZ/LZOutWindow.h nsis-3.06.1/Source/7zip/7zip/Compress/LZ/LZOutWindow.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZ/LZOutWindow.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZ/LZOutWindow.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp nsis-3.06.1/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
--- nsis-3.05/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h nsis-3.06.1/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/LZMA/LZMA.h nsis-3.06.1/Source/7zip/7zip/Compress/LZMA/LZMA.h
--- nsis-3.05/Source/7zip/7zip/Compress/LZMA/LZMA.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/LZMA/LZMA.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp
--- nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h
--- nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h
--- nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h
--- nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h
--- nsis-3.05/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/ICoder.h nsis-3.06.1/Source/7zip/7zip/ICoder.h
--- nsis-3.05/Source/7zip/7zip/ICoder.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/ICoder.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/7zip/IStream.h nsis-3.06.1/Source/7zip/7zip/IStream.h
--- nsis-3.05/Source/7zip/7zip/IStream.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/7zip/IStream.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/Alloc.cpp nsis-3.06.1/Source/7zip/Common/Alloc.cpp
--- nsis-3.05/Source/7zip/Common/Alloc.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/Alloc.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/Alloc.h nsis-3.06.1/Source/7zip/Common/Alloc.h
--- nsis-3.05/Source/7zip/Common/Alloc.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/Alloc.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/CRC.cpp nsis-3.06.1/Source/7zip/Common/CRC.cpp
--- nsis-3.05/Source/7zip/Common/CRC.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/CRC.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/CRC.h nsis-3.06.1/Source/7zip/Common/CRC.h
--- nsis-3.05/Source/7zip/Common/CRC.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/CRC.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/Defs.h nsis-3.06.1/Source/7zip/Common/Defs.h
--- nsis-3.05/Source/7zip/Common/Defs.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/Defs.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/MyCom.h nsis-3.06.1/Source/7zip/Common/MyCom.h
--- nsis-3.05/Source/7zip/Common/MyCom.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/MyCom.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/MyGuidDef.h nsis-3.06.1/Source/7zip/Common/MyGuidDef.h
--- nsis-3.05/Source/7zip/Common/MyGuidDef.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/MyGuidDef.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/MyUnknown.h nsis-3.06.1/Source/7zip/Common/MyUnknown.h
--- nsis-3.05/Source/7zip/Common/MyUnknown.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/MyUnknown.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/MyWindows.h nsis-3.06.1/Source/7zip/Common/MyWindows.h
--- nsis-3.05/Source/7zip/Common/MyWindows.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/MyWindows.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/StdAfx.h nsis-3.06.1/Source/7zip/Common/StdAfx.h
--- nsis-3.05/Source/7zip/Common/StdAfx.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/StdAfx.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/Common/Types.h nsis-3.06.1/Source/7zip/Common/Types.h
--- nsis-3.05/Source/7zip/Common/Types.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/Common/Types.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/LZMADecode.c nsis-3.06.1/Source/7zip/LZMADecode.c
--- nsis-3.05/Source/7zip/LZMADecode.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/LZMADecode.c	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/7zip/LZMADecode.h nsis-3.06.1/Source/7zip/LZMADecode.h
--- nsis-3.05/Source/7zip/LZMADecode.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/7zip/LZMADecode.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2019 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2020 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/afxres.h nsis-3.06.1/Source/afxres.h
--- nsis-3.05/Source/afxres.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/afxres.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/BinInterop.cpp nsis-3.06.1/Source/BinInterop.cpp
--- nsis-3.05/Source/BinInterop.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/BinInterop.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2017-2019 Anders Kjersem
+ * Copyright (C) 2017-2020 Anders Kjersem
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/BinInterop.h nsis-3.06.1/Source/BinInterop.h
--- nsis-3.05/Source/BinInterop.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/BinInterop.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2017-2019 Anders Kjersem
+ * Copyright (C) 2017-2020 Anders Kjersem
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/build.cpp nsis-3.06.1/Source/build.cpp
--- nsis-3.05/Source/build.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/build.cpp	2020-07-31 21:38:42.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -2646,8 +2646,8 @@
 
   RET_UNLESS_OK( uninstall_generate() );
 
-  crc32_t crc=0;
-
+  unsigned char limit = 0; // Limit the number of retries in case the host has some kind of bug
+retry_output:
   {
     tstring full_path = get_full_path(build_output_filename), fnamebuf = get_file_name(build_output_filename);
     notify(MakensisAPI::NOTIFY_OUTPUT, full_path.c_str());
@@ -2667,6 +2667,7 @@
   if (!fp)
   {
     ERROR_MSG(_T("Can't open output file\n"));
+    if (++limit && prompt_for_output_path(build_output_filename, COUNTOF(CEXEBuild::build_output_filename))) goto retry_output;
     return PS_ERROR;
   }
 
@@ -2677,6 +2678,7 @@
     return PS_ERROR;
   }
 
+  crc32_t crc=0;
 #ifdef NSIS_CONFIG_CRC_SUPPORT
   #ifdef NSIS_CONFIG_CRC_ANAL
     crc=CRC32(crc,m_exehead,(DWORD)m_exehead_size);
@@ -3390,6 +3392,17 @@
   const int rvSucc = PS_OK, rvWarn = PS_WARNING, rvErr = PS_WARNING; // rvErr is not PS_ERROR because we want !pragma parsing to be very forgiving.
   const TCHAR badParamMsg[] = _T("Unknown pragma");
 
+  if (line.gettoken_enum(1, _T("internal\0")) == 0)
+  {
+    if (line.gettoken_enum(2, _T("x\0")) == 0)
+    {
+      const TCHAR *name = line.gettoken_str(3);
+      int succ, num = line.gettoken_intx(4, &succ);SCRIPT_MSG(_T("%#x %d\n"),num,succ);
+      return ((succ ? definedlist.set_si32(name, num) : definedlist.set(name, _T(""))), rvSucc);
+    }
+    return rvErr;
+  }
+
   // 2.47 shipped with a corrupted CHM file (bug #1129). This minimal verification command exists because the !searchparse hack we added does not work with codepage 936!
   if (line.gettoken_enum(1, _T("verifychm\0")) == 0)
   {
@@ -3479,7 +3492,7 @@
 
   m_warnings.add(msg,0); // Add to list of warnings to display at the end
 
-  MakensisAPI::notify_e hostevent = MakensisAPI::NOTIFY_WARNING;
+  MakensisAPI::datatransfer_e hostevent = MakensisAPI::NOTIFY_WARNING;
   if (aserror)
     hostevent = MakensisAPI::NOTIFY_ERROR, display_warnings = display_errors;
 
@@ -3571,7 +3584,7 @@
   FlushOutputAndResetPrintColor();
 }
 
-void CEXEBuild::notify(MakensisAPI::notify_e code, const TCHAR *data) const
+void CEXEBuild::notify(MakensisAPI::datatransfer_e code, const TCHAR *data) const
 {
 #ifdef _WIN32
   if (notify_hwnd)
@@ -3595,6 +3608,64 @@
 #endif
 }
 
+bool CEXEBuild::hostapi_request_data(MakensisAPI::datatransfer_e operation, UINT minver, HOSTAPIREQUESTDATAPROC proc, void*cookie, const void* input, UINT inputsize) const
+{
+  using namespace MakensisAPI;
+#ifdef _WIN32
+  struct helper {
+    static INT_PTR CALLBACK Proc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+    {
+      size_t *data = (size_t*) GetWindowLongPtr(hWnd, DWLP_USER);
+      if (Msg == WM_CLOSE)
+      {
+        if (lParam) SendMessage((HWND) wParam, WM_COPYDATA, (SIZE_T) hWnd, lParam);
+        return DestroyWindow(hWnd) | PostMessage(NULL, WM_QUIT, 0, 0);
+      }
+      return data && ((CEXEBuild::HOSTAPIREQUESTDATAPROC)data[0])((void*) data[1], hWnd, Msg, wParam, lParam); // We don't set DWLP_MSGRESULT nor care about the return value
+    }
+  };
+  if (!notify_hwnd || (minver && (UINT) SendMessage(notify_hwnd, QUERYHOST, QH_SUPPORTEDVERSION, 0) < minver)) return false;
+  size_t data[] = { (size_t) proc, (size_t) cookie };
+  COPYDATASTRUCT cds = { (DWORD) operation, inputsize, (void*) input };
+  HWND hWnd = CreateWindowEx(WS_EX_TOOLWINDOW, WC_DIALOG, NULL, WS_POPUP|WS_DISABLED, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+  SetWindowLongPtr(hWnd, DWLP_USER, (LONG_PTR) data);
+  SetWindowLongPtr(hWnd, DWLP_DLGPROC, (LONG_PTR) helper::Proc);
+  SendMessage(hWnd, WM_CLOSE, (SIZE_T) notify_hwnd, (SIZE_T) &cds);
+  if (hWnd) for (MSG msg; (int) GetMessage(&msg, NULL, 0, 0) > 0;) DispatchMessage(&msg);
+  return !!hWnd;
+#else
+  return false;
+#endif
+}
+
+bool CEXEBuild::prompt_for_output_path(TCHAR*path, UINT pathcap) const
+{
+  using namespace MakensisAPI;
+#ifdef _WIN32
+  struct handler {
+    static bool CALLBACK proc(void*cookie, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+    {
+      size_t *io = (size_t*) cookie;
+      COPYDATASTRUCT*pCDS = (COPYDATASTRUCT*) lParam;
+      if (Msg == WM_COPYDATA && pCDS->cbData > sizeof(TCHAR) && pCDS->cbData <= io[2] * sizeof(TCHAR))
+      {
+        _tcscpy((TCHAR*) io[1], (TCHAR*) ((COPYDATASTRUCT*)lParam)->lpData);
+        return (io[0] = (pCDS->dwData == MakensisAPI::PROMPT_FILEPATH));
+      }
+      return false;
+    }
+  };
+  size_t io[] = { false, (size_t) path, pathcap }, cb;
+  TinyGrowBuf inputbuf((cb = FIELD_OFFSET(PROMPT_FILEPATH_DATA, Path[pathcap])));
+  PROMPT_FILEPATH_DATA *p = (PROMPT_FILEPATH_DATA*) inputbuf.get();
+  p->Platform = (sizeof(void*) * 8) | sizeof(TCHAR), p->Reserved = 0;
+  _tcscpy(p->Path, path);
+  return hostapi_request_data(PROMPT_FILEPATH, 0x03006000, handler::proc, io, p, cb) && io[0];
+#else
+  return false;
+#endif
+}
+
 #ifdef NSIS_CONFIG_PLUGIN_SUPPORT
 int CEXEBuild::initialize_default_plugins(bool newtargetarc)
 {
@@ -3787,16 +3858,16 @@
 int CEXEBuild::GetUnsafeUserVarIndex(LineParser &line, int token)
 {
   TCHAR *p = line.gettoken_str(token);
-  int idx = (*p == _T('$') && *++p) ? m_UserVarNames.get(p) : -1;
+  int idx = IsVarPrefix(p) ? m_UserVarNames.get(++p) : -1;
   if (idx >= 0 && m_UserVarNames.get_reference(idx) >= 0) m_UserVarNames.inc_reference(idx);
   return idx;
 }
 int CEXEBuild::GetUserVarIndex(LineParser &line, int token)
 {
   TCHAR *p = line.gettoken_str(token);
-  if ( *p == _T('$') && *(p+1) )
+  if (IsVarPrefix(p))
   {
-    int idxUserVar = m_UserVarNames.get((TCHAR *)p+1);
+    int idxUserVar = m_UserVarNames.get(p+1);
     if (idxUserVar >= 0 && m_UserVarNames.get_reference(idxUserVar) >= 0)
     {
       m_UserVarNames.inc_reference(idxUserVar);
@@ -3804,7 +3875,7 @@
     }
     else
     {
-      int idxConst = m_ShellConstants.get((TCHAR *)p+1);
+      int idxConst = m_ShellConstants.get(p+1);
       if (idxConst >= 0)
       {
         ERROR_MSG(_T("Error: cannot change constants : %") NPRIs _T("\n"), p);
@@ -3828,7 +3899,7 @@
 bool CEXEBuild::IsIntOrUserVar(const LineParser &line, int token) const
 {
   const TCHAR *p = line.gettoken_str(token);
-  if ( *p == _T('$') && *(p+1) )
+  if (IsVarPrefix(p))
   {
     int idxUserVar = m_UserVarNames.get(p+1);
     return (idxUserVar >= 0 && m_UserVarNames.get_reference(idxUserVar) >= 0);
diff -Nru nsis-3.05/Source/build.h nsis-3.06.1/Source/build.h
--- nsis-3.05/Source/build.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/build.h	2020-05-02 21:53:41.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@
 // 5000..5999 Important generic warnings
 // 6000..6999 Script warnings
 // 7000..7499 Recovered from bad input etc. warnings
-// 7500..7999 Discouraged usage warnings (allocated top to bottom to reserve as much space as possible for more bad input codes)
+// 7500..7999 Discouraged usage warnings (allocated high to low to reserve as much space as possible for more bad input codes)
 // 8000..8999 Generic warnings
 // 9000..9999 Breaking our and/or MS guidelines warnings
 typedef enum {
@@ -107,6 +107,7 @@
   DW_LICENSE_EMPTY = 7050,
   DW_ATTRIBUTE_OVERLONGSTRING = 7060,
   DW_PARSE_BADNUMBER = 7070,
+  DW_PARSE_NUMBEROUTOFSPEC = 7071,
   DW_PARSE_LNK_HK = 7075,
   DW_GENERIC_DEPRECATED = 7998,
   DW_PARSE_REGPATHPREFIX = 7999,
@@ -143,11 +144,12 @@
   extern const TCHAR* SigintEventNameFmt;
   extern const TCHAR* SigintEventNameLegacy;
 
-  enum notify_e {
-    NOTIFY_SCRIPT, // main nsi file(s)
+  enum datatransfer_e {
+    NOTIFY_SCRIPT, // Compiler -> Host: main nsi file(s)
     NOTIFY_WARNING,
     NOTIFY_ERROR,
-    NOTIFY_OUTPUT // generated .exe file
+    NOTIFY_OUTPUT, // Compiler -> Host: Generated .exe file
+    PROMPT_FILEPATH // [0x03006000] Compiler -> Host -> Compiler
   };
 #ifdef _WIN32
   enum sndmsg_e {
@@ -156,8 +158,14 @@
 #endif
   enum QUERYHOST_e {
     QH_OUTPUTCHARSET = 1, // [0x03000000] return (wincodepage+1) or 0 for default (This encoding is used by stdout, stderr and the notify messages)
-    QH_ENABLESTDERR // [0x03001000] return 1 to output error messages to stderr or 0 to output error messages to stdout
+    QH_ENABLESTDERR, // [0x03001000] return 1 to output error messages to stderr or 0 to output error messages to stdout
+    QH_SUPPORTEDVERSION, // [0x03006000] The host must return new highest makensis compiler version it supports
   };
+  typedef struct {
+    unsigned char Platform; // Bitness OR'ed with sizeof(TCHAR) of the compiler
+    unsigned char Reserved;
+    TCHAR Path[1];
+  } PROMPT_FILEPATH_DATA;
 }
 
 #define PAGE_CUSTOM 0
@@ -273,7 +281,14 @@
     NStreamLineReader* curlinereader;
 
     HWND notify_hwnd;
-    void notify(MakensisAPI::notify_e code, const TCHAR *data) const;
+    void notify(MakensisAPI::datatransfer_e code, const TCHAR *data) const;
+    #ifdef _WIN32
+    typedef bool (CALLBACK*HOSTAPIREQUESTDATAPROC)(void*cookie, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+    #else
+    typedef bool (*HOSTAPIREQUESTDATAPROC)(void*cookie);
+    #endif
+    bool hostapi_request_data(MakensisAPI::datatransfer_e operation, UINT minver, HOSTAPIREQUESTDATAPROC proc, void*cookie, const void* input, UINT inputsize) const;
+    bool prompt_for_output_path(TCHAR*path, UINT pathcap) const;
 
   private:
     int check_write_output_errors() const;
@@ -327,6 +342,7 @@
     int doParse(const TCHAR *str);
     int doCommand(int which_token, LineParser &line);
     TCHAR m_templinebuf[MAX_LINELENGTH]; // Buffer used by parseScript() & doCommand(), not recursion safe!
+    int add_flag_instruction_entry(int which_token, int opcode, LineParser &line, int offset, int data = 0);
 
     int do_add_file(const TCHAR *lgss, int attrib, int recurse, int *total_files, const TCHAR 
       *name_override=0, int generatecode=1, int *data_handle=0, 
@@ -552,6 +568,7 @@
     int DeclaredUserVar(const TCHAR *VarName);
     void VerifyDeclaredUserVarRefs(UserVarsStringList *pVarsStringList);
     bool IsIntOrUserVar(const LineParser &line, int token) const;
+    static bool IsVarPrefix(const TCHAR*s) { return *s++ == _T('$') && *s > ' '; }
 
     ConstantsStringList m_ShellConstants;
 
diff -Nru nsis-3.05/Source/bzip2/blocksort.c nsis-3.06.1/Source/bzip2/blocksort.c
--- nsis-3.05/Source/bzip2/blocksort.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/bzip2/blocksort.c	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff -Nru nsis-3.05/Source/bzip2/bzlib.c nsis-3.06.1/Source/bzip2/bzlib.c
--- nsis-3.05/Source/bzip2/bzlib.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/bzip2/bzlib.c	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff -Nru nsis-3.05/Source/bzip2/bzlib.h nsis-3.06.1/Source/bzip2/bzlib.h
--- nsis-3.05/Source/bzip2/bzlib.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/bzip2/bzlib.h	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff -Nru nsis-3.05/Source/bzip2/compress.c nsis-3.06.1/Source/bzip2/compress.c
--- nsis-3.05/Source/bzip2/compress.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/bzip2/compress.c	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff -Nru nsis-3.05/Source/bzip2/decompress.c nsis-3.06.1/Source/bzip2/decompress.c
--- nsis-3.05/Source/bzip2/decompress.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/bzip2/decompress.c	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff -Nru nsis-3.05/Source/bzip2/huffman.c nsis-3.06.1/Source/bzip2/huffman.c
--- nsis-3.05/Source/bzip2/huffman.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/bzip2/huffman.c	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff -Nru nsis-3.05/Source/cbzip2.h nsis-3.06.1/Source/cbzip2.h
--- nsis-3.05/Source/cbzip2.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/cbzip2.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/clzma.cpp nsis-3.06.1/Source/clzma.cpp
--- nsis-3.05/Source/clzma.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/clzma.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/clzma.h nsis-3.06.1/Source/clzma.h
--- nsis-3.05/Source/clzma.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/clzma.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/compressor.h nsis-3.06.1/Source/compressor.h
--- nsis-3.05/Source/compressor.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/compressor.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/crc32.c nsis-3.06.1/Source/crc32.c
--- nsis-3.05/Source/crc32.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/crc32.c	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/crc32.h nsis-3.06.1/Source/crc32.h
--- nsis-3.05/Source/crc32.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/crc32.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/czlib.h nsis-3.06.1/Source/czlib.h
--- nsis-3.05/Source/czlib.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/czlib.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/DialogTemplate.cpp nsis-3.06.1/Source/DialogTemplate.cpp
--- nsis-3.05/Source/DialogTemplate.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/DialogTemplate.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2019 Amir Szekely <kichik@netvision.net.il> and Contributors
+ * Copyright (C) 2002-2020 Amir Szekely <kichik@netvision.net.il> and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/DialogTemplate.h nsis-3.06.1/Source/DialogTemplate.h
--- nsis-3.05/Source/DialogTemplate.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/DialogTemplate.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2019 Amir Szekely <kichik@netvision.net.il> and Contributors
+ * Copyright (C) 2002-2020 Amir Szekely <kichik@netvision.net.il> and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/dirreader.cpp nsis-3.06.1/Source/dirreader.cpp
--- nsis-3.05/Source/dirreader.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/dirreader.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/dirreader.h nsis-3.06.1/Source/dirreader.h
--- nsis-3.05/Source/dirreader.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/dirreader.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/afxres.h nsis-3.06.1/Source/exehead/afxres.h
--- nsis-3.05/Source/exehead/afxres.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/afxres.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/api.h nsis-3.06.1/Source/exehead/api.h
--- nsis-3.05/Source/exehead/api.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/api.h	2020-03-10 18:16:39.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,15 +42,15 @@
 {
   int autoclose;          // SetAutoClose
   int all_user_var;       // SetShellVarContext: User context = 0, Machine context = 1
-  int exec_error;         // IfErrors
+  int exec_error;         // IfErrors/ClearErrors/SetErrors
   int abort;              // IfAbort
-  int exec_reboot;        // IfRebootFlag (NSIS_SUPPORT_REBOOT)
+  int exec_reboot;        // IfRebootFlag/SetRebootFlag (NSIS_SUPPORT_REBOOT)
   int reboot_called;      // NSIS_SUPPORT_REBOOT
   int XXX_cur_insttype;   // Deprecated
   int plugin_api_version; // Plug-in ABI. See NSISPIAPIVER_CURR (Note: used to be XXX_insttype_changed)
-  int silent;             // IfSilent (NSIS_CONFIG_SILENT_SUPPORT)
+  int silent;             // IfSilent/SetSilent (NSIS_CONFIG_SILENT_SUPPORT)
   int instdir_error;      // GetInstDirError
-  int rtl;                // 1 if $LANGUAGE is a RTL language
+  int rtl;                // IfRtlLanguage: 1 if $LANGUAGE is a RTL language
   int errlvl;             // SetErrorLevel
   int alter_reg_view;     // SetRegView: Default View = 0, Alternative View = (sizeof(void*) > 4 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY)
   int status_update;      // SetDetailsPrint
diff -Nru nsis-3.05/Source/exehead/bgbg.c nsis-3.06.1/Source/exehead/bgbg.c
--- nsis-3.05/Source/exehead/bgbg.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/bgbg.c	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/components.c nsis-3.06.1/Source/exehead/components.c
--- nsis-3.05/Source/exehead/components.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/components.c	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/components.h nsis-3.06.1/Source/exehead/components.h
--- nsis-3.05/Source/exehead/components.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/components.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/config.h nsis-3.06.1/Source/exehead/config.h
--- nsis-3.05/Source/exehead/config.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/config.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/exec.c nsis-3.06.1/Source/exehead/exec.c
--- nsis-3.05/Source/exehead/exec.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/exec.c	2020-08-01 01:40:47.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -176,33 +176,42 @@
 // RegDeleteKeyEx on 32-bit Windows accepts but ignores the KEY_WOW64_xxKEY flags and always uses the 
 // one and only native key. Our RegKeyOpen will intentionally fail if a incompatible WoW64 flag is used.
 #define DRTF_ONLYIFNOSUBKEYS DELREGKEY_ONLYIFNOSUBKEYS
+#define DRTF_ONLYIFNOVALUES  DELREGKEY_ONLYIFNOVALUES
 static LONG NSISCALL DeleteRegTree(HKEY hThisKey, LPCTSTR SubKey, REGSAM SamviewAndFlags)
 {
   HKEY hKey;
-  UINT onlyifempty = SamviewAndFlags & DRTF_ONLYIFNOSUBKEYS;
+  UINT onlyifnosubkeys = SamviewAndFlags & DRTF_ONLYIFNOSUBKEYS;
+  UINT onlyifnovalues  = SamviewAndFlags & DRTF_ONLYIFNOVALUES, valuesexistcheckinsubkeys = TRUE;
   REGSAM samview = SamviewAndFlags & (KEY_WOW64_32KEY|KEY_WOW64_64KEY);
-  LONG retval = RegKeyOpen(hThisKey, SubKey, KEY_ENUMERATE_SUB_KEYS|samview, &hKey);
+  LONG retval = RegKeyOpen(hThisKey, SubKey, KEY_ENUMERATE_SUB_KEYS|KEY_QUERY_VALUE|samview, &hKey);
   if (retval == ERROR_SUCCESS)
   {
     TCHAR child[MAX_PATH+1]; // NB - don't change this to static (recursive function)
+    if (onlyifnovalues)
+    {
+      DWORD cchName = 0;
+      retval = RegEnumValue(hKey, 0, child, &cchName, NULL, NULL, NULL, NULL);
+      if (retval != ERROR_NO_MORE_ITEMS) goto notempty;
+      if (!valuesexistcheckinsubkeys) SamviewAndFlags &= ~DRTF_ONLYIFNOVALUES;
+    }
     while (RegEnumKey(hKey, 0, child, COUNTOF(child)) == ERROR_SUCCESS)
     {
-      if (onlyifempty) return (RegCloseKey(hKey), ERROR_CAN_NOT_COMPLETE);
+      if (onlyifnosubkeys) notempty: return (RegCloseKey(hKey), ERROR_CAN_NOT_COMPLETE);
       if ((retval = DeleteRegTree(hKey, child, SamviewAndFlags)) != ERROR_SUCCESS) break;
     }
     RegCloseKey(hKey);
     {
-      typedef LONG (WINAPI * RegDeleteKeyExPtr)(HKEY, LPCTSTR, REGSAM, DWORD);
-      RegDeleteKeyExPtr RDKE = (RegDeleteKeyExPtr)
-      #ifdef _WIN64
-        RegDeleteKeyEx;
-      #else
+      typedef LONG (WINAPI * RegDeleteKeyExType)(HKEY, LPCTSTR, REGSAM, DWORD);
+      RegDeleteKeyExType RDKE = (RegDeleteKeyExType)
+      #if !defined(_WIN64) || defined(_M_IA64)
         myGetProcAddress(MGA_RegDeleteKeyEx);
+      if (!RDKE)
+        retval = RegDeleteKey(hThisKey, SubKey);
+      else
+      #else
+        RegDeleteKeyEx;
       #endif
-      if (RDKE)
         retval = RDKE(hThisKey, SubKey, samview, 0);
-      else
-        retval = RegDeleteKey(hThisKey, SubKey);
     }
   }
   return retval;
@@ -834,14 +843,15 @@
     case EW_LOADANDSETIMAGE:
     {
       RECT r;
-      HANDLE hImage;
-      HWND hCtl=(parm2 & LASIF_HWND) ? GetHwndFromParm(1) : GetDlgItem(g_hwnd, parm1);
-      UINT it=parm2 & LASIM_IMAGE, exeres=parm2 & LASIF_EXERES, fitw=(UINT)parm2 >> LASIS_FITCTLW, fith=(parm2 & LASIF_FITCTLH) != 0;
-      LPCTSTR imgname = (parm2 & LASIF_STRID) ? GetStringFromParm(0x00) : MAKEINTRESOURCE(parm0);
+      HANDLE hNewImage, hPrevImage;
+      HWND hCtl=(parm3 & LASIF_HWND) ? GetHwndFromParm(2) : GetDlgItem(g_hwnd, parm2);
+      UINT it=parm3 & LASIM_IMAGE, exeres=parm3 & LASIF_EXERES, fitw=(UINT)parm3 >> LASIS_FITCTLW, fith=(parm3 & LASIF_FITCTLH) != 0;
+      LPCTSTR imgid = (parm3 & LASIF_STRID) ? GetStringFromParm(0x11) : MAKEINTRESOURCE(parm1);
       GetClientRect(hCtl, &r);
-      hImage=LoadImage(exeres ? g_hInstance : NULL, imgname, it, fitw*r.right, fith*r.bottom, parm2 & LASIM_LR);
-      hImage=(HANDLE)SendMessage(hCtl, STM_SETIMAGE, it, (LPARAM)hImage);
-      if (hImage && IMAGE_BITMAP == it) DeleteObject(hImage); // Delete the old image
+      hNewImage=LoadImage(exeres ? g_hInstance : NULL, imgid, it, fitw*r.right, fith*r.bottom, parm3 & LASIM_LR);
+      hPrevImage=(HANDLE)SendMessage(hCtl, STM_SETIMAGE, it, (LPARAM)hNewImage);
+      if (hPrevImage && IMAGE_BITMAP == it) DeleteObject(hPrevImage); // Delete the old bitmap
+      if (parm0 >= 0) iptrtostr(var0, (INT_PTR)hNewImage); // Optional output handle
     }
     break;
     case EW_CREATEFONT:
@@ -1390,7 +1400,7 @@
         else if (which==EW_FPUTS)
         {
           GetStringFromParm(0x21); // load string in buf2, convert it to ANSI in buf1
-          WideCharToMultiByte(CP_ACP, 0, buf2, -1, (LPSTR) buf1, NSIS_MAX_STRLEN, NULL, NULL);
+          StrWideToACP(buf2, (LPSTR) buf1, NSIS_MAX_STRLEN);
           l=lstrlenA((LPCSTR)buf1);
         }
 #endif
@@ -1704,6 +1714,32 @@
     break;
 #endif//NSIS_CONFIG_COMPONENTPAGE
 
+    case EW_GETOSINFO:
+    {
+      //switch(parm0)
+      {
+#ifdef NSIS_SUPPORT_FNUTIL
+      //case 0:
+        {
+          TCHAR *outstr = var1;
+          IID kfid;
+          HRESULT(WINAPI*SHGKFP)(REFIID,DWORD,HANDLE,PWSTR*) = (HRESULT(WINAPI*)(REFIID,DWORD,HANDLE,PWSTR*)) myGetProcAddress(MGA_SHGetKnownFolderPath);
+          TCHAR *buf2 = GetStringFromParm(0x22), succ = FALSE;
+          if (SHGKFP && SUCCEEDED(ComIIDFromString(buf2, &kfid)))
+          {
+            PWSTR path;
+            HRESULT hr = SHGKFP(&kfid, parm3, NULL, &path);
+            if (SUCCEEDED(hr))
+              strcpyWideToT(outstr, path), CoTaskMemFree(path), ++succ;
+          }
+          if (!succ)
+            exec_error++, *outstr = _T('\0');
+        }
+        //break;
+#endif
+      }
+    }
+    break;
 #ifdef NSIS_LOCKWINDOW_SUPPORT
     case EW_LOCKWINDOW:
     {
diff -Nru nsis-3.05/Source/exehead/exec.h nsis-3.06.1/Source/exehead/exec.h
--- nsis-3.05/Source/exehead/exec.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/exec.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/fileform.c nsis-3.06.1/Source/exehead/fileform.c
--- nsis-3.05/Source/exehead/fileform.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/fileform.c	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/fileform.h nsis-3.06.1/Source/exehead/fileform.h
--- nsis-3.05/Source/exehead/fileform.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/fileform.h	2020-05-01 13:15:03.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,7 +112,7 @@
 #ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
   EW_GETDLGITEM,        // GetDlgItem:        3: [outputvar, dialog, item_id]
   EW_SETCTLCOLORS,      // SerCtlColors:      3: [hwnd, pointer to struct colors]
-  EW_LOADANDSETIMAGE,   // SetBrandingImage/LoadAndSetImage: 3: [imgid ctl flags]
+  EW_LOADANDSETIMAGE,   // SetBrandingImage/LoadAndSetImage: 5: [ctrl imagetype lrflags imageid [output]]
   EW_CREATEFONT,        // CreateFont:        5: [handle output, face name, height, weight, flags]
   EW_SHOWWINDOW,        // ShowWindow:        2: [hwnd, show state]
 #endif
@@ -193,9 +193,8 @@
                         // InstTypeGetFlags:  3: [idx, 1, output]
 #endif
 
-  // instructions not actually implemented in exehead, but used in compiler.
-  EW_GETLABELADDR,      // both of these get converted to EW_ASSIGNVAR
-  EW_GETFUNCTIONADDR,
+  EW_GETOSINFO,         // 1+ [operation, ...]
+  EW_RESERVEDOPCODE,    // Free slot, feel free to use it for something
 
 #ifdef NSIS_LOCKWINDOW_SUPPORT
   EW_LOCKWINDOW,
@@ -207,6 +206,10 @@
   EW_FGETWS,            // FileReadUTF16LE: 4 [handle, output, maxlen, ?getchar:gets]
 #endif//NSIS_SUPPORT_FILEFUNCTIONS
 #endif
+
+  // Opcodes listed here are not actually used in exehead. No exehead opcodes should be present after these!
+  EW_GETLABELADDR,      // --> EW_ASSIGNVAR
+  EW_GETFUNCTIONADDR,   // --> EW_ASSIGNVAR
 };
 
 #pragma pack(push, 1) // fileform.cpp assumes no padding/alignment
@@ -547,8 +550,10 @@
 #define HKLMANY MAKEREGROOTVIEW(HKEY_LOCAL_MACHINE, REGROOTVIEW32|REGROOTVIEW64)
 #define DELREG_VALUE 0 // TOK_DELETEREGVALUE
 #define DELREG_KEY 1 // TOK_DELETEREGKEY
-#define DELREGKEY_ONLYIFNOSUBKEYS 1 // Shifted and stored as 2 in the binary for compatibility with <= 3.1
-#define DELREGKEYFLAGSSHIFT 1 // parm4 is shifted so exehead can remove the DELREG_KEY bit
+#define DELREGKEY_ONLYIFNOSUBKEYS 0x01 // Note: Shifted (stored as 2 in the binary) for compatibility with <= v3.1
+#define DELREGKEY_ONLYIFNOVALUES  0x02
+//      DELREGKEY_SAMVIEWMASK     REGROOTVIEWTOSAMVIEW(REGROOTVIEW32|REGROOTVIEW64) // Reserved for KEY_WOW64_xxKEY, cannot be used as flags!
+#define DELREGKEYFLAGSSHIFT 1 // exehead removes the DELREG_KEY bit in parm4 by shifting. After shifting the bits are DELREGKEY_*.
 
 
 #ifdef NSIS_SUPPORT_CREATESHORTCUT
diff -Nru nsis-3.05/Source/exehead/lang.h nsis-3.06.1/Source/exehead/lang.h
--- nsis-3.05/Source/exehead/lang.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/lang.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/Main.c nsis-3.06.1/Source/exehead/Main.c
--- nsis-3.05/Source/exehead/Main.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/Main.c	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/plugin.c nsis-3.06.1/Source/exehead/plugin.c
--- nsis-3.05/Source/exehead/plugin.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/plugin.c	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/plugin.h nsis-3.06.1/Source/exehead/plugin.h
--- nsis-3.05/Source/exehead/plugin.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/plugin.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/SConscript nsis-3.06.1/Source/exehead/SConscript
--- nsis-3.05/Source/exehead/SConscript	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/SConscript	2020-06-29 23:08:12.000000000 +0000
@@ -35,14 +35,14 @@
 """)
 
 libs = Split("""
-	kernel32
-	user32
-	gdi32
-	shell32
 	advapi32
+	shell32
+	ole32
 	comdlg32
 	comctl32
-	ole32
+	user32
+	gdi32
+	kernel32
 	uuid
 """)
 
diff -Nru nsis-3.05/Source/exehead/state.h nsis-3.06.1/Source/exehead/state.h
--- nsis-3.05/Source/exehead/state.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/state.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/Ui.c nsis-3.06.1/Source/exehead/Ui.c
--- nsis-3.05/Source/exehead/Ui.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/Ui.c	2020-06-28 21:55:37.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft, Jeff Doozan and Contributors
+ * Copyright (C) 1999-2020 Nullsoft, Jeff Doozan and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -1236,18 +1236,19 @@
     TreeView_SetItem(hwTree, &item);
   }
 
-  // workaround for bug #1397031
+  // workaround for bug #1397031 A.K.A #434
   //
-  // windows 95 doesn't erase the background of the state image
-  // before it draws a new one. because of this parts of the old
+  // Windows 95 & NT4 doesn't erase the background of the state image
+  // before it draws a new one. Because of this parts of the old
   // state image will show where the new state image is masked.
   //
-  // to solve this, the following line forces the background to
-  // be erased. sadly, this redraws the entire control. it might
+  // To solve this, the following line forces the background to
+  // be erased. sadly, this redraws the entire control. It might
   // be a good idea to figure out where the state images are and
   // redraw only those.
 
-  InvalidateRect(hwTree, NULL, TRUE);
+  if (IsWin95NT4()) // Checking for < IE4 is probably better but more work
+    InvalidateRect(hwTree, NULL, TRUE);
 }
 
 int NSISCALL TreeGetSelectedSection(HWND tree, BOOL mouse)
diff -Nru nsis-3.05/Source/exehead/ui.h nsis-3.06.1/Source/exehead/ui.h
--- nsis-3.05/Source/exehead/ui.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/ui.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/exehead/util.c nsis-3.06.1/Source/exehead/util.c
--- nsis-3.05/Source/exehead/util.c	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/util.c	2020-04-12 18:25:21.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -771,6 +771,30 @@
   return lstrcat(out, concat);
 }
 
+int StrWideToACP(LPCWSTR Src, char* Dst, int DstCap)
+{
+  return WideCharToMultiByte(CP_ACP, 0, Src, -1, Dst, DstCap, NULL, NULL);
+}
+
+#ifndef UNICODE
+void strcpyWideToT(TCHAR *out, LPCWSTR in)
+{
+  StrWideToACP(in, out, NSIS_MAX_STRLEN);
+}
+#endif
+
+#if !defined(_WIN64) && !defined(UNICODE)
+HRESULT ComIIDFromString(LPCTSTR str, IID*out)
+{
+  WCHAR buf[130];
+  signed char i;
+  for (i = 0; i >= 0; ++i)
+    if (!(buf[i] = str[i]))
+      return IIDFromString(buf, out);
+  return E_FAIL;
+}
+#endif
+
 TCHAR ps_tmpbuf[NSIS_MAX_STRLEN*2];
 
 const TCHAR SYSREGKEY[]   = _T("Software\\Microsoft\\Windows\\CurrentVersion");
@@ -1142,9 +1166,12 @@
 #ifndef _WIN64
   {"KERNEL32", "GetDiskFreeSpaceExW"},
   {"KERNEL32", "GetUserDefaultUILanguage"},
+#endif
+#if !defined(_WIN64) || defined(_M_IA64)
   {"ADVAPI32", "RegDeleteKeyExW"},
 #endif
   {"ADVAPI32", "InitiateShutdownW"},
+  {"SHELL32", "SHGetKnownFolderPath"},
   {"SHELL32", (CHAR*) 680}, // IsUserAnAdmin
 #ifndef _WIN64
   {"SHLWAPI", (CHAR*) 437}, // IsOS
@@ -1163,6 +1190,7 @@
   {"KERNEL32", "GetUserDefaultUILanguage"},
   {"ADVAPI32", "RegDeleteKeyExA"},
   {"ADVAPI32", "InitiateShutdownA"},
+  {"SHELL32", "SHGetKnownFolderPath"},
   {"SHELL32", (CHAR*) 680}, // IsUserAnAdmin
 #ifndef _WIN64
   {"SHLWAPI", (CHAR*) 437}, // IsOS
@@ -1234,7 +1262,7 @@
 {
 #ifdef _UNICODE
   char ansiName[256];
-  if (WideCharToMultiByte(CP_ACP, 0, funcName, -1, ansiName, 256, NULL, NULL) != 0)
+  if (StrWideToACP(funcName, ansiName, 256) != 0)
     return GetProcAddress(dllHandle, ansiName);
   return NULL;
 #else
diff -Nru nsis-3.05/Source/exehead/util.h nsis-3.06.1/Source/exehead/util.h
--- nsis-3.05/Source/exehead/util.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/exehead/util.h	2020-06-28 22:02:50.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,20 @@
 int NSISCALL mystrlen(const TCHAR *in);
 TCHAR * NSISCALL mystrcat(TCHAR *out, const TCHAR *concat);
 TCHAR * NSISCALL mystrstr(TCHAR *a, TCHAR *b);
+int StrWideToACP(LPCWSTR Src, char* Dst, int DstCap);
+#ifdef UNICODE
+#define strcpyWideToT mystrcpy
+#else
+void strcpyWideToT(TCHAR *out, LPCWSTR in);
+#endif
 
+#ifdef _WIN64
+#define ComIIDFromString(s,out) SHCLSIDFromString((s),(CLSID*)(out))
+#elif defined(UNICODE)
+#define ComIIDFromString(s,out) IIDFromString((s), (IID*)(out))
+#else
+HRESULT ComIIDFromString(LPCTSTR str, IID*out);
+#endif
 
 #ifndef KEY_CREATE_LINK
 #define KEY_CREATE_LINK 0x0020
@@ -56,6 +69,7 @@
 
 
 extern DWORD g_WinVer; // GetVersion()
+#define IsWin95NT4() ( sizeof(void*) == 4 && LOWORD(g_WinVer) == 0x0004 )
 #define NSIS_WINVER_WOW64FLAG ( sizeof(void*) > 4 ? ( 0 ) : ( 0x40000000 ) )
 #define IsWow64() ( sizeof(void*) > 4 ? ( FALSE ) : ( g_WinVer & NSIS_WINVER_WOW64FLAG ) )
 #define SystemSupportsAltRegView() ( sizeof(void*) > 4 ? ( TRUE ) : ( IsWow64() ) )
@@ -151,9 +165,12 @@
 #ifndef _WIN64
   MGA_GetDiskFreeSpaceEx,
   MGA_GetUserDefaultUILanguage,
+#endif
+#if !defined(_WIN64) || defined(_M_IA64)
   MGA_RegDeleteKeyEx,
 #endif
   MGA_InitiateShutdown,
+  MGA_SHGetKnownFolderPath,
   MGA_IsUserAnAdmin,
 #ifndef _WIN64
   MGA_IsOS,
diff -Nru nsis-3.05/Source/fileform.cpp nsis-3.06.1/Source/fileform.cpp
--- nsis-3.05/Source/fileform.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/fileform.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/fileform.h nsis-3.06.1/Source/fileform.h
--- nsis-3.05/Source/fileform.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/fileform.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/growbuf.cpp nsis-3.06.1/Source/growbuf.cpp
--- nsis-3.05/Source/growbuf.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/growbuf.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/growbuf.h nsis-3.06.1/Source/growbuf.h
--- nsis-3.05/Source/growbuf.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/growbuf.h	2020-04-20 17:21:04.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,6 +122,7 @@
 class TinyGrowBuf : public GrowBuf {
   public:
     TinyGrowBuf() : GrowBuf() { m_bs=1024; }
+    TinyGrowBuf(size_type cb) : GrowBuf() { m_bs=1024; resize(cb); }
 };
 
 #endif
diff -Nru nsis-3.05/Source/icon.cpp nsis-3.06.1/Source/icon.cpp
--- nsis-3.05/Source/icon.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/icon.cpp	2020-07-18 23:18:18.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -381,19 +381,18 @@
   for (i = 0; i < icon2.size(); i++)
   {
     Icon* icon = &icon2[order[i].index2];
-    DWORD size = FIX_ENDIAN_INT32(icon->meta.dwRawSize);
+    DWORD size = icon->meta.dwRawSize;
 
-    *(LPDWORD) seeker = FIX_ENDIAN_INT32(size);
+    memcpy(seeker, &size, sizeof(size));
+    seeker += sizeof(size);
+    memset(seeker, 0, sizeof(DWORD));
     seeker += sizeof(DWORD);
-    *(LPDWORD) seeker = 0;
-    seeker += sizeof(DWORD);
-
     memcpy(seeker, icon->data, size);
-    seeker += size;
+    seeker += FIX_ENDIAN_INT32(size);
   }
 
   // add terminator
-  *(LPDWORD) seeker = 0;
+  memset(seeker, 0, sizeof(DWORD));
 
   // done
   destroy_icon_group(group);
diff -Nru nsis-3.05/Source/icon.h nsis-3.06.1/Source/icon.h
--- nsis-3.05/Source/icon.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/icon.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/lang.cpp nsis-3.06.1/Source/lang.cpp
--- nsis-3.05/Source/lang.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/lang.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/lang.h nsis-3.06.1/Source/lang.h
--- nsis-3.05/Source/lang.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/lang.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/lineparse.cpp nsis-3.06.1/Source/lineparse.cpp
--- nsis-3.05/Source/lineparse.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/lineparse.cpp	2020-06-06 13:17:43.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,13 @@
 #include "tstring.h"
 #include "util.h"
 
+#ifndef _istspace
+#define _istspace my_istspace
+template<class T> static int my_istspace(T c) { return c == 0x20 || (c >= 0x09 && c <= 0x0D); }
+#endif
+template<class T> static T skipspace(T s) { while(*s && _istspace(*s)) ++s; return s; }
+
+
 LineParser::LineParser(bool bCommentBlock)
 {
   m_incommentblock=bCommentBlock;
@@ -75,58 +82,133 @@
   m_eat++;
 }
 
-static unsigned int number_has_base_prefix(const TCHAR *str)
+inline int LineParser::validate_token_index(int token, int *success/*=0*/) const
 {
-  unsigned int hasbase = false;
+  token += m_eat;
+  if (token < 0 || token >= m_nt || !m_tokens[token][0])
+  {
+    if (success) *success = 0;
+    return -1;
+  }
+  return token;
+}
+
+
+static unsigned int get_base_from_prefix(const TCHAR *str)
+{
+  unsigned int hasbase = 0;
   if (_T('-') == *str || _T('+') == *str) ++str;
   if (_T('0') == str[0])
   {
-    if (_T('x') == (str[1]|32)) ++hasbase;
-    if (_T('n') == (str[1]|32)) ++hasbase;
-    if (_T('b') == (str[1]|32) || _T('y') == (str[1]|32)) ++hasbase;
-    if (_T('o') == (str[1]|32) || _T('t') == (str[1]|32)) ++hasbase;
+    if (_T('x') == (str[1]|32)) hasbase = 16;
+    // Special support for 0n, 0y and 0t MASM style and 0b and 0o Python style radix prefix:
+    if (_T('n') == (str[1]|32)) hasbase = 10;
+    if (_T('b') == (str[1]|32) || _T('y') == (str[1]|32)) hasbase = 2;
+    if (_T('o') == (str[1]|32) || _T('t') == (str[1]|32)) hasbase = 8;
   }
   return hasbase;
 }
+static unsigned int number_has_base_prefix(const TCHAR *str) { return get_base_from_prefix(str); }
 
-int LineParser::parse_int(const TCHAR *str, int *success/*=0*/)
+static int parse_int_expression(const TCHAR *str, bool expressions, int *success=0)
 {
-  const TCHAR *p=str, *parse=p;
+  enum { XOP_NONE = 0, XOP_BITAND, XOP_BITXOR, XOP_BITOR, XOP_LOGAND, XOP_LOGOR };
+  int tot=0, xop=XOP_NONE, hasfailed=0;
+nextnum:
+  const TCHAR *p=str, *parse=p, *xoperandpfixstart, *xoperandpfixend;
   TCHAR *end;
   int neg=0, base=0, num;
+#ifndef _MSC_VER
+  xoperandpfixstart=xoperandpfixend=0; // Avoid GCC maybe-uninitialized warning
+#endif
+
+  if (expressions)
+  {
+    xoperandpfixstart=p=skipspace(p);
+    while (*p == '~' || *p == '!') p=skipspace(++p);
+    xoperandpfixend=parse=p;
+  }
+
   if (_T('+') == *p)
     ++p;
   else if (_T('-') == *p)
     ++p, ++neg;
   if (_T('0') == p[0])
   {
-    // Special support for 0n, 0y and 0t MASM style and 0b and 0o Python style radix prefix:
-    if (_T('n') == (p[1]|32)) parse=&p[2], base=10;
-    if (_T('b') == (p[1]|32) || _T('y') == (p[1]|32)) parse=&p[2], base=2;
-    if (_T('o') == (p[1]|32) || _T('t') == (p[1]|32)) parse=&p[2], base=8;
+    if ((base=get_base_from_prefix(p))) parse=&p[2];
   }
   if (neg)
   {
-    num=_tcstol(parse,&end,base);
+    num=(int)(long)_tcstol(parse,&end,base);
     if (base) num*=-1; // Input was "-0n012" but we have only parsed "012" and need to fix the sign
   }
   else
   {
-    num=(int)_tcstoul(parse,&end,base);
+    num=(int)(long)_tcstoul(parse,&end,base);
+  }
+  const bool parseddigits=end > parse;
+  if (!parseddigits) ++hasfailed; // "0x", "1 | ~" etc.
+
+  if (expressions)
+  {
+    for (p=xoperandpfixstart; p < xoperandpfixend; p=skipspace(++p))
+      switch(*p)
+      {
+      case '~': num=~num; break;
+      case '!': num=!num; break;
+      default: assert(!"op");
+      }
+
+    // Simple left-to-right parsing, no operator precedence
+    switch(xop)
+    {
+    case XOP_NONE: tot=num; break;
+    case XOP_BITAND: tot&=num; break;
+    case XOP_BITXOR: tot^=num; break;
+    case XOP_BITOR: tot|=num; break;
+    case XOP_LOGAND: tot=tot && num; break;
+    case XOP_LOGOR: tot=tot || num; break;
+    default: assert(!"op");
+    }
+
+    str=end=skipspace(end);
+    switch(*str)
+    {
+    case '&': xop=XOP_BITAND; if (*++str == '&') xop=XOP_LOGAND, ++str; goto nextnum;
+    case '^': xop=XOP_BITXOR, ++str; goto nextnum;
+    case '|': xop=XOP_BITOR; if (*++str == '|') xop=XOP_LOGOR, ++str; goto nextnum;
+    default: xop=XOP_NONE; // Done
+    }
+  }
+  else
+  {
+    tot=num;
   }
-  if (success) *success=! (int)(*end);
-  return num;
+
+  if (success) *success=!(int)(*end) && !hasfailed;
+  return tot;
+}
+
+int LineParser::parse_int(const TCHAR *str, int *success/*=0*/)
+{
+  return parse_int_expression(str, false, success);
+}
+
+int LineParser::parse_intx(const TCHAR *str, int *success/*=0*/)
+{
+  return parse_int_expression(str, true, success);
 }
 
 int LineParser::gettoken_int(int token, int *success/*=0*/) const
 {
-  token+=m_eat;
-  if (token < 0 || token >= m_nt || !m_tokens[token][0])
-  {
-    if (success) *success=0;
-    return 0;
-  }
-  return parse_int(m_tokens[token], success);
+  if ((token = validate_token_index(token,success)) < 0) return 0;
+  return parse_int(m_tokens[token],success);
+}
+
+int LineParser::gettoken_intx(int token, int *success/*=0*/) const
+{
+  if ((token = validate_token_index(token,success)) < 0) return 0;
+  return parse_intx(m_tokens[token],success);
 }
 
 double LineParser::parse_float(const TCHAR *str, int *success/*=0*/)
@@ -149,26 +231,20 @@
 
 double LineParser::gettoken_float(int token, int *success/*=0*/) const
 {
-  token+=m_eat;
-  if (token < 0 || token >= m_nt)
-  {
-    if (success) *success=0;
-    return 0.0;
-  }
-  return parse_float(m_tokens[token], success);
+  if ((token = validate_token_index(token,success)) < 0) return 0.0;
+  return parse_float(m_tokens[token],success);
 }
 
 double LineParser::parse_number(const TCHAR *str, int *success/*=0*/)
 {
-  const unsigned int forceint = number_has_base_prefix(str);
+  const unsigned int forceint=number_has_base_prefix(str);
   return forceint ? parse_int(str,success) : parse_float(str,success);
 }
 
 double LineParser::gettoken_number(int token, int *success/*=0*/) const
 {
-  const TCHAR*str=gettoken_str(token);
-  const unsigned int forceint = number_has_base_prefix(str);
-  return forceint ? gettoken_int(token,success) : gettoken_float(token,success);
+  if ((token = validate_token_index(token,success)) < 0) return 0.0;
+  return parse_number(m_tokens[token],success);
 }
 
 int LineParser::gettoken_binstrdata(int token, char*buffer, int bufcap) const
diff -Nru nsis-3.05/Source/lineparse.h nsis-3.06.1/Source/lineparse.h
--- nsis-3.05/Source/lineparse.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/lineparse.h	2020-05-02 21:53:41.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
     int getnumtokens();
     void eattoken();
     int gettoken_int(int token, int *success=0) const;
+    int gettoken_intx(int token, int *success=0) const; // basic operator expressions parser
     double gettoken_float(int token, int *success=0) const;
     double gettoken_number(int token, int *success=0) const;
     int gettoken_binstrdata(int token, char*buffer, int bufcap) const;
@@ -40,6 +41,7 @@
     int gettoken_enum(int token, const TCHAR *strlist); // null separated list
 
     static int parse_int(const TCHAR *str, int *success=0);
+    static int parse_intx(const TCHAR *str, int *success=0);
     static double parse_float(const TCHAR *str, int *success=0);
     static double parse_number(const TCHAR *str, int *success=0);
 
@@ -47,6 +49,7 @@
 
     void freetokens();
     int doline(TCHAR *line, int ignore_escaping=0);
+    inline int validate_token_index(int token, int *success=0) const;
 
     int m_eat;
     int m_nt;
diff -Nru nsis-3.05/Source/makenssi.cpp nsis-3.06.1/Source/makenssi.cpp
--- nsis-3.05/Source/makenssi.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/makenssi.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 #include "winchar.h" // assert(sizeof(WINWCHAR)...)
 
 #include <nsis-version.h>
-#define NSIS_COPYYEARS _T("1999-2019")
+#define NSIS_COPYYEARS _T("1999-2020")
 
 using namespace std;
 
diff -Nru nsis-3.05/Source/manifest.cpp nsis-3.06.1/Source/manifest.cpp
--- nsis-3.05/Source/manifest.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/manifest.cpp	2020-08-01 00:29:24.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #include <nsis-version.h>
 #include "tstring.h"
 #include "util.h" // RawTStrToASCII
+#include <vector>
 
 // Jim Park: The manifest must stay UTF-8.  Do not convert.
 
@@ -91,6 +92,52 @@
 }
 
 
+static const TCHAR*g_appendpaths[] = { // Basic simulated XPath support
+  _T("/"),
+  _T("/assembly"),
+  _T("/assembly/dependency"),
+  _T("/assembly/dependency/dependentAssembly"),
+  _T("/assembly/compatibility/application"),
+  _T("/assembly/application/windowsSettings")
+};
+std::vector<string> g_appendstrings[COUNTOF(g_appendpaths)];
+
+static int isvalidappendpath(const TCHAR*path)
+{
+  for (int i = 0; i < (int) COUNTOF(g_appendpaths); ++i)
+    if (!_tcsicmp(path, g_appendpaths[i]))
+      return i;
+  return -1;
+}
+
+bool addappendstring(const TCHAR*path, const TCHAR*data)
+{
+  int i = isvalidappendpath(path);
+  if (i >= 0)
+  {
+    string str = "";
+    str += TtoCString(data);
+    g_appendstrings[i].push_back(str);
+    return true;
+  }
+  return false;
+}
+
+static bool append(string& xml, const TCHAR*path, const char*prefix = 0, const char*suffix = 0)
+{
+  bool any = false;
+  int i = isvalidappendpath(path);
+  if (i >= 0)
+    for (size_t j = 0; j < g_appendstrings[i].size(); ++j)
+    {
+      if (!any && prefix) xml += prefix, any = true;
+      xml += g_appendstrings[i][j];
+    }
+  if (any && suffix)
+    xml += suffix;
+  return any;
+}
+
 string generate(comctl comctl_selection, exec_level exec_level_selection, const SPECIFICATION&spec)
 {
   flags featureflags = spec.Flags;
@@ -100,18 +147,28 @@
   SupportedOSList& sosl = *spec.pSOSL;
   const TCHAR *mvt = spec.MaxVersionTested;
 
-  bool default_or_empty_sosl = sosl.isdefaultlist() || !sosl.getcount();
+  bool default_or_empty_sosl = sosl.isdefaultlist() || !sosl.getcount(), any;
   if (comctl_selection == comctl_old && exec_level_selection == exec_level_none && default_or_empty_sosl && dpiaware_notset == dpia)
     return "";
 
+  string xmltmp;
   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 ";
   xml += TtoCString(NSIS_VERSION);
   xml += "</description>";
 
   if (comctl_selection == comctl_xp)
   {
-    xml += "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"*\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" /></dependentAssembly></dependency>";
+    addappendstring(_T("/assembly/dependency/dependentAssembly"), _T("<assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"*\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" />"));
   }
+  xmltmp = "<dependency>";
+  any = append(xmltmp, _T("/assembly/dependency"));
+  any |= append(xmltmp, _T("/assembly/dependency/dependentAssembly"), "<dependentAssembly>", "</dependentAssembly>");
+  if (any)
+  {
+    xmltmp += "</dependency>";
+    xml += xmltmp;
+  }
+
 
   if (exec_level_selection != exec_level_none)
   {
@@ -142,8 +199,9 @@
     sosl.deleteall();
   }
 
+  xmltmp = "", append(xmltmp, _T("/assembly/compatibility/application"));
   int soslcount = sosl.getcount();
-  if (soslcount || *mvt)
+  if (!xmltmp.empty() || soslcount || *mvt)
   {
     char buf[38+1];
     xml += "<compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\"><application>";
@@ -159,6 +217,7 @@
       xml += TtoCString(mvt);
       xml += "\"/>";
     }
+    xml += xmltmp;
     xml += "</application></compatibility>";
   }
 
@@ -193,6 +252,7 @@
     xml_aws += lpaware_false != lpa ? "true" : "false"; 
     xml_aws += "</longPathAware>";
   }
+  append(xml_aws, _T("/assembly/application/windowsSettings"));
   if (!xml_aws.empty())
   {
     xml += "<application xmlns=\"urn:schemas-microsoft-com:asm.v3\"><windowsSettings>";
@@ -200,7 +260,9 @@
     xml += "</windowsSettings></application>";
   }
 
+  append(xml, _T("/assembly"));
   xml += "</assembly>";
+  append(xml, _T("/"));
 
   return xml;
 }
diff -Nru nsis-3.05/Source/manifest.h nsis-3.06.1/Source/manifest.h
--- nsis-3.05/Source/manifest.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/manifest.h	2020-07-25 20:13:13.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,6 +104,7 @@
   } SPECIFICATION;
 
   std::string generate(comctl, exec_level, const SPECIFICATION&);
+  bool addappendstring(const TCHAR*path, const TCHAR*data);
 
 };
 
diff -Nru nsis-3.05/Source/mmap.cpp nsis-3.06.1/Source/mmap.cpp
--- nsis-3.05/Source/mmap.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/mmap.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/mmap.h nsis-3.06.1/Source/mmap.h
--- nsis-3.05/Source/mmap.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/mmap.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/Platform.h nsis-3.06.1/Source/Platform.h
--- nsis-3.05/Source/Platform.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/Platform.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/Plugins.cpp nsis-3.06.1/Source/Plugins.cpp
--- nsis-3.05/Source/Plugins.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/Plugins.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/Plugins.h nsis-3.06.1/Source/Plugins.h
--- nsis-3.05/Source/Plugins.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/Plugins.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/ResourceEditor.cpp nsis-3.06.1/Source/ResourceEditor.cpp
--- nsis-3.05/Source/ResourceEditor.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/ResourceEditor.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2019 Amir Szekely <kichik@users.sourceforge.net>
+ * Copyright (C) 2002-2020 Amir Szekely <kichik@users.sourceforge.net>
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/ResourceEditor.h nsis-3.06.1/Source/ResourceEditor.h
--- nsis-3.05/Source/ResourceEditor.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/ResourceEditor.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2019 Amir Szekely <kichik@users.sourceforge.net>
+ * Copyright (C) 2002-2020 Amir Szekely <kichik@users.sourceforge.net>
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/ResourceVersionInfo.cpp nsis-3.06.1/Source/ResourceVersionInfo.cpp
--- nsis-3.05/Source/ResourceVersionInfo.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/ResourceVersionInfo.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/ResourceVersionInfo.h nsis-3.06.1/Source/ResourceVersionInfo.h
--- nsis-3.05/Source/ResourceVersionInfo.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/ResourceVersionInfo.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/script.cpp nsis-3.06.1/Source/script.cpp
--- nsis-3.05/Source/script.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/script.cpp	2020-08-01 01:40:47.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -912,6 +912,31 @@
   return k == -1 ? INVALIDREGROOT : rootkey_tab[k];
 }
 
+int CEXEBuild::add_flag_instruction_entry(int which_token, int opcode, LineParser &line, int offset, int data)
+{
+  entry ent = { opcode, };
+  switch(opcode)
+  {
+    case EW_SETFLAG:
+      ent.offsets[0] = offset;
+      ent.offsets[1] = data;
+      if (display_script) SCRIPT_MSG(_T("%") NPRIs _T(": %") NPRIs _T("\n"), get_commandtoken_name(which_token), line.gettoken_str(1));
+      return add_entry(&ent);
+    case EW_IFFLAG:
+      if (process_jump(line, 1, &ent.offsets[0]) || process_jump(line, 2, &ent.offsets[1])) PRINTHELP()
+      ent.offsets[2]=offset;
+      ent.offsets[3]=data;
+      if (display_script) SCRIPT_MSG(_T("%") NPRIs _T(" ?%") NPRIs _T(":%") NPRIs _T("\n"), get_commandtoken_name(which_token), line.gettoken_str(1), line.gettoken_str(2));
+      return add_entry(&ent);
+    case EW_GETFLAG:
+      if ((ent.offsets[0] = GetUserVarIndex(line, 1)) < 0) PRINTHELP();
+      ent.offsets[1] = offset;
+      if (display_script) SCRIPT_MSG(_T("%") NPRIs _T(": %") NPRIs _T("\n"), get_commandtoken_name(which_token), line.gettoken_str(1));
+      return add_entry(&ent);
+  }
+  return PS_ERROR;
+}
+
 int CEXEBuild::doCommand(int which_token, LineParser &line)
 {
 #ifdef NSIS_CONFIG_PLUGIN_SUPPORT
@@ -1408,10 +1433,7 @@
     }
     return PS_OK;
     case TOK_GETINSTDIRERROR:
-      ent.which = EW_GETFLAG;
-      ent.offsets[0] = GetUserVarIndex(line, 1);
-      ent.offsets[1] = FLAG_OFFSET(instdir_error);
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_GETFLAG, line, FLAG_OFFSET(instdir_error));
 #ifdef NSIS_CONFIG_COMPONENTPAGE
     case TOK_COMPTEXT:
       {
@@ -1682,23 +1704,11 @@
     return PS_ERROR;
 #endif
     case TOK_IFSILENT:
-      ent.which=EW_IFFLAG;
-      if (process_jump(line,1,&ent.offsets[0]) ||
-          process_jump(line,2,&ent.offsets[1])) PRINTHELP()
-      ent.offsets[2]=FLAG_OFFSET(silent);
-      ent.offsets[3]=~0;//new value mask - keep flag
-      SCRIPT_MSG(_T("IfSilent ?%") NPRIs _T(":%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_IFFLAG, line, FLAG_OFFSET(silent), ~0); //new value mask - keep flag
     case TOK_SETSILENT:
-    {
-      ent.which=EW_SETFLAG;
-      ent.offsets[0]=FLAG_OFFSET(silent);
-      int k=line.gettoken_enum(1,_T("normal\0silent\0"));
-      if (k<0) PRINTHELP()
-      ent.offsets[1]=add_intstring(k);
-      SCRIPT_MSG(_T("SetSilent: %") NPRIs _T("\n"),line.gettoken_str(1));
-    }
-    return add_entry(&ent);
+      ent.offsets[1] = line.gettoken_enum(1,_T("normal\0silent\0"));
+      if (ent.offsets[1] < 0 ) PRINTHELP()
+      return add_flag_instruction_entry(which_token, EW_SETFLAG, line, FLAG_OFFSET(silent), add_intstring(ent.offsets[1]));
 #else 
     case TOK_SILENTINST:
     case TOK_SILENTUNINST:
@@ -1707,6 +1717,8 @@
       ERROR_MSG(_T("Error: %") NPRIs _T(" specified, NSIS_CONFIG_SILENT_SUPPORT not defined.\n"),  line.gettoken_str(0));
     return PS_ERROR;
 #endif //~ NSIS_CONFIG_SILENT_SUPPORT
+    case TOK_IFRTLLANG:
+      return add_flag_instruction_entry(which_token, EW_IFFLAG, line, FLAG_OFFSET(rtl), ~0); //new value mask - keep flag
     case TOK_OUTFILE:
       my_strncpy(build_output_filename,line.gettoken_str(1),COUNTOF(build_output_filename));
       SCRIPT_MSG(_T("OutFile: \"%") NPRIs _T("\"\n"),build_output_filename);
@@ -2330,6 +2342,9 @@
       }
       return PS_OK;
 
+    case TOK_MANIFEST_APPENDCUSTOMSTRING:
+      if (!manifest::addappendstring(line.gettoken_str(1), line.gettoken_str(2))) PRINTHELP();
+      return PS_OK;
     case TOK_MANIFEST_DPIAWARE:
       switch(line.gettoken_enum(1,_T("none\0notset\0false\0true\0system\0permonitor\0explorer\0")))
       {
@@ -3002,29 +3017,31 @@
       if (process_jump(line,1,&ent.offsets[0])) PRINTHELP()
       SCRIPT_MSG(_T("Goto: %") NPRIs _T("\n"),line.gettoken_str(1));
     return add_entry(&ent);
+    case TOK_GETREGVIEW:
+      return add_flag_instruction_entry(which_token, EW_GETFLAG, line, FLAG_OFFSET(alter_reg_view));
     case TOK_SETREGVIEW:
     {
       ent.which=EW_SETFLAG;
       ent.offsets[0]=FLAG_OFFSET(alter_reg_view);
       int k=line.gettoken_enum(1,_T("32\0") _T("64\0default\0lastused\0"));
       if (k == 0) ent.offsets[1]=add_intstring(is_target_64bit() ? KEY_WOW64_32KEY : 0); // 32
-      else if (k == 1) ent.offsets[1]=add_intstring(KEY_WOW64_64KEY); // 64
+      else if (k == 1) ent.offsets[1]=add_intstring(is_target_64bit() ? 0 : KEY_WOW64_64KEY); // 64
       else if (k == 2) ent.offsets[1]=add_intstring(0); // default
       else if (k == 3) ent.offsets[2]=1; // last used
       else PRINTHELP()
       SCRIPT_MSG(_T("SetRegView: %") NPRIs _T("\n"),line.gettoken_str(1));
     }
     return add_entry(&ent);
-    case TOK_SETSHELLVARCONTEXT:
-    {
-      ent.which=EW_SETFLAG;
-      ent.offsets[0]=FLAG_OFFSET(all_user_var);
-      int k=line.gettoken_enum(1,_T("current\0all\0"));
-      if (k<0) PRINTHELP()
-      ent.offsets[1]=add_intstring(k);
-      SCRIPT_MSG(_T("SetShellVarContext: %") NPRIs _T("\n"),line.gettoken_str(1));
-    }
-    return add_entry(&ent);
+    case TOK_IFALTREGVIEW:
+      return add_flag_instruction_entry(which_token, EW_IFFLAG, line, FLAG_OFFSET(alter_reg_view), ~0); //new value mask - keep flag
+    case TOK_GETSHELLVARCONTEXT:
+      return add_flag_instruction_entry(which_token, EW_GETFLAG, line, FLAG_OFFSET(all_user_var));
+    case TOK_SETSHELLVARCONTEXT: 
+      ent.offsets[1] = line.gettoken_enum(1,_T("current\0all\0"));
+      if (ent.offsets[1] < 0 ) PRINTHELP()
+      return add_flag_instruction_entry(which_token, EW_SETFLAG, line, FLAG_OFFSET(all_user_var), add_intstring(ent.offsets[1]));
+    case TOK_IFSHELLVARCONTEXTALL:
+      return add_flag_instruction_entry(which_token, EW_IFFLAG, line, FLAG_OFFSET(all_user_var), ~0); //new value mask - keep flag
     case TOK_RET:
       SCRIPT_MSG(_T("Return\n"));
       ent.which=EW_RET;
@@ -3939,46 +3956,17 @@
     }
     return add_entry(&ent);
     case TOK_IFERRORS:
-      ent.which=EW_IFFLAG;
-      if (process_jump(line,1,&ent.offsets[0]) ||
-          process_jump(line,2,&ent.offsets[1])) PRINTHELP()
-      ent.offsets[2]=FLAG_OFFSET(exec_error);
-      ent.offsets[3]=0;//new value mask - clean error
-      SCRIPT_MSG(_T("IfErrors ?%") NPRIs _T(":%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_IFFLAG, line, FLAG_OFFSET(exec_error), 0); //new value mask - clean error
     case TOK_IFABORT:
-      ent.which=EW_IFFLAG;
-      if (process_jump(line,1,&ent.offsets[0]) ||
-          process_jump(line,2,&ent.offsets[1])) PRINTHELP()
-      ent.offsets[2]=FLAG_OFFSET(abort);
-      ent.offsets[3]=~0;//new value mask - keep flag
-      SCRIPT_MSG(_T("IfAbort ?%") NPRIs _T(":%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_IFFLAG, line, FLAG_OFFSET(abort), ~0); //new value mask - keep flag
     case TOK_CLEARERRORS:
-      ent.which=EW_SETFLAG;
-      ent.offsets[0]=FLAG_OFFSET(exec_error);
-      ent.offsets[1]=add_intstring(0);
-      SCRIPT_MSG(_T("ClearErrors\n"));
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_SETFLAG, line, FLAG_OFFSET(exec_error), add_intstring(0));
     case TOK_SETERRORS:
-      ent.which=EW_SETFLAG;
-      ent.offsets[0]=FLAG_OFFSET(exec_error);
-      ent.offsets[1]=add_intstring(1);
-      SCRIPT_MSG(_T("SetErrors\n"));
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_SETFLAG, line, FLAG_OFFSET(exec_error), add_intstring(1));
     case TOK_SETERRORLEVEL:
-      ent.which=EW_SETFLAG;
-      ent.offsets[0]=FLAG_OFFSET(errlvl);
-      ent.offsets[1]=add_string(line.gettoken_str(1));
-      SCRIPT_MSG(_T("SetErrorLevel: %") NPRIs _T("\n"),line.gettoken_str(1));
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_SETFLAG, line, FLAG_OFFSET(errlvl), add_string(line.gettoken_str(1)));
     case TOK_GETERRORLEVEL:
-      ent.which=EW_GETFLAG;
-      ent.offsets[0]=GetUserVarIndex(line, 1);
-      ent.offsets[1]=FLAG_OFFSET(errlvl);
-      if (line.gettoken_str(1)[0] && ent.offsets[0]<0) PRINTHELP()
-      SCRIPT_MSG(_T("GetErrorLevel: %") NPRIs _T("\n"),line.gettoken_str(1));
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_GETFLAG, line, FLAG_OFFSET(errlvl));
 #ifdef NSIS_SUPPORT_STROPTS
     case TOK_STRLEN:
       ent.which=EW_STRLEN;
@@ -4202,6 +4190,12 @@
           line.gettoken_str(2+a),line.gettoken_str(1+a),a?_T("sfn"):_T("lfn"));
       }
     return add_entry(&ent);
+    case TOK_GETKNOWNFOLDERPATH:
+      ent.which=EW_GETOSINFO;
+      ent.offsets[0]=0; // Operation
+      ent.offsets[1]=GetUserVarIndex(line, 1);
+      ent.offsets[2]=add_string(line.gettoken_str(2));
+    return add_entry(&ent);
     case TOK_SEARCHPATH:
       ent.which=EW_SEARCHPATH;
       ent.offsets[0]=GetUserVarIndex(line, 1);
@@ -4213,6 +4207,7 @@
     case TOK_SEARCHPATH:
     case TOK_GETTEMPFILENAME:
     case TOK_GETFULLPATHNAME:
+    case TOK_GETKNOWNFOLDERPATH:
       ERROR_MSG(_T("Error: %") NPRIs _T(" specified, NSIS_SUPPORT_FNUTIL not defined.\n"),  line.gettoken_str(0));
       return PS_ERROR;
 #endif //~ NSIS_SUPPORT_FNUTIL
@@ -4327,11 +4322,15 @@
         int a=1, iskeyop;
         if ((iskeyop = which_token == TOK_DELETEREGKEY))
         {
-          TCHAR *s=line.gettoken_str(a);
-          if (s[0] == _T('/'))
+          for (;; ++a)
           {
-            if (_tcsicmp(s,_T("/ifempty"))) PRINTHELP()
-            a++, ent.offsets[4]|=(DELREGKEY_ONLYIFNOSUBKEYS<<DELREGKEYFLAGSSHIFT);
+            switch(line.gettoken_enum(a,_T("/ifempty\0/ifnosubkeys\0/ifnovalues\0")))
+            {
+            case 0: ent.offsets[4]|=((DELREGKEY_ONLYIFNOSUBKEYS|DELREGKEY_ONLYIFNOVALUES)<<DELREGKEYFLAGSSHIFT); continue;
+            case 1: ent.offsets[4]|=((DELREGKEY_ONLYIFNOSUBKEYS                         )<<DELREGKEYFLAGSSHIFT); continue;
+            case 2: ent.offsets[4]|=((                          DELREGKEY_ONLYIFNOVALUES)<<DELREGKEYFLAGSSHIFT); continue;
+            }
+            break;
           }
           if (line.gettoken_str(a+2)[0]) PRINTHELP()
         }
@@ -4733,28 +4732,17 @@
       ret = add_entry_direct(EW_QUIT);
       if (ret != PS_OK) return ret;
 
-      SCRIPT_MSG(_T("Reboot! (WOW)\n"));
+      SCRIPT_MSG(_T("Reboot!\n"));
 
       DefineInnerLangString(NLF_INST_CORRUPTED);
     }
     return PS_OK;
     case TOK_IFREBOOTFLAG:
-      ent.which=EW_IFFLAG;
-      if (process_jump(line,1,&ent.offsets[0]) ||
-          process_jump(line,2,&ent.offsets[1])) PRINTHELP()
-      ent.offsets[2]=FLAG_OFFSET(exec_reboot);
-      ent.offsets[3]=~0;//new value mask - keep flag
-      SCRIPT_MSG(_T("IfRebootFlag ?%") NPRIs _T(":%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
-    return add_entry(&ent);
+      return add_flag_instruction_entry(which_token, EW_IFFLAG, line, FLAG_OFFSET(exec_reboot), ~0); //new value mask - keep flag
     case TOK_SETREBOOTFLAG:
-    {
-      ent.which=EW_SETFLAG;
-      ent.offsets[0]=FLAG_OFFSET(exec_reboot);
-      int k=line.gettoken_enum(1,_T("false\0true\0"));
-      if (k < 0) PRINTHELP()
-      ent.offsets[1]=add_intstring(k);
-    }
-    return add_entry(&ent);
+      ent.offsets[1] = line.gettoken_enum(1,_T("false\0true\0"));
+      if (ent.offsets[1] < 0) PRINTHELP()
+      return add_flag_instruction_entry(which_token, EW_SETFLAG, line, FLAG_OFFSET(exec_reboot), add_intstring(ent.offsets[1]));
 #else
     case TOK_REBOOT:
     case TOK_IFREBOOTFLAG:
@@ -4789,7 +4777,7 @@
       ent.offsets[2]=SECTION_FIELD_SET(name_ptr);
       ent.offsets[4]=add_string(line.gettoken_str(2));
       if (!IsIntOrUserVar(line,1)) PRINTHELP()
-      SCRIPT_MSG(_T("SectionSetText: %") NPRIs _T("->%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
+      SCRIPT_MSG(_T("SectionSetText: %") NPRIs _T("=%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
     return add_entry(&ent);
     case TOK_SECTIONGETTEXT:
       ent.which=EW_SECTIONSET;
@@ -4800,14 +4788,17 @@
       SCRIPT_MSG(_T("SectionGetText: %") NPRIs _T("->%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
     return add_entry(&ent);
     case TOK_SECTIONSETFLAGS:
+    {
+      int num, conv;
       ent.which=EW_SECTIONSET;
       ent.offsets[0]=add_string(line.gettoken_str(1));
-      ent.offsets[1]=add_string(line.gettoken_str(2));
+      ent.offsets[1]=(num=line.gettoken_intx(2,&conv), conv) ? add_intstring(num) : add_string(line.gettoken_str(2));
       ent.offsets[2]=SECTION_FIELD_SET(flags);
       ent.offsets[3]=1;
-      if (!IsIntOrUserVar(line,1) || !IsIntOrUserVar(line,2)) PRINTHELP()
-      SCRIPT_MSG(_T("SectionSetFlags: %") NPRIs _T("->%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
-    return add_entry(&ent);
+      if (!IsIntOrUserVar(line,1) || (!conv && !IsIntOrUserVar(line,2))) PRINTHELP()
+      SCRIPT_MSG(_T("SectionSetFlags: %") NPRIs _T("=%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
+      return add_entry(&ent);
+    }
     case TOK_SECTIONGETFLAGS:
       ent.which=EW_SECTIONSET;
       ent.offsets[0]=add_string(line.gettoken_str(1));
@@ -4821,7 +4812,7 @@
       ent.offsets[0]=add_string(line.gettoken_str(1));
       ent.offsets[1]=add_string(line.gettoken_str(2));
       ent.offsets[2]=1;
-      SCRIPT_MSG(_T("InstTypeSetText: %") NPRIs _T("->%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
+      SCRIPT_MSG(_T("InstTypeSetText: %") NPRIs _T("=%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
     return add_entry(&ent);
     case TOK_INSTTYPEGETTEXT:
       ent.which=EW_INSTTYPESET;
@@ -4832,12 +4823,16 @@
       SCRIPT_MSG(_T("InstTypeGetText: %") NPRIs _T("->%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
     return add_entry(&ent);
     case TOK_SECTIONSETINSTTYPES:
+    {
+      int num, conv;
       ent.which=EW_SECTIONSET;
       ent.offsets[0]=add_string(line.gettoken_str(1));
-      ent.offsets[1]=add_string(line.gettoken_str(2));
+      ent.offsets[1]=(num=line.gettoken_intx(2,&conv), conv) ? add_intstring(num) : add_string(line.gettoken_str(2));
       ent.offsets[2]=SECTION_FIELD_SET(install_types);
-      SCRIPT_MSG(_T("SectionSetInstTypes: %") NPRIs _T("->%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
-    return add_entry(&ent);
+      if (!IsIntOrUserVar(line,1) || (!conv && !IsIntOrUserVar(line,2))) PRINTHELP()
+      SCRIPT_MSG(_T("SectionSetInstTypes: %") NPRIs _T("=%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
+      return add_entry(&ent);
+    }
     case TOK_SECTIONGETINSTTYPES:
       ent.which=EW_SECTIONSET;
       ent.offsets[0]=add_string(line.gettoken_str(1));
@@ -4851,7 +4846,7 @@
       ent.offsets[0]=add_string(line.gettoken_str(1));
       ent.offsets[1]=add_string(line.gettoken_str(2));
       ent.offsets[2]=SECTION_FIELD_SET(size_kb);
-      SCRIPT_MSG(_T("SectionSetSize: %") NPRIs _T("->%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
+      SCRIPT_MSG(_T("SectionSetSize: %") NPRIs _T("=%") NPRIs _T("\n"),line.gettoken_str(1),line.gettoken_str(2));
     return add_entry(&ent);
     case TOK_SECTIONGETSIZE:
       ent.which=EW_SECTIONSET;
@@ -4899,15 +4894,15 @@
       ent.which=EW_LOADANDSETIMAGE;
       for (int i = 1; i < line.getnumtokens(); i++)
         if (!_tcsnicmp(line.gettoken_str(i),_T("/IMGID="),7)) {
-          ent.offsets[1]=_ttoi(line.gettoken_str(i)+7);
-          SCRIPT_MSG(_T("/IMGID=%d "),ent.offsets[1]);
+          ent.offsets[2]=_ttoi(line.gettoken_str(i)+7);
+          SCRIPT_MSG(_T("/IMGID=%d "),ent.offsets[2]);
         }
         else if (!_tcsicmp(line.gettoken_str(i),_T("/RESIZETOFIT"))) {
-          ent.offsets[2]=LASIF_FITCTLW|LASIF_FITCTLH;
+          ent.offsets[3]=LASIF_FITCTLW|LASIF_FITCTLH;
           SCRIPT_MSG(_T("/RESIZETOFIT "));
         }
-        else if (!ent.offsets[0]) {
-          ent.offsets[0]=add_string(line.gettoken_str(i));
+        else if (!ent.offsets[1]) {
+          ent.offsets[1]=add_string(line.gettoken_str(i));
           SCRIPT_MSG(_T("\"%") NPRIs _T("\" "), line.gettoken_str(i));
         }
         else {
@@ -4915,23 +4910,23 @@
           PRINTHELP();
         }
       SCRIPT_MSG(_T("\n"));
-      if (!ent.offsets[1])
+      if (!ent.offsets[2])
       {
-        ent.offsets[1]=branding_image_id;
+        ent.offsets[2]=branding_image_id;
         if (!branding_image_found) {
           ERROR_MSG(_T("\nError: no branding image found in chosen UI!\n"));
           return PS_ERROR;
         }
       }
-      ent.offsets[2]|=LASIF_LR_LOADFROMFILE|LASIF_STRID;
+      ent.offsets[0]=-1; // Outvar
+      ent.offsets[3]|=LASIF_LR_LOADFROMFILE|LASIF_STRID;
     }
     return add_entry(&ent);
     case TOK_LOADANDSETIMAGE:
     {
-      SCRIPT_MSG(_T("LoadAndSetImage: "));
       ent.which=EW_LOADANDSETIMAGE;
       int tidx = 1, conv = 1, fail = 0;
-      unsigned int flags = LASIF_HWND;
+      unsigned int flags = LASIF_HWND, lrflagsin;
       for (; tidx < line.getnumtokens(); tidx++)
       {
         if (!_tcsicmp(line.gettoken_str(tidx),_T("/EXERESOURCE"))) flags |= LASIF_EXERES;
@@ -4942,12 +4937,16 @@
         else if (!_tcsicmp(line.gettoken_str(tidx),_T("/GETDLGITEM"))) flags &= ~LASIF_HWND; // Reuses TOK_SETBRANDINGIMAGE functionality
         else { if (line.gettoken_str(tidx)[0] == '/') ++fail; break; }
       }
-      ent.offsets[1]=(flags & LASIF_HWND) ? add_string(line.gettoken_str(tidx+0)) : line.gettoken_int(tidx+0, &conv); fail += !conv; // HWND/CtrlId
-      flags |= (line.gettoken_int(tidx+1, &conv) & LASIM_IMAGE); fail += !conv;
-      flags |= (line.gettoken_int(tidx+2, &conv) & LASIM_LR); fail += !conv;
-      ent.offsets[0]=(flags & LASIF_STRID) ? add_string(line.gettoken_str(tidx+3)) : line.gettoken_int(tidx+3, &conv); fail += !conv; // Image path/resid
-      ent.offsets[2]=flags;
-      SCRIPT_MSG(_T("%") NPRIs _T(" %#x \"%") NPRIs _T("\" \n"), line.gettoken_str(tidx+0), flags, line.gettoken_str(tidx+3));
+      ent.offsets[2] = (flags & LASIF_HWND) ? add_string(line.gettoken_str(tidx+0)) : line.gettoken_int(tidx+0, &conv); fail |= !conv; // HWND/CtrlId
+      flags |= (line.gettoken_int(tidx+1, &conv) & LASIM_IMAGE); fail |= !conv; // IMAGE_*
+      flags |= ((lrflagsin = line.gettoken_intx(tidx+2, &conv)) & LASIM_LR); fail |= !conv; // LR_*
+      ent.offsets[1] = (flags & LASIF_STRID) ? add_string(line.gettoken_str(tidx+3)) : line.gettoken_int(tidx+3, &conv); fail |= !conv; // Image path/resid
+      ent.offsets[3] = flags; // Packed flags, IMAGE_* and LR_*
+      ent.offsets[0] = GetUserVarIndex(line, tidx+4); // Outvar
+      SCRIPT_MSG(_T("LoadAndSetImage %") NPRIs _T(" %#x \"%") NPRIs _T("\""), line.gettoken_str(tidx+0), flags, line.gettoken_str(tidx+3));
+      if (ent.offsets[0] >= 0) SCRIPT_MSG(_T(" ->%") NPRIs _T(""), line.gettoken_str(tidx+4));
+      SCRIPT_MSG(_T("\n"));
+      if ((lrflagsin & LASIM_LR) != lrflagsin) warning_fl(DW_PARSE_NUMBEROUTOFSPEC, _T("Out of spec: \"%") NPRIs _T("\""), line.gettoken_str(tidx+2));
       if (fail) PRINTHELP();
     }
     return add_entry(&ent);
@@ -4956,7 +4955,7 @@
     case TOK_LOADANDSETIMAGE:
       ERROR_MSG(_T("Error: %") NPRIs _T(" specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n"),line.gettoken_str(0));
       return PS_ERROR;
-#endif //~ NSIS_SUPPORT_CREATEFONT
+#endif //~ NSIS_CONFIG_ENHANCEDUI_SUPPORT
     case TOK_DEFVAR:
     {
       int a=1;
diff -Nru nsis-3.05/Source/scriptpp.cpp nsis-3.06.1/Source/scriptpp.cpp
--- nsis-3.05/Source/scriptpp.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/scriptpp.cpp	2020-04-22 21:14:55.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -992,6 +992,12 @@
 
     if (tc + onlyval1 != 6) goto badmathsyntax;
   }
+  else if (!_tcsicmp(define, _T("/intfmt")))
+  {
+    if (line.getnumtokens() != 5) PRINTHELPEX(cmdnam)
+    define = line.gettoken_str(2);
+    _stprintf(value = mathbuf, line.gettoken_str(3), line.gettoken_int(4));
+  }
   else
   {
     if (line.getnumtokens() >= 4) PRINTHELPEX(cmdnam)
diff -Nru nsis-3.05/Source/ShConstants.cpp nsis-3.06.1/Source/ShConstants.cpp
--- nsis-3.05/Source/ShConstants.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/ShConstants.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/ShConstants.h nsis-3.06.1/Source/ShConstants.h
--- nsis-3.05/Source/ShConstants.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/ShConstants.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of NSIS.
  * 
  * Copyright (C) 2003 Ramon
- * Copyright (C) 2003-2019 NSIS Contributors
+ * Copyright (C) 2003-2020 NSIS Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/strlist.cpp nsis-3.06.1/Source/strlist.cpp
--- nsis-3.05/Source/strlist.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/strlist.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/strlist.h nsis-3.06.1/Source/strlist.h
--- nsis-3.05/Source/strlist.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/strlist.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/tchar.h nsis-3.06.1/Source/tchar.h
--- nsis-3.05/Source/tchar.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/tchar.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
diff -Nru nsis-3.05/Source/Tests/preprocessor.nsi nsis-3.06.1/Source/Tests/preprocessor.nsi
--- nsis-3.05/Source/Tests/preprocessor.nsi	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/Tests/preprocessor.nsi	2020-05-02 21:53:41.000000000 +0000
@@ -186,6 +186,14 @@
 !define /redef /math OUT1 0x80000000 ^ 0x40000000
 ${ASSERT} '${OUT1} = 0xC0000000'
 
+!define /redef /intfmt OUT1 "0x%.3X" 42
+${ASSERT} '${OUT1} = 0x02A'
+
+!pragma internal x OUT "0x10 | 0x40" ; NSD requires this when using LoadAndSetImage
+!if "${OUT}" <> 80
+  !error "math expression failed"
+!endif
+
 ; end math functions
 
 
@@ -292,6 +300,15 @@
   !warning "You can't see me" ; "disable all" is still in effect
 !pragma warning pop
 
+!if ! 1 <> 0
+  !error "1 is not 0"
+!endif
+!pragma warning push
+!pragma warning disable 7070 ; Invalid number
+!if Hello <> 0
+  !error "Hello is not a number"
+!endif
+!pragma warning pop
 
 # test !searchparse
 !searchparse "AbcDef" "Abc" OUT1
diff -Nru nsis-3.05/Source/tokens.cpp nsis-3.06.1/Source/tokens.cpp
--- nsis-3.05/Source/tokens.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/tokens.cpp	2020-07-25 20:13:13.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@
 {TOK_DBOPTIMIZE,_T("SetDatablockOptimize"),1,0,_T("(off|on)"),TP_ALL},
 {TOK_DELETEINISEC,_T("DeleteINISec"),2,0,_T("ini_file section_name"),TP_CODE},
 {TOK_DELETEINISTR,_T("DeleteINIStr"),3,0,_T("ini_file section_name entry_name"),TP_CODE},
-{TOK_DELETEREGKEY,_T("DeleteRegKey"),2,1,_T("[/ifempty] root_key subkey\n    root_key=(HKCR[32|64]|HKLM[32|64]|HKCU[32|64]|HKU|HKCC|HKDD|HKPD|SHCTX)"),TP_CODE},
+{TOK_DELETEREGKEY,_T("DeleteRegKey"),2,-1,_T("[/ifempty | /ifnosubkeys | /ifnovalues] root_key subkey\n    root_key=(HKCR[32|64]|HKLM[32|64]|HKCU[32|64]|HKU|HKCC|HKDD|HKPD|SHCTX)"),TP_CODE},
 {TOK_DELETEREGVALUE,_T("DeleteRegValue"),3,0,_T("root_key subkey entry_name\n    root_key=(HKCR[32|64]|HKLM[32|64]|HKCU[32|64]|HKU|HKCC|HKDD|HKPD|SHCTX)"),TP_CODE},
 {TOK_DELETE,_T("Delete"),1,1,_T("[/REBOOTOK] filespec"),TP_CODE},
 {TOK_DETAILPRINT,_T("DetailPrint"),1,0,_T("message"),TP_CODE},
@@ -110,6 +110,7 @@
 {TOK_GETDLGITEM,_T("GetDlgItem"),3,0,_T("$(user_var: handle output) dialog item_id"),TP_CODE},
 {TOK_GETFULLPATHNAME,_T("GetFullPathName"),2,1,_T("[/SHORT] $(user_var: result) path_or_file"),TP_CODE},
 {TOK_GETTEMPFILENAME,_T("GetTempFileName"),1,1,_T("$(user_var: name output) [base_dir]"),TP_CODE},
+{TOK_GETKNOWNFOLDERPATH,_T("GetKnownFolderPath"),2,0,_T("$(user_var: result) knownfolderid"),TP_CODE},
 {TOK_HIDEWINDOW,_T("HideWindow"),0,0,_T(""),TP_CODE},
 {TOK_ICON,_T("Icon"),1,0,_T("local_icon.ico"),TP_GLOBAL},
 {TOK_IFABORT,_T("IfAbort"),1,1,_T("label_to_goto_if_abort [label_to_goto_if_no_abort]"),TP_CODE},
@@ -117,6 +118,7 @@
 {TOK_IFFILEEXISTS,_T("IfFileExists"),2,1,_T("filename label_to_goto_if_file_exists [label_to_goto_otherwise]"),TP_CODE},
 {TOK_IFREBOOTFLAG,_T("IfRebootFlag"),1,1,_T("jump_if_set [jump_if_not_set]"),TP_CODE},
 {TOK_IFSILENT,_T("IfSilent"),1,1,_T("jump_if_silent [jump_if_not_silent]"),TP_CODE},
+{TOK_IFRTLLANG,_T("IfRtlLanguage"),1,1,_T("goto_true [goto_false]"),TP_CODE},
 {TOK_INSTALLDIRREGKEY,_T("InstallDirRegKey"),3,0,_T("root_key subkey entry_name\n    root_key=(HKCR|HKLM|HKCU|HKU|HKCC|HKDD|HKPD)"),TP_GLOBAL},
 {TOK_INSTCOLORS,_T("InstallColors"),1,1,_T("(/windows | (foreground_color background_color))"),TP_GLOBAL},
 {TOK_INSTDIR,_T("InstallDir"),1,0,_T("default_install_directory"),TP_GLOBAL},
@@ -194,7 +196,7 @@
 {TOK_SETAUTOCLOSE,_T("SetAutoClose"),1,0,_T("(false|true)"),TP_CODE},
 {TOK_SETCTLCOLORS,_T("SetCtlColors"),2,2,_T("hwnd [/BRANDING] [text_color] [transparent|bg_color]"),TP_CODE},
 {TOK_SETBRANDINGIMAGE,_T("SetBrandingImage"),1,2,_T("[/IMGID=image_item_id_in_dialog] [/RESIZETOFIT] bitmap.bmp"),TP_CODE},
-{TOK_LOADANDSETIMAGE,_T("LoadAndSetImage"),4,4,_T("[/EXERESOURCE] [/STRINGID] [/RESIZETOFIT[WIDTH|HEIGHT]] ctrl imagetype lrflags image"),TP_CODE},
+{TOK_LOADANDSETIMAGE,_T("LoadAndSetImage"),4,6,_T("[/EXERESOURCE] [/STRINGID] [/RESIZETOFIT[WIDTH|HEIGHT]] ctrl imagetype lrflags imageid [$(user_var: imagehandle)]"),TP_CODE},
 {TOK_SETCOMPRESS,_T("SetCompress"),1,0,_T("(off|auto|force)"),TP_ALL},
 {TOK_SETCOMPRESSOR,_T("SetCompressor"),1,2,_T("[/FINAL] [/SOLID] (zlib|bzip2|lzma)"),TP_GLOBAL},
 {TOK_SETCOMPRESSORDICTSIZE,_T("SetCompressorDictSize"),1,0,_T("dict_size_mb"),TP_ALL},
@@ -211,8 +213,12 @@
 {TOK_SETOVERWRITE,_T("SetOverwrite"),1,0,_T("on|off|try|ifnewer|ifdiff"),TP_ALL},
 {TOK_SETPLUGINUNLOAD,_T("SetPluginUnload"),1,0,_T("deprecated - plug-ins should handle this on their own"),TP_ALL},
 {TOK_SETREBOOTFLAG,_T("SetRebootFlag"),1,0,_T("true|false"),TP_CODE},
+{TOK_GETREGVIEW,_T("GetRegView"),1,0,_T("$(user_var: output)"),TP_CODE},
 {TOK_SETREGVIEW,_T("SetRegView"),1,0,_T("32|64|default|lastused"),TP_CODE},
+{TOK_IFALTREGVIEW,_T("IfAltRegView"),1,1,_T("goto_true [goto_false]"),TP_CODE},
+{TOK_GETSHELLVARCONTEXT,_T("GetShellVarContext"),1,0,_T("$(user_var: output)"),TP_CODE},
 {TOK_SETSHELLVARCONTEXT,_T("SetShellVarContext"),1,0,_T("all|current"),TP_CODE},
+{TOK_IFSHELLVARCONTEXTALL,_T("IfShellVarContextAll"),1,1,_T("goto_true [goto_false]"),TP_CODE},
 {TOK_SETSILENT,_T("SetSilent"),1,0,_T("silent|normal"),TP_CODE},
 {TOK_SHOWDETAILS,_T("ShowInstDetails"),1,0,_T("(hide|show|nevershow)"),TP_GLOBAL},
 {TOK_SHOWDETAILSUNINST,_T("ShowUninstDetails"),1,0,_T("(hide|show|nevershow)"),TP_GLOBAL},
@@ -257,6 +263,7 @@
 {TOK_PESUBSYSVER,_T("PESubsysVer"),1,0,_T("major.minor"),TP_GLOBAL},
 {TOK_XPSTYLE,_T("XPStyle"),1,0,_T("(on|off)"),TP_GLOBAL},
 {TOK_REQEXECLEVEL,_T("RequestExecutionLevel"),1,0,_T("none|user|highest|admin"),TP_GLOBAL},
+{TOK_MANIFEST_APPENDCUSTOMSTRING,_T("ManifestAppendCustomString"),2,0,_T("path string"),TP_GLOBAL},
 {TOK_MANIFEST_DPIAWARE,_T("ManifestDPIAware"),1,0,_T("notset|true|false"),TP_GLOBAL},
 {TOK_MANIFEST_DPIAWARENESS,_T("ManifestDPIAwareness"),1,0,_T("comma_separated_string"),TP_GLOBAL},
 {TOK_MANIFEST_LPAWARE,_T("ManifestLongPathAware"),1,0,_T("notset|true|false"),TP_GLOBAL},
@@ -269,14 +276,14 @@
 {TOK_P_SYSTEMEXEC,_T("!system"),1,2,_T("command [<OP retval> | <retvalsymbol>]\n    OP=(< > <> =)"),TP_ALL},
 {TOK_P_EXECUTE,_T("!execute"),1,2,_T("command [<OP retval> | <retvalsymbol>]\n    OP=(< > <> =)"),TP_ALL},
 {TOK_P_MAKENSIS,_T("!makensis"),1,2,_T("parameters [<OP retval> | <retvalsymbol>]"),TP_ALL},
-{TOK_P_ADDINCLUDEDIR,_T("!AddIncludeDir"),1,0,_T("dir"),TP_ALL},
+{TOK_P_ADDINCLUDEDIR,_T("!addincludedir"),1,0,_T("dir"),TP_ALL},
 {TOK_P_INCLUDE,_T("!include"),1,2,_T("[/NONFATAL] [/CHARSET=<") TSTR_INPUTCHARSET _T(">] filename.nsh"),TP_ALL},
 {TOK_P_CD,_T("!cd"),1,0,_T("absolute_or_relative_new_directory"),TP_ALL},
 {TOK_P_IF,_T("!if"),1,3,_T("[!] (value [(==,!=,S==,S!=,=,<>,<=,<,>,>=,&,&&,||) value2] | /FILEEXISTS path)"),TP_ALL},
 {TOK_P_IFDEF,_T("!ifdef"),1,-1,_T("symbol [| symbol2 [& symbol3 [...]]]"),TP_ALL},
 {TOK_P_IFNDEF,_T("!ifndef"),1,-1,_T("symbol [| symbol2 [& symbol3 [...]]]"),TP_ALL},
 {TOK_P_ENDIF,_T("!endif"),0,0,_T(""),TP_ALL},
-{TOK_P_DEFINE,_T("!define"),1,5,_T("[/ifndef | /redef] ([/date|/utcdate] symbol [value]) | (/file symbol filename) | (/math symbol val1 OP val2)\n    OP=(+ - * / % << >> >>> & | ^ ~ ! && ||)"),TP_ALL},
+{TOK_P_DEFINE,_T("!define"),1,5,_T("[/ifndef | /redef] ([/date|/utcdate] symbol [value]) | (/file symbol filename) | (/intfmt gflag fmtstr value) | (/math symbol val1 OP val2)\n    OP=(+ - * / % << >> >>> & | ^ ~ ! && ||)"),TP_ALL},
 {TOK_P_UNDEF,_T("!undef"),1,-1,_T("[/noerrors] symbol [...]"),TP_ALL},
 {TOK_P_ELSE,_T("!else"),0,-1,_T("[if[macro][n][def] ...]"),TP_ALL},
 {TOK_P_ECHO,_T("!echo"),1,0,_T("message"),TP_ALL},
@@ -313,7 +320,7 @@
 {TOK_GETLABELADDR,_T("GetLabelAddress"),2,0,_T("output label"),TP_CODE},
 {TOK_GETCURRENTADDR,_T("GetCurrentAddress"),1,0,_T("output"),TP_CODE},
 
-{TOK_PLUGINDIR,_T("!AddPluginDir"),1,1,_T("[/target] new_plugin_directory"),TP_ALL},
+{TOK_PLUGINDIR,_T("!addplugindir"),1,1,_T("[/target] new_plugin_directory"),TP_ALL},
 {TOK_INITPLUGINSDIR,_T("InitPluginsDir"),0,0,_T(""),TP_CODE},
 // Added by ramon 23 May 2003
 {TOK_ALLOWSKIPFILES,_T("AllowSkipFiles"),1,0,_T("(off|on)"),TP_ALL},
diff -Nru nsis-3.05/Source/tokens.h nsis-3.06.1/Source/tokens.h
--- nsis-3.05/Source/tokens.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/tokens.h	2020-07-25 20:13:13.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,6 +65,7 @@
   TOK_PESUBSYSVER,
   TOK_XPSTYLE,
   TOK_REQEXECLEVEL,
+  TOK_MANIFEST_APPENDCUSTOMSTRING,
   TOK_MANIFEST_DPIAWARE,
   TOK_MANIFEST_DPIAWARENESS,
   TOK_MANIFEST_LPAWARE,
@@ -280,6 +281,7 @@
 #endif
   TOK_FILESEEK,
   TOK_GETFULLPATHNAME,
+  TOK_GETKNOWNFOLDERPATH,
   TOK_REBOOT,
   TOK_IFREBOOTFLAG,
   TOK_SETREBOOTFLAG,
@@ -300,8 +302,12 @@
   TOK_INSTTYPEGETTEXT,
   TOK_GETCURINSTTYPE,
   TOK_SETCURINSTTYPE,
+  TOK_GETREGVIEW,
   TOK_SETREGVIEW,
+  TOK_IFALTREGVIEW,
+  TOK_GETSHELLVARCONTEXT,
   TOK_SETSHELLVARCONTEXT,
+  TOK_IFSHELLVARCONTEXTALL,
   TOK_PLUGINDIR,
   TOK_INITPLUGINSDIR,
   TOK_CREATEFONT,
@@ -311,6 +317,7 @@
   TOK_IFSILENT,
   TOK_SETERRORLEVEL,
   TOK_GETERRORLEVEL,
+  TOK_IFRTLLANG,
   TOK_LOCKWINDOW,
 
   TOK__LAST,
diff -Nru nsis-3.05/Source/tstring.cpp nsis-3.06.1/Source/tstring.cpp
--- nsis-3.05/Source/tstring.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/tstring.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
 //
 // This file is a part of Unicode NSIS.
 //
-// Copyright (C) 2007-2019 Jim Park
+// Copyright (C) 2007-2020 Jim Park
 //
 // Licensed under the zlib/libpng license (the "License");
 // you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/tstring.h nsis-3.06.1/Source/tstring.h
--- nsis-3.05/Source/tstring.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/tstring.h	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
 //
 // This file is a part of Unicode NSIS.
 //
-// Copyright (C) 2007-2019 Jim Park
+// Copyright (C) 2007-2020 Jim Park
 //
 // Licensed under the zlib/libpng license (the "License");
 // you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/uservars.h nsis-3.06.1/Source/uservars.h
--- nsis-3.05/Source/uservars.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/uservars.h	2020-01-01 21:13:57.000000000 +0000
@@ -4,7 +4,7 @@
  * This file is a part of NSIS.
  * 
  * Copyright (C) 2003 Ramon
- * Copyright (C) 2003-2019 NSIS Contributors
+ * Copyright (C) 2003-2020 NSIS Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/utf.cpp nsis-3.06.1/Source/utf.cpp
--- nsis-3.05/Source/utf.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/utf.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2011-2019 Anders Kjersem
+ * Copyright (C) 2011-2020 Anders Kjersem
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/utf.h nsis-3.06.1/Source/utf.h
--- nsis-3.05/Source/utf.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/utf.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2011-2019 Anders Kjersem
+ * Copyright (C) 2011-2020 Anders Kjersem
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/util.cpp nsis-3.06.1/Source/util.cpp
--- nsis-3.05/Source/util.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/util.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/util.h nsis-3.06.1/Source/util.h
--- nsis-3.05/Source/util.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/util.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/validateunicode.cpp nsis-3.06.1/Source/validateunicode.cpp
--- nsis-3.05/Source/validateunicode.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/validateunicode.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
 //
 // This file is a part of Unicode NSIS.
 //
-// Copyright (C) 2009-2019 Jim Park
+// Copyright (C) 2009-2020 Jim Park
 //
 // Licensed under the zlib/libpng license (the "License");
 // you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/validateunicode.h nsis-3.06.1/Source/validateunicode.h
--- nsis-3.05/Source/validateunicode.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/validateunicode.h	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
 //
 // This file is a part of Unicode NSIS.
 //
-// Copyright (C) 2009-2019 Jim Park
+// Copyright (C) 2009-2020 Jim Park
 //
 // Licensed under the zlib/libpng license (the "License");
 // you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/winchar.cpp nsis-3.06.1/Source/winchar.cpp
--- nsis-3.05/Source/winchar.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/winchar.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/winchar.h nsis-3.06.1/Source/winchar.h
--- nsis-3.05/Source/winchar.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/winchar.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/writer.cpp nsis-3.06.1/Source/writer.cpp
--- nsis-3.05/Source/writer.cpp	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/writer.cpp	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/writer.h nsis-3.06.1/Source/writer.h
--- nsis-3.05/Source/writer.h	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/writer.h	2020-01-01 21:13:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru nsis-3.05/Source/zlib/INFBLOCK.C nsis-3.06.1/Source/zlib/INFBLOCK.C
--- nsis-3.05/Source/zlib/INFBLOCK.C	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/zlib/INFBLOCK.C	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the zlib compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.zlib.net/
diff -Nru nsis-3.05/Source/zlib/ZCONF.H nsis-3.06.1/Source/zlib/ZCONF.H
--- nsis-3.05/Source/zlib/ZCONF.H	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/zlib/ZCONF.H	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the zlib compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.zlib.net/
diff -Nru nsis-3.05/Source/zlib/ZLIB.H nsis-3.06.1/Source/zlib/ZLIB.H
--- nsis-3.05/Source/zlib/ZLIB.H	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/zlib/ZLIB.H	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the zlib compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.zlib.net/
diff -Nru nsis-3.05/Source/zlib/ZUTIL.H nsis-3.06.1/Source/zlib/ZUTIL.H
--- nsis-3.05/Source/zlib/ZUTIL.H	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/Source/zlib/ZUTIL.H	2020-01-01 21:13:57.000000000 +0000
@@ -2,7 +2,7 @@
  * This file is a part of the zlib compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2019 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.zlib.net/
diff -Nru nsis-3.05/.travis.yml nsis-3.06.1/.travis.yml
--- nsis-3.05/.travis.yml	2020-01-13 19:44:30.000000000 +0000
+++ nsis-3.06.1/.travis.yml	2020-08-01 00:25:37.000000000 +0000
@@ -15,16 +15,22 @@
 - mkdir /tmp/zlib
 - unzip /tmp/zlib.zip -d /tmp/zlib
 script:
-- scons ZLIB_W32=/tmp/zlib SKIPUTILS="NSIS Menu" NSIS_CONFIG_LOG=$CFG_LOG test dist-zip
+- set -o pipefail && scons ZLIB_W32=/tmp/zlib SKIPUTILS="NSIS Menu" NSIS_CONFIG_LOG=$CFG_LOG test dist-zip | tee build.log
+- zip nsis-*.zip build.log
 env:
 - CFG_LOG=yes
 - CFG_LOG=no
 deploy:
   provider: script
-  script: echo this is where we will deploy to SF
+  skip_cleanup: true
+  script: echo $DEPLOY_KEY | base64 -d > deploy_key && chmod 600 deploy_key && ssh -o "BatchMode yes" -i deploy_key -T kichik,nsis@shell.sourceforge.net create && cat nsis-*.zip | ssh -o "BatchMode yes" -i deploy_key kichik,nsis@shell.sourceforge.net /home/project-web/nsis/bin/nightly-deploy.sh
   on:
     branch: master
-    condition: "$CFG_LOG = no -a $TRAVIS_OS_NAME = linux"
+    repo: kichik/nsis
+    condition: "$CFG_LOG = no && $TRAVIS_OS_NAME = linux"
+after_deploy: rm -f deploy_key
+addons:
+  ssh_known_hosts: shell.sourceforge.net
 notifications:
   slack:
     secure: Q61wSM9pOKiRp3WDNinMkZd+HWp6BFe+TlZDKoJgZJstMIT48TtkAaVmqW2h4HXtNxP9HvD1vzXqWGqGMG8vIO6hlQO5Rm/ruVa/rfb1kxLfD/dv+g/63ZloF3QmKKK++xeYKVNmPRVi7aSFjpx1wa+eG4rYPf0frc5XSFDuhVQ=