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

Automatically double ampersands in the name attribute

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7131 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2019-10-24 22:15:30 +00:00
parent 2bae3414ba
commit 52cd125973
6 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Docs/src/history.but
View file

@ -36,6 +36,8 @@ ANSI targets are deprecated, consider moving to Unicode.
\b Zero uninitialized data in icon group (\W{http://sf.net/p/nsis/bugs/1230}{bug #1230})
\b Automatically doubles ampersands in the name attribute
\S2{} Translations
\b Updated Hindi (\W{http://sf.net/p/nsis/patches/291}{patch #291}) and Portuguese (\W{http://sf.net/p/nsis/bugs/1219}{bug #1219})

2
Source/build.h
View file

@ -508,7 +508,7 @@ class CEXEBuild {
* a PS_ERROR. If this function call is overwriting a set user string,
* this will return a PS_WARNING.
*/
int SetInnerString(int id, TCHAR *str);
int SetInnerString(int id, const TCHAR *str);
int GenerateLangTable(LanguageTable *lt, int num_lang_tables);
int GenerateLangTables();

2
Source/lang.cpp
View file

@ -517,7 +517,7 @@ int CEXEBuild::SetLangString(const TCHAR *name, LANGID lang, const TCHAR *str)
// @return If the id is invalid or the string is not valid, it will return a
// PS_ERROR. If this function call is overwriting a set user string, this
// will return a PS_WARNING.
int CEXEBuild::SetInnerString(int id, TCHAR *str) {
int CEXEBuild::SetInnerString(int id, const TCHAR *str) {
if ((unsigned int)id >= NLF_STRINGS || !str) return PS_ERROR;
int ret = PS_OK;

5
Source/script.cpp
View file

@ -1279,7 +1279,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{
if (SetInnerString(NLF_NAME,line.gettoken_str(1)) == PS_WARNING)
warning_fl(DW_INNERSTRING_MULTISETWASTE, _T("%") NPRIs _T(": specified multiple times, wasting space"),line.gettoken_str(0));
SetInnerString(NLF_NAME_DA,line.gettoken_str(2));
tstring da;
const TCHAR *normstr = line.gettoken_str(1), *dastr = line.gettoken_str(2);
if (!*dastr && _tcschr(normstr,_T('&'))) dastr = (da = replace_all(normstr,_T("&"),_T("&&"))).c_str();
SetInnerString(NLF_NAME_DA,dastr);
SCRIPT_MSG(_T("Name: \"%") NPRIs _T("\""),line.gettoken_str(1));
if (*line.gettoken_str(2))
SCRIPT_MSG(_T(" \"%") NPRIs _T("\""),line.gettoken_str(2));

10
Source/util.cpp
View file

@ -880,6 +880,16 @@ bool IsWindowsPathRelative(const TCHAR *p)
return PathGetDosDriveNumber(p) < 0;
}
tstring replace_all(const TCHAR *str, const TCHAR *find, const TCHAR *repl)
{
tstring out = str;
for (size_t cchF = _tcslen(find), cchR = _tcslen(repl), i = 0; ; i += cchR)
if ((i = out.find(find, i)) == tstring::npos)
return out;
else
out.replace(i, cchF, repl);
}
struct ToLower
{
TCHAR operator() (TCHAR c) const { return _totlower(c); }

1
Source/util.h
View file

@ -60,6 +60,7 @@ inline tstring& path_append(tstring& base, const tstring& more) { return path_ap
inline bool IsAgnosticPathSeparator(const TCHAR c) { return _T('\\') == c || _T('/') == c; }
bool IsWindowsPathRelative(const TCHAR *p);
tstring replace_all(const TCHAR*str, const TCHAR*find, const TCHAR* replace);
tstring lowercase(const tstring&);
tstring get_string_prefix(const tstring& str, const tstring& separator);
tstring get_string_suffix(const tstring& str, const tstring& separator);