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

Updated changelog and fixed minor documentation bugs (bug #3063566, bug #3567313)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6322 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-03-27 02:50:27 +00:00
parent d5962e9b67
commit e173cd33a4
8 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Contrib/nsDialogs/Readme.html
View file

@ -651,7 +651,7 @@ SectionEnd</pre></blockquote>
<h3><a name="mref-onback"></a>NSD_OnBack</h3>
<p><code>${NSD_OnBack} <i>function_address</i></code></p>
<p><code>${NSD_OnBack} <i>function_name</i></code></p>
<p>See <a href="#ref-onback">OnBack</a> for more details.</p>
@ -659,7 +659,7 @@ SectionEnd</pre></blockquote>
<h3><a name="mref-onchange"></a>NSD_OnChange</h3>
<p><code>${NSD_OnChange} <i>control_HWND</i> <i>function_address</i></code></p>
<p><code>${NSD_OnChange} <i>control_HWND</i> <i>function_name</i></code></p>
<p>See <a href="#ref-onchange">OnChange</a> for more details.</p>
@ -667,25 +667,25 @@ SectionEnd</pre></blockquote>
<h3><a name="mref-onclick"></a>NSD_OnClick</h3>
<p><code>${NSD_OnClick} <i>control_HWND</i> <i>function_address</i></code></p>
<p><code>${NSD_OnClick} <i>control_HWND</i> <i>function_name</i></code></p>
<p>See <a href="#ref-onclick">OnClick</a> for more details.</p>
<h3><a name="mref-onnotify"></a>NSD_OnNotify</h3>
<p><code>${NSD_OnNotify} <i>control_HWND</i> <i>function_address</i></code></p>
<p><code>${NSD_OnNotify} <i>control_HWND</i> <i>function_name</i></code></p>
<p>See <a href="#ref-onnotify">OnNotify</a> for more details.</p>
<h3><a name="mref-createtimer"></a>NSD_CreateTimer</h3>
<p><code>${NSD_CreateTimer} <i>function_address</i> <i>timer_interval</i></code></p>
<p><code>${NSD_CreateTimer} <i>function_name</i> <i>timer_interval</i></code></p>
<p>See <a href="#ref-createtimer">CreateTimer</a> for more details.</p>
<h3><a name="mref-killtimer"></a>NSD_KillTimer</h3>
<p><code>${NSD_KillTimer} <i>function_address</i></code></p>
<p><code>${NSD_KillTimer} <i>function_name</i></code></p>
<p>See <a href="#ref-killtimer">KillTimer</a> for more details.</p>
@ -876,7 +876,7 @@ SectionEnd</pre></blockquote>
<p><code>${NSD_SetIconFromInstaller} <i>control_HWND</i> <i>output_variable</i></code></p>
<p>Loads the icon used in the isntaller and displays it on <i>control_HWND</i> created by <a href="#mref-create">${NSD_CreateIcon}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freeicon">${NSD_FreeIcon}</a> once no longer necessary.</p>
<p>Loads the icon used in the installer and displays it on <i>control_HWND</i> created by <a href="#mref-create">${NSD_CreateIcon}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freeicon">${NSD_FreeIcon}</a> once no longer necessary.</p>
<h3><a name="mref-clearimage"></a>NSD_ClearImage</h3>

2
Docs/src/basic.but
View file

@ -96,7 +96,7 @@ will match the directory named \e{something} on the root directory, the file nam
\c File /r something\*.*
When adding \e{\\*.*}, it will be used as the matching condition and \e{something} will be used as the directory to search. When only \e{something} is specified, the current directory will be recursively searched for every and directory named \e{something} and \e{another\\something} will be matched.
When adding \e{\\*.*}, it will be used as the matching condition and \e{something} will be used as the directory to search. When only \e{something} is specified, the current directory will be recursively searched for every file and directory named \e{something} and \e{another\\something} will be matched.
\S2{rename} Rename

2
Docs/src/file.but
View file

@ -107,7 +107,7 @@ Seeks a file opened with \R{FileOpen}{FileOpen}. If mode is omitted or specified
Writes an ANSI string to a file opened with \R{FileOpen}{FileOpen}. If an error occurs writing, the error flag will be set.
(If you are building a \R{intro-unicode}{Unicode installer}, the function makes the adequate conversion and writes an ANSI string)
(If you are building a \R{intro-unicode}{Unicode installer}, the function converts the string to ANSI/MBCS. The \NsisACPcp is used during the conversion)
\c ClearErrors
\c FileOpen $0 $INSTDIR\file.dat w

26
Docs/src/history.but
View file

@ -4,10 +4,34 @@
Released on ?, 2013
\S1{v3.0a0-rl} Release Notes
\b MakeNSIS can now generate ANSI and \R{intro-unicode}{Unicode} installers. Source files can be UTF8SIG, UTF16LE or traditional MBCS text files (which are converted to Unicode with ACP unless you specify a different codepage). Plugins are now stored in sub-folders based on their CPU target and character set encoding.
\S1{v3.0a0-cl} Changelog
\S2{} Major Changes
\b Added the \R{aunicodetarget}{Unicode} attribute (\W{http://sourceforge.net/support/tracker.php?aid=1238132}{RFE #1238132}, \W{http://sourceforge.net/support/tracker.php?aid=1795257}{patch #1795257})
\b MakeNSIS can read UTF8SIG and UTF16LE script files (\W{http://sourceforge.net/support/tracker.php?aid=2026892}{RFE #2026892})
\b All NLF and NSH language files are stored in Unicode (\W{http://sourceforge.net/support/tracker.php?aid=1879642}{RFE #1879642})
\b Scripts can control the SupportedOS list in the application manifest using \R{amanifestsupportedos}{ManifestSupportedOS} (\W{http://sourceforge.net/support/tracker.php?aid=2725883}{bug #2725883}\#{RFE 3020103?})
\b Installers can claim DPI-awareness with \R{amanifestdpiaware}{ManifestDPIAware} (\W{http://sourceforge.net/support/tracker.php?aid=2897169}{bug #2897169})
\b The index of the changed section is stored in $0 during .onSelChange callbacks (\W{http://sourceforge.net/support/tracker.php?aid=1634936}{RFE #1634936})
\S2{} Minor Changes
\b %temp%\\Low will be used if the installer cannot write to %temp% nor %windir%\\Temp (\W{http://sourceforge.net/support/tracker.php?aid=2909242}{bug #2909242}, \W{http://sourceforge.net/support/tracker.php?aid=2912824}{patch #2912824})
\b Added $\{NSIS_PACKEDVERSION\}, the NSIS version packed in a hex number (\W{http://sourceforge.net/support/tracker.php?aid=2680832}{patch #2680832})
\b Added UnsafeStrCpy instruction, it can write to special variables like $PLUGINSDIR
\b Plugins in $\{NSISDIR\}\\Plugins have to be reserved with \c{ReserveFile /plugin}
\b MakeNSIS /NOTIFYHWND uses a (optional) new event name to abort compilation, see build.cpp/h for details.
@ -16,6 +40,8 @@ Released on ?, 2013
\b Fixed minor MakeNSIS leaks (\W{http://sourceforge.net/support/tracker.php?aid=3474662}{bug #3474662})
\b Various documentation fixes (bug #3063566, bug #3567313)
\S2{} Translations
\b Changed LANGFILE macro in LangFile.nsh

2
Source/build.cpp
View file

@ -310,7 +310,7 @@ CEXEBuild::CEXEBuild() :
InitLangTables();
// Register static user variables $0, $1 and so on
// with ONE of reference count, to avoid warning on this vars
// with ONE of reference count, to avoid warning on these vars
TCHAR Aux[3];
int i;
for (i = 0; i < 10; i++) // 0 - 9

2
Source/exehead/Main.c
View file

@ -179,6 +179,8 @@ EXTERN_C void NSISWinMainNOCRT()
mystrcat(state_temp_dir, _T("\\Temp"));
if (!ValidateTempDir())
{
// Bug #2909242:
// When running at <= Low IL we cannot write to %Temp% but we can try the temp folder used by IE.
// There does not seem to be a API to get the low temp dir directly, so we build the path on our own
GetTempPath(NSIS_MAX_STRLEN - 4, state_temp_dir); // leave space for \Low

2
Source/lineparse.cpp
View file

@ -132,7 +132,7 @@ TCHAR* LineParser::gettoken_str(int token)
return m_tokens[token];
}
int LineParser::gettoken_enum(int token, const TCHAR *strlist) // null seperated list
int LineParser::gettoken_enum(int token, const TCHAR *strlist) // null separated list
{
int x=0;
TCHAR *tt=gettoken_str(token);

2
Source/lineparse.h
View file

@ -36,7 +36,7 @@ class LineParser {
int gettoken_int(int token, int *success=0);
double gettoken_number(int token, int *success=0);
TCHAR *gettoken_str(int token);
int gettoken_enum(int token, const TCHAR *strlist); // null seperated list
int gettoken_enum(int token, const TCHAR *strlist); // null separated list
private: