Import Upstream version 2.45

6 files changed, 66 insertions, 5 deletions

diff --git a/Docs/src/SConscript b/Docs/src/SConscript
index 8468280..f10f808 100755
--- a/Docs/src/SConscript
+++ b/Docs/src/SConscript
@@ -74,7 +74,7 @@ def fix_html(target, source, env):
 	return None
 
 if build_chm:
-	hhc_action = Action(r'cd \ && hhc "%s\nsis.hhp"' % (build_dir))
+	hhc_action = Action(r'cd %s && hhc nsis.hhp' % build_dir)
 
 	chm_builder = Builder(
 		action = [
diff --git a/Docs/src/attributes.but b/Docs/src/attributes.but
index 98b5226..a797b15 100755
--- a/Docs/src/attributes.but
+++ b/Docs/src/attributes.but
@@ -181,7 +181,7 @@ If `DirVerify leave' is used, the Next button will not be disabled if the instal
 
 \c file error text
 
-Replaces the default text that comes up when a file cannot be written to. This string can contain a reference to $0, which is the filename ($0 is temporarily changed to this value). Example: "Can not write to file $\\r$\\n$0$\\r$\\ngood luck, bitch.".
+Replaces the default text that comes up when a file cannot be written to. This string can contain a reference to $0, which is the filename ($0 is temporarily changed to this value). Example: "Can not write to file $\\r$\\n$0$\\r$\\ngood luck.".
 
 Accepts variables. If variables are used, they must be initialized before \R{file}{File} is used.
 
@@ -310,7 +310,7 @@ Specifies the output file that the MakeNSIS should write the installer to. This
 
 \c \\<b\\>none\\</b\\>|user|highest|admin
 
-Specifies the requested execution level for Windows Vista. The value is embedded in the installer and uninstaller's XML manifest and tells Vista, and probably future versions of Windows, what privileges level the installer requires. \e{user} requests the a normal user's level with no administrative privileges. \e{highest} will request the highest execution level available for the current user and will cause Windows to prompt the user to verify privilege escalation. The prompt might request for the user's password. \e{admin} requests administrator level and will cause Windows to prompt the user as well. Specifying \e{none}, which is also the default, will keep the manifest empty and let Windows decide which execution level is required. Windows Vista automatically identifies NSIS installers and decides administrator privileges are required. Because of this, \e{none} and \e{admin} have virtually the same effect.
+Specifies the requested execution level for Windows Vista and Windows 7. The value is embedded in the installer and uninstaller's XML manifest and tells Vista/7, and probably future versions of Windows, what privileges level the installer requires. \e{user} requests the a normal user's level with no administrative privileges. \e{highest} will request the highest execution level available for the current user and will cause Windows to prompt the user to verify privilege escalation. The prompt might request for the user's password. \e{admin} requests administrator level and will cause Windows to prompt the user as well. Specifying \e{none}, which is also the default, will keep the manifest empty and let Windows decide which execution level is required. Windows Vista/7 automatically identifies NSIS installers and decides administrator privileges are required. Because of this, \e{none} and \e{admin} have virtually the same effect.
 
 It's recommended, at least by Microsoft, that every application will be marked with the required execution level. Unmarked installers are subject to compatibility mode. Workarounds of this mode include automatically moving any shortcuts created in the user's start menu to all users' start menu. Installers that need not install anything into system folders or write to the local machine registry (HKLM) should specify \e{user} execution level.
 
diff --git a/Docs/src/basic.but b/Docs/src/basic.but
index 03a81e9..65544da 100755
--- a/Docs/src/basic.but
+++ b/Docs/src/basic.but
@@ -23,7 +23,7 @@ Execute the specified program and continue immediately. Note that the file speci
 
 \S2{execshell} ExecShell
 
-\c action command [parameters] [SW_SHOWNORMAL | SW_SHOWMAXIMIZED | SW_SHOWMINIMIZED | SW_HIDE]
+\c action command [parameters] [SW_SHOWDEFAULT | SW_SHOWNORMAL | SW_SHOWMAXIMIZED | SW_SHOWMINIMIZED | SW_HIDE]
 
 Execute the specified program using ShellExecute. Note that action is usually "open", "print", etc, but can be an empty string to use the default action. Parameters and the show type are optional. $OUTDIR is used for the working directory. The error flag is set if the process could not be launched.
 
diff --git a/Docs/src/compiler.but b/Docs/src/compiler.but
index e344105..cf02c31 100755
--- a/Docs/src/compiler.but
+++ b/Docs/src/compiler.but
@@ -178,6 +178,10 @@ Time when the script started compiling according to the current locale.
 
 Date & time of the last modification to the script file according to the current locale.
 
+\S1{prensisversion} $\{NSIS_VERSION\}
+
+NSIS version used to build the script.
+
 \S1{scopepredefines} Scope Predefines
 
 Standard predefines that contain information of the current code scope.
diff --git a/Docs/src/file.but b/Docs/src/file.but
index 5194899..11fa036 100755
--- a/Docs/src/file.but
+++ b/Docs/src/file.but
@@ -104,6 +104,7 @@ Performs a search for 'filespec', placing the first file found in filename_outpu
 \c   FindNext $0 $1
 \c   Goto loop
 \c done:
+\c FindClose $0
 
 \S2{FindNext} FindNext
 
diff --git a/Docs/src/history.but b/Docs/src/history.but
index 6d6344f..d44a0a9 100755
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -1,5 +1,61 @@
 \A{history} Changelog and Release Notes
 
+\H{v2.45} 2.45
+
+Released on June 6th, 2009
+
+\S1{v2.45-rl} Release Notes
+
+\b Support for Microsoft's upcoming release of Windows 7 has been added based on RC1 testing and documentation. Please report any related issues and don't forget to use \R{requestexecutionlevel}{RequestExecutionLevel}.
+
+\S1{v2.45-cl} Changelog
+
+\S2{} Major Changes
+
+\b Added support for Windows 7 installers - use \R{requestexecutionlevel}{RequestExecutionLevel}, just like with Vista (\W{http://sourceforge.net/support/tracker.php?aid=2725883}{bug #2725883})
+
+\b Added WinVer.nsh Windows 7 and Windows 2008 R2 support
+
+\b Installers now identify as Terminal Services aware (IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE) so $WINDIR will no longer be under the user's profile when installing on Terminal Services
+
+\b Less UAC annoyance in Add/Remove control panel (\W{http://sourceforge.net/support/tracker.php?aid=2697027}{bug #2697027})
+
+\S2{} Minor Changes
+
+\b Added wildcard and /nonfatal suppport for \R{delfile}{!delfile} (\W{http://sourceforge.net/support/tracker.php?aid=1505425}{RFE #1505425})
+
+\b Fixed \R{searchparse}{!searchparse} (\W{http://sourceforge.net/support/tracker.php?aid=2680110}{bug #2680110})
+
+\b Fixed input validation for \R{createfont}{CreateFont} (\W{http://sourceforge.net/support/tracker.php?aid=2801024}{bug #2801024})
+
+\b Fixed NSIS Menu handling of working directory (\W{http://sourceforge.net/support/tracker.php?aid=2781948}{bug #2781948})
+
+\b Fixed Vista issues with shell folders ($DOCUMENTS, $PROFILE, etc.) on root directories (\W{http://sourceforge.net/support/tracker.php?aid=2138075}{bug #2138075})
+
+\b Minor documentation improvements (including \W{http://sourceforge.net/support/tracker.php?aid=2705878}{bug #2705878}, \W{http://sourceforge.net/support/tracker.php?aid=2606525}{bug #2606525})
+
+\b Use SW_SHOWDEFAULT for \R{execshell}{ExecShell} by default (\W{http://sourceforge.net/support/tracker.php?aid=2796189}{bug #2796189})
+
+\S2{} Modern UI
+
+\b Call finish page show function only after the page is fully initialized (\W{http://sourceforge.net/support/tracker.php?aid=2720968}{bug #2720968})
+
+\b Fixed translation of uninstaller directory page (\W{http://sourceforge.net/support/tracker.php?aid=2690112}{bug #2690112})
+
+\b Fixed installation type text position in components page (\W{http://sourceforge.net/support/tracker.php?aid=2801317}{patch #2801317})
+
+\b Fixed missing MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE  (\W{http://sourceforge.net/support/tracker.php?aid=2788620}{bug #2788620})
+
+\S2{} Translations
+
+\b Updated Indonesian (\W{http://sourceforge.net/support/tracker.php?aid=2790571}{patch #2790571})
+
+\b Updated Portuguese BR (\W{http://sourceforge.net/support/tracker.php?aid=2642542}{patch #2642542})
+
+\S2{} Build System
+
+\b Fixed some GCC warnings
+
 \H{v2.44} 2.44
 
 Released on February 21st, 2009
@@ -1705,7 +1761,7 @@ Released on July 23rd, 2005
 \b Added per-user nsisconf.nsh file in %APPDATA% or $HOME, depending on the platform (\W{http://sourceforge.net/support/tracker.php?aid=1223041}{patch #1223041})
 
 \b Documentation improvements and fixes (including \W{http://sourceforge.net/support/tracker.php?aid=1202495}{bug #1202495}, \W{http://sourceforge.net/support/tracker.php?aid=1227610}{bug #1227610}, 
-\W{http://sourceforge.net/support/tracker.php?aid=1238686}{bug #1238686}, \W{http://sourceforge.net/support/tracker.php?aid=1225167}{patch #1225167}, \W{http://sourceforge.net/tracker/?group_id=22049&atid=373088&func=detail&aid=1240601}{RFE #1240601})
+\W{http://sourceforge.net/support/tracker.php?aid=1238686}{bug #1238686}, \W{http://sourceforge.net/support/tracker.php?aid=1225167}{patch #1225167}, \W{http://sourceforge.net/support/tracker.php?aid=1240601}{RFE #1240601})
 
 \b Fixed _?= being ignored, if the uninstaller path is not quoted and is separated with only space from _?=