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

Merging various fixes from latest Jim Park repository

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6096 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-05-28 14:09:08 +00:00
parent 23fe81e16e
commit 74ffaada4e
4 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/script.cpp
View file

@ -3144,7 +3144,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
*++p=0;
bool endSlash = (str[0] && str[_tcslen(str)-1] == _T('\\'));
if (tmpstr.getlen() || endSlash) tmpstr.add(str,_tcslen(str));
if (tmpstr.getlen() || endSlash) tmpstr.add(str,sizeof(TCHAR)*_tcslen(str));
// if we have valid contents and not ending on slash, then done
if (!endSlash && (str[0] || tmpstr.getlen())) break;
@ -3155,7 +3155,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
TCHAR *thisline=str;
if (tmpstr.getlen())
{
tmpstr.add(_T("\0"),1);
tmpstr.add(_T("\0"),sizeof(TCHAR));
thisline=(TCHAR *)tmpstr.get();
}
@ -3233,15 +3233,15 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
while (*src)
{
if (ignoreCase ? _tcsnicmp(src,search,searchlen) : _tcsncmp(src,search,searchlen))
valout.add(src++,1);
valout.add(src++,sizeof(TCHAR));
else
{
valout.add(replace,replacelen);
valout.add(replace,sizeof(TCHAR)*replacelen);
src+=searchlen;
}
}
valout.add(_T(""),1);
valout.add(_T(""),sizeof(TCHAR));
definedlist.del(define); // allow changing variables since we'll often use this in series