Fix use of wrong MBCS version of string functions. (When playing with TCHAR pointers, most of the time you deal with a number of BYTE/WORD, not a number of multi-byte characters)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6051 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou
parent
57d296e159
commit
d7ffe58b2e
9 changed files with 90 additions and 90 deletions
|
|
@ -213,8 +213,8 @@ int tempzip_make(HWND hwndDlg, TCHAR *fn)
|
|||
#endif
|
||||
|
||||
if (filename[0] &&
|
||||
filename[_tcsclen(filename)-1] != _T('\\') &&
|
||||
filename[_tcsclen(filename)-1] != _T('/'))
|
||||
filename[_tcslen(filename)-1] != _T('\\') &&
|
||||
filename[_tcslen(filename)-1] != _T('/'))
|
||||
{
|
||||
TCHAR *pfn=filename;
|
||||
while (*pfn)
|
||||
|
|
@ -234,7 +234,7 @@ int tempzip_make(HWND hwndDlg, TCHAR *fn)
|
|||
{
|
||||
TCHAR buf[1024];
|
||||
lstrcpy(buf,out_filename);
|
||||
TCHAR *p=buf+_tcsclen(buf);
|
||||
TCHAR *p=buf+_tcslen(buf);
|
||||
while (p > buf && *p != _T('\\')) p--;
|
||||
*p=0;
|
||||
if (buf[0]) doMKDir(buf);
|
||||
|
|
@ -338,7 +338,7 @@ void wnd_printf(const TCHAR *str)
|
|||
TCHAR existing_text[32000];
|
||||
existing_text[0]=0;
|
||||
UINT l=GetDlgItemText(g_hwnd, IDC_OUTPUTTEXT, existing_text, 32000);
|
||||
l+=_tcsclen(str);
|
||||
l+=_tcslen(str);
|
||||
|
||||
TCHAR *p=existing_text;
|
||||
existing_text[31000]=0;
|
||||
|
|
|
|||
|
|
@ -375,7 +375,7 @@ SIZE CDialogTemplate::GetStringSize(WORD id, TCHAR *str) {
|
|||
SelectObject(memDC, font);
|
||||
|
||||
SIZE size;
|
||||
GetTextExtentPoint32(memDC, str, _tcsclen(str), &size);
|
||||
GetTextExtentPoint32(memDC, str, _tcslen(str), &size);
|
||||
|
||||
DestroyWindow(hDlg);
|
||||
DeleteObject(font);
|
||||
|
|
|
|||
|
|
@ -609,7 +609,7 @@ int CEXEBuild::preprocess_string(TCHAR *out, const TCHAR *in, WORD codepage/*=CP
|
|||
WORD w = FIX_ENDIAN_INT16(CODE_SHORT(-idx-1));
|
||||
memcpy(out, &w, sizeof(WORD));
|
||||
out += sizeof(WORD)/sizeof(TCHAR);
|
||||
p += _tcsclen(cp) + 2;
|
||||
p += _tcslen(cp) + 2;
|
||||
bProceced = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -636,10 +636,10 @@ int CEXEBuild::preprocess_string(TCHAR *out, const TCHAR *in, WORD codepage/*=CP
|
|||
if ( cBracket != 0 )
|
||||
{
|
||||
if (_tcschr(tbuf,cBracket)) (_tcschr(tbuf,cBracket)+1)[0]=0;
|
||||
if ( tbuf[0] == _T('{') && tbuf[_tcsclen(tbuf)-1] == _T('}') )
|
||||
if ( tbuf[0] == _T('{') && tbuf[_tcslen(tbuf)-1] == _T('}') )
|
||||
{
|
||||
TCHAR *tstIfDefine = _tcsdup(tbuf+1);
|
||||
tstIfDefine[_tcsclen(tstIfDefine)-1] = _T('\0');
|
||||
tstIfDefine[_tcslen(tstIfDefine)-1] = _T('\0');
|
||||
bDoWarning = definedlist.find(tstIfDefine) == NULL;
|
||||
// If it's a defined identifier, then don't warn.
|
||||
}
|
||||
|
|
@ -955,7 +955,7 @@ int CEXEBuild::add_label(const TCHAR *name)
|
|||
int ce=cs+build_cursection->code_size;
|
||||
|
||||
TCHAR *p=_tcsdup(name);
|
||||
if (p[_tcsclen(p)-1] == _T(':')) p[_tcsclen(p)-1]=0;
|
||||
if (p[_tcslen(p)-1] == _T(':')) p[_tcslen(p)-1]=0;
|
||||
int offs=ns_label.add(p,0);
|
||||
free(p);
|
||||
|
||||
|
|
@ -1016,7 +1016,7 @@ int CEXEBuild::add_function(const TCHAR *funname)
|
|||
return PS_ERROR;
|
||||
}
|
||||
|
||||
set_uninstall_mode(!_tcsncicmp(funname,_T("un."),3));
|
||||
set_uninstall_mode(!_tcsnicmp(funname,_T("un."),3));
|
||||
|
||||
// ns_func contains all the function names defined.
|
||||
int addr=ns_func.add(funname,0);
|
||||
|
|
@ -1172,7 +1172,7 @@ int CEXEBuild::add_section(const TCHAR *secname, const TCHAR *defname, int expan
|
|||
|
||||
set_uninstall_mode(0);
|
||||
|
||||
if (!_tcsncicmp(name, _T("un."), 3))
|
||||
if (!_tcsnicmp(name, _T("un."), 3))
|
||||
{
|
||||
set_uninstall_mode(1);
|
||||
name += 3;
|
||||
|
|
@ -3228,7 +3228,7 @@ void CEXEBuild::warning_fl(const TCHAR *s, ...)
|
|||
_vsntprintf(buf,NSIS_MAX_STRLEN*10,s,val);
|
||||
#endif
|
||||
va_end(val);
|
||||
_stprintf(buf+_tcsclen(buf),_T(" (%s:%d)"),curfilename,linecnt);
|
||||
_stprintf(buf+_tcslen(buf),_T(" (%s:%d)"),curfilename,linecnt);
|
||||
|
||||
m_warnings.add(buf,0);
|
||||
notify(MAKENSIS_NOTIFY_WARNING,buf);
|
||||
|
|
@ -3295,7 +3295,7 @@ void CEXEBuild::print_warnings()
|
|||
for (x = 0; x < nw; x ++)
|
||||
{
|
||||
_ftprintf(g_output,_T(" %s\n"),p);
|
||||
p+=_tcsclen(p)+1;
|
||||
p+=_tcslen(p)+1;
|
||||
}
|
||||
fflush(g_output);
|
||||
}
|
||||
|
|
@ -3305,7 +3305,7 @@ void CEXEBuild::notify(notify_e code, const TCHAR *data) const
|
|||
#ifdef _WIN32
|
||||
if (notify_hwnd)
|
||||
{
|
||||
COPYDATASTRUCT cds = {(DWORD)code, (_tcsclen(data)+1)*sizeof(TCHAR), (void *) data};
|
||||
COPYDATASTRUCT cds = {(DWORD)code, (_tcslen(data)+1)*sizeof(TCHAR), (void *) data};
|
||||
SendMessage(notify_hwnd, WM_COPYDATA, 0, (LPARAM)&cds);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -3458,7 +3458,7 @@ int CEXEBuild::DeclaredUserVar(const TCHAR *szVarName)
|
|||
return PS_ERROR;
|
||||
}
|
||||
const TCHAR *pVarName = szVarName;
|
||||
int iVarLen = _tcsclen(szVarName);
|
||||
int iVarLen = _tcslen(szVarName);
|
||||
|
||||
if (iVarLen > 60)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ int StringsArray::set(int idx, const TCHAR *str)
|
|||
int old = ((int*) m_offsets.get())[idx];
|
||||
|
||||
// Need to store the TCHAR index so we divide the return value of add by sizeof(TCHAR).
|
||||
((int*)m_offsets.get())[idx] = m_strings.add(str, (_tcsclen(str)+1)*sizeof(TCHAR))/sizeof(TCHAR);
|
||||
((int*)m_offsets.get())[idx] = m_strings.add(str, (_tcslen(str)+1)*sizeof(TCHAR))/sizeof(TCHAR);
|
||||
|
||||
return old;
|
||||
}
|
||||
|
|
@ -960,11 +960,11 @@ LanguageTable * CEXEBuild::LoadLangFile(TCHAR *filename) {
|
|||
p2 = _tcsrchr(filename, _T('\\'));
|
||||
if (p2) {
|
||||
p2++;
|
||||
nlf->m_szName = (TCHAR*)malloc((_tcsclen(p2)+1)*sizeof(TCHAR));
|
||||
nlf->m_szName = (TCHAR*)malloc((_tcslen(p2)+1)*sizeof(TCHAR));
|
||||
_tcscpy(nlf->m_szName, p2);
|
||||
}
|
||||
else {
|
||||
nlf->m_szName = (TCHAR*)malloc((_tcsclen(filename)+1)*sizeof(TCHAR));
|
||||
nlf->m_szName = (TCHAR*)malloc((_tcslen(filename)+1)*sizeof(TCHAR));
|
||||
_tcscpy(nlf->m_szName, filename);
|
||||
}
|
||||
if (p) *p = t;
|
||||
|
|
@ -982,13 +982,13 @@ LanguageTable * CEXEBuild::LoadLangFile(TCHAR *filename) {
|
|||
buf[0] = SkipComments(f);
|
||||
_fgetts(buf+1, NSIS_MAX_STRLEN, f);
|
||||
if (!nlf->m_szFont) {
|
||||
temp=_tcsclen(buf);
|
||||
temp=_tcslen(buf);
|
||||
while (buf[temp-1] == _T('\n') || buf[temp-1] == _T('\r')) {
|
||||
buf[temp-1] = 0;
|
||||
temp--;
|
||||
}
|
||||
if (buf[0] != _T('-') || buf[1] != 0) {
|
||||
nlf->m_szFont = (TCHAR*)malloc((_tcsclen(buf)+1)*sizeof(TCHAR));
|
||||
nlf->m_szFont = (TCHAR*)malloc((_tcslen(buf)+1)*sizeof(TCHAR));
|
||||
_tcscpy(nlf->m_szFont, buf);
|
||||
}
|
||||
}
|
||||
|
|
@ -1077,11 +1077,11 @@ LanguageTable * CEXEBuild::LoadLangFile(TCHAR *filename) {
|
|||
buf[0] = SkipComments(f);
|
||||
|
||||
_fgetts(buf+1, NSIS_MAX_STRLEN, f);
|
||||
if (_tcsclen(buf) == NSIS_MAX_STRLEN-1) {
|
||||
if (_tcslen(buf) == NSIS_MAX_STRLEN-1) {
|
||||
ERROR_MSG(_T("Error: String too long (string #%d - \"%s\")"), i, NLFStrings[i].szLangStringName);
|
||||
return 0;
|
||||
}
|
||||
temp=_tcsclen(buf);
|
||||
temp=_tcslen(buf);
|
||||
|
||||
while (buf[temp-1] == _T('\n') || buf[temp-1] == _T('\r')) {
|
||||
buf[--temp] = 0;
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ int LineParser::gettoken_enum(int token, const TCHAR *strlist) // null seperated
|
|||
if (tt && *tt) while (*strlist)
|
||||
{
|
||||
if (!_tcsicmp(tt,strlist)) return x;
|
||||
strlist+=_tcsclen(strlist)+1;
|
||||
strlist+=_tcslen(strlist)+1;
|
||||
x++;
|
||||
}
|
||||
return -1;
|
||||
|
|
|
|||
|
|
@ -488,7 +488,7 @@ int _tmain(int argc, TCHAR **argv)
|
|||
{
|
||||
if (build.display_errors)
|
||||
{
|
||||
sfile[_tcsclen(sfile)-4]=0;
|
||||
sfile[_tcslen(sfile)-4]=0;
|
||||
_ftprintf(g_output,_T("Can't open script \"%s\"\n"),sfile);
|
||||
fflush(g_output);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ TCHAR *CEXEBuild::set_line_predefine(int linecnt, BOOL is_macro)
|
|||
definedlist.del(_T("__LINE__"));
|
||||
}
|
||||
if(is_macro && oldline) {
|
||||
linebuf = (TCHAR *)malloc((_tcsclen(oldline)+_tcsclen(temp)+2)*sizeof(TCHAR));
|
||||
linebuf = (TCHAR *)malloc((_tcslen(oldline)+_tcslen(temp)+2)*sizeof(TCHAR));
|
||||
_stprintf(linebuf,_T("%s.%s"),oldline,temp);
|
||||
}
|
||||
else {
|
||||
|
|
@ -301,10 +301,10 @@ int CEXEBuild::doParse(const TCHAR *str)
|
|||
}
|
||||
|
||||
// add new line to line buffer
|
||||
m_linebuild.add(str,(_tcsclen(str)+1)*sizeof(TCHAR));
|
||||
m_linebuild.add(str,(_tcslen(str)+1)*sizeof(TCHAR));
|
||||
|
||||
// keep waiting for more lines, if this line ends with a backslash
|
||||
if (str[0] && CharPrev(str,str+_tcsclen(str))[0] == _T('\\'))
|
||||
if (str[0] && CharPrev(str,str+_tcslen(str))[0] == _T('\\'))
|
||||
{
|
||||
return PS_OK;
|
||||
}
|
||||
|
|
@ -313,7 +313,7 @@ int CEXEBuild::doParse(const TCHAR *str)
|
|||
|
||||
// escaped quotes should be ignored for compile time commands that set defines
|
||||
// because defines can be inserted in commands at a later stage
|
||||
bool ignore_escaping = (!_tcsncicmp((TCHAR*)m_linebuild.get(),_T("!define"),7) || !_tcsncicmp((TCHAR*)m_linebuild.get(),_T("!insertmacro"),12));
|
||||
bool ignore_escaping = (!_tcsnicmp((TCHAR*)m_linebuild.get(),_T("!define"),7) || !_tcsncicmp((TCHAR*)m_linebuild.get(),_T("!insertmacro"),12));
|
||||
res=line.parse((TCHAR*)m_linebuild.get(), ignore_escaping);
|
||||
|
||||
inside_comment = line.inCommentBlock();
|
||||
|
|
@ -346,7 +346,7 @@ parse_again:
|
|||
if (tkid == -1)
|
||||
{
|
||||
TCHAR *p=line.gettoken_str(0);
|
||||
if (p[0] && p[_tcsclen(p)-1]==_T(':'))
|
||||
if (p[0] && p[_tcslen(p)-1]==_T(':'))
|
||||
{
|
||||
if (p[0] == _T('!') || (p[0] >= _T('0') && p[0] <= _T('9')) || p[0] == _T('$') || p[0] == _T('-') || p[0] == _T('+'))
|
||||
{
|
||||
|
|
@ -619,7 +619,7 @@ void CEXEBuild::ps_addtoline(const TCHAR *str, GrowBuf &linedata, StringList &hi
|
|||
t=definedlist.find((TCHAR*)defname.get());
|
||||
if (t && hist.find((TCHAR*)defname.get(),0)<0)
|
||||
{
|
||||
in+=_tcsclen(s)+2;
|
||||
in+=_tcslen(s)+2;
|
||||
add=0;
|
||||
hist.add((TCHAR*)defname.get(),0);
|
||||
#ifdef NSIS_FIX_DEFINES_IN_STRINGS
|
||||
|
|
@ -651,7 +651,7 @@ void CEXEBuild::ps_addtoline(const TCHAR *str, GrowBuf &linedata, StringList &hi
|
|||
t=_tgetenv((TCHAR*)defname.get());
|
||||
if (t && hist.find((TCHAR*)defname.get(),0)<0)
|
||||
{
|
||||
in+=_tcsclen(s)+2;
|
||||
in+=_tcslen(s)+2;
|
||||
add=0;
|
||||
hist.add((TCHAR*)defname.get(),0);
|
||||
#ifdef NSIS_FIX_DEFINES_IN_STRINGS
|
||||
|
|
@ -809,14 +809,14 @@ int CEXEBuild::MacroExists(const TCHAR *macroname)
|
|||
return 1;
|
||||
|
||||
// skip macro name
|
||||
m += _tcsclen(m) + 1;
|
||||
m += _tcslen(m) + 1;
|
||||
|
||||
// skip params
|
||||
while (*m) m += _tcsclen(m) + 1;
|
||||
while (*m) m += _tcslen(m) + 1;
|
||||
m++;
|
||||
|
||||
// skip data
|
||||
while (*m) m += _tcsclen(m) + 1;
|
||||
while (*m) m += _tcslen(m) + 1;
|
||||
if (m - (TCHAR *) m_macros.get() >= m_macros.getlen() - 1) break;
|
||||
m++;
|
||||
}
|
||||
|
|
@ -839,7 +839,7 @@ int CEXEBuild::process_oneline(TCHAR *line, const TCHAR *filename, int linenum)
|
|||
TCHAR *oldtimestamp = NULL;
|
||||
TCHAR *oldline = NULL;
|
||||
BOOL is_commandline = !_tcscmp(filename,_T("command line"));
|
||||
BOOL is_macro = !_tcsncmp(filename,_T("macro:"),_tcsclen(_T("macro:")));
|
||||
BOOL is_macro = !_tcsncmp(filename,_T("macro:"),_tcslen(_T("macro:"))); //TODO: isn't it supposed to be a && ?
|
||||
|
||||
if(!is_commandline) { // Don't set the predefines for command line /X option
|
||||
if(!is_macro) {
|
||||
|
|
@ -931,14 +931,14 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
while (t && *t)
|
||||
{
|
||||
if (!_tcsicmp(t,line.gettoken_str(1))) break;
|
||||
t+=_tcsclen(t)+1;
|
||||
t+=_tcslen(t)+1;
|
||||
|
||||
// advance over parameters
|
||||
while (*t) t+=_tcsclen(t)+1;
|
||||
while (*t) t+=_tcslen(t)+1;
|
||||
t++;
|
||||
|
||||
// advance over data
|
||||
while (*t) t+=_tcsclen(t)+1;
|
||||
while (*t) t+=_tcslen(t)+1;
|
||||
if (t-(TCHAR *)m_macros.get() >= m_macros.getlen()-1)
|
||||
break;
|
||||
t++;
|
||||
|
|
@ -948,7 +948,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
ERROR_MSG(_T("!macro: macro named \"%s\" already found!\n"),line.gettoken_str(1));
|
||||
return PS_ERROR;
|
||||
}
|
||||
m_macros.add(line.gettoken_str(1),(_tcsclen(line.gettoken_str(1))+1)*sizeof(TCHAR));
|
||||
m_macros.add(line.gettoken_str(1),(_tcslen(line.gettoken_str(1))+1)*sizeof(TCHAR));
|
||||
|
||||
int pc;
|
||||
for (pc=2; pc < line.getnumtokens(); pc ++)
|
||||
|
|
@ -968,7 +968,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
return PS_ERROR;
|
||||
}
|
||||
}
|
||||
m_macros.add(line.gettoken_str(pc),(_tcsclen(line.gettoken_str(pc))+1)*sizeof(TCHAR));
|
||||
m_macros.add(line.gettoken_str(pc),(_tcslen(line.gettoken_str(pc))+1)*sizeof(TCHAR));
|
||||
}
|
||||
m_macros.add(_T(""),sizeof(_T("")));
|
||||
|
||||
|
|
@ -978,7 +978,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
TCHAR *p=str;
|
||||
str[0]=0;
|
||||
_fgetts(str,MAX_LINELENGTH,fp);
|
||||
//SCRIPT_MSG(_T("%s%s"), str, str[_tcsclen(str)-1]==_T('\n')?_T(""):_T("\n"));
|
||||
//SCRIPT_MSG(_T("%s%s"), str, str[_tcslen(str)-1]==_T('\n')?_T(""):_T("\n"));
|
||||
if (feof(fp) && !str[0])
|
||||
{
|
||||
ERROR_MSG(_T("!macro \"%s\": unterminated (no !macroend found in file)!\n"),line.gettoken_str(1));
|
||||
|
|
@ -1003,7 +1003,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
return PS_ERROR;
|
||||
}
|
||||
}
|
||||
if (str[0]) m_macros.add(str,(_tcsclen(str)+1)*sizeof(TCHAR));
|
||||
if (str[0]) m_macros.add(str,(_tcslen(str)+1)*sizeof(TCHAR));
|
||||
else m_macros.add(_T(" "),sizeof(_T(" ")));
|
||||
linecnt++;
|
||||
}
|
||||
|
|
@ -1021,14 +1021,14 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
while (t && *t)
|
||||
{
|
||||
if (!_tcsicmp(t,line.gettoken_str(1))) break;
|
||||
t+=_tcsclen(t)+1;
|
||||
t+=_tcslen(t)+1;
|
||||
|
||||
// advance over parms
|
||||
while (*t) t+=_tcsclen(t)+1;
|
||||
while (*t) t+=_tcslen(t)+1;
|
||||
t++;
|
||||
|
||||
// advance over data
|
||||
while (*t) t+=_tcsclen(t)+1;
|
||||
while (*t) t+=_tcslen(t)+1;
|
||||
if (t-(TCHAR *)m_macros.get() >= m_macros.getlen()-1)
|
||||
break;
|
||||
t++;
|
||||
|
|
@ -1039,7 +1039,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
ERROR_MSG(_T("!insertmacro: macro named \"%s\" not found!\n"),line.gettoken_str(1));
|
||||
return PS_ERROR;
|
||||
}
|
||||
t+=_tcsclen(t)+1;
|
||||
t+=_tcslen(t)+1;
|
||||
|
||||
|
||||
GrowBuf l_define_names;
|
||||
|
|
@ -1054,11 +1054,11 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
l_define_saves.add(t,v);
|
||||
definedlist.del(t);
|
||||
}
|
||||
l_define_names.add(t,(_tcsclen(t)+1)*sizeof(TCHAR));
|
||||
l_define_names.add(t,(_tcslen(t)+1)*sizeof(TCHAR));
|
||||
definedlist.add(t,line.gettoken_str(npr+2));
|
||||
|
||||
npr++;
|
||||
t+=_tcsclen(t)+1;
|
||||
t+=_tcslen(t)+1;
|
||||
}
|
||||
l_define_names.add(_T(""),sizeof(_T("")));
|
||||
t++;
|
||||
|
|
@ -1100,7 +1100,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
m = nm;
|
||||
}
|
||||
}
|
||||
t+=_tcsclen(t)+1;
|
||||
t+=_tcslen(t)+1;
|
||||
}
|
||||
m_macro_entry.delbypos(npos);
|
||||
{
|
||||
|
|
@ -1110,7 +1110,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
definedlist.del(p);
|
||||
TCHAR *v;
|
||||
if ((v=l_define_saves.find(p))) definedlist.add(p,v);
|
||||
p+=_tcsclen(p)+1;
|
||||
p+=_tcslen(p)+1;
|
||||
}
|
||||
}
|
||||
SCRIPT_MSG(_T("!insertmacro: end of %s\n"),line.gettoken_str(1));
|
||||
|
|
@ -1395,7 +1395,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
{
|
||||
if (*line.gettoken_str(2))
|
||||
{
|
||||
if (_tcsncicmp(line.gettoken_str(2), _T("un."), 3))
|
||||
if (_tcsnicmp(line.gettoken_str(2), _T("un."), 3))
|
||||
{
|
||||
if (uninstall_mode)
|
||||
{
|
||||
|
|
@ -1418,7 +1418,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
{
|
||||
if (*line.gettoken_str(1))
|
||||
{
|
||||
if (_tcsncicmp(line.gettoken_str(1), _T("un."), 3))
|
||||
if (_tcsnicmp(line.gettoken_str(1), _T("un."), 3))
|
||||
{
|
||||
if (uninstall_mode)
|
||||
{
|
||||
|
|
@ -1447,7 +1447,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
{
|
||||
if (*line.gettoken_str(3))
|
||||
{
|
||||
if (_tcsncicmp(line.gettoken_str(3), _T("un."), 3))
|
||||
if (_tcsnicmp(line.gettoken_str(3), _T("un."), 3))
|
||||
{
|
||||
if (uninstall_mode)
|
||||
{
|
||||
|
|
@ -1470,7 +1470,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
{
|
||||
if (*line.gettoken_str(2))
|
||||
{
|
||||
if (_tcsncicmp(line.gettoken_str(2), _T("un."), 3))
|
||||
if (_tcsnicmp(line.gettoken_str(2), _T("un."), 3))
|
||||
{
|
||||
if (uninstall_mode)
|
||||
{
|
||||
|
|
@ -1493,7 +1493,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
{
|
||||
if (*line.gettoken_str(1))
|
||||
{
|
||||
if (_tcsncicmp(line.gettoken_str(1), _T("un."), 3))
|
||||
if (_tcsnicmp(line.gettoken_str(1), _T("un."), 3))
|
||||
{
|
||||
if (uninstall_mode)
|
||||
{
|
||||
|
|
@ -1793,7 +1793,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
build_header.flags|=CH_FLAGS_COMP_ONLY_ON_CUSTOM;
|
||||
SCRIPT_MSG(_T("InstType: making components viewable only on custom install type\n"));
|
||||
}
|
||||
else if (!_tcsncicmp(line.gettoken_str(1),_T("/CUSTOMSTRING="),14))
|
||||
else if (!_tcsnicmp(line.gettoken_str(1),_T("/CUSTOMSTRING="),14))
|
||||
{
|
||||
SCRIPT_MSG(_T("InstType: setting custom text to: \"%s\"\n"),line.gettoken_str(1)+14);
|
||||
if (SetInnerString(NLF_COMP_CUSTOM,line.gettoken_str(1)+14) == PS_WARNING)
|
||||
|
|
@ -1807,7 +1807,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
{
|
||||
TCHAR *itname = line.gettoken_str(1);
|
||||
|
||||
if (!_tcsncicmp(itname, _T("un."), 3)) {
|
||||
if (!_tcsnicmp(itname, _T("un."), 3)) {
|
||||
set_uninstall_mode(1);
|
||||
itname += 3;
|
||||
}
|
||||
|
|
@ -2105,7 +2105,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
}
|
||||
build_header.install_directory_ptr = add_string(p);
|
||||
build_header.install_directory_auto_append = 0;
|
||||
TCHAR *p2 = p + _tcsclen(p);
|
||||
TCHAR *p2 = p + _tcslen(p);
|
||||
if (*p && *CharPrev(p, p2) != _T('\\'))
|
||||
{
|
||||
// we risk hitting $\r or something like $(bla\ad) or ${bla\ad} here, but it's better
|
||||
|
|
@ -2639,11 +2639,11 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
#endif
|
||||
case TOK_SETFONT:
|
||||
{
|
||||
if (!_tcsncicmp(line.gettoken_str(1), _T("/LANG="), 6))
|
||||
if (!_tcsnicmp(line.gettoken_str(1), _T("/LANG="), 6))
|
||||
{
|
||||
LANGID lang_id = _ttoi(line.gettoken_str(1) + 6);
|
||||
LanguageTable *table = GetLangTable(lang_id);
|
||||
table->nlf.m_szFont = (TCHAR*)malloc((_tcsclen(line.gettoken_str(2))+1)*sizeof(TCHAR));
|
||||
table->nlf.m_szFont = (TCHAR*)malloc((_tcslen(line.gettoken_str(2))+1)*sizeof(TCHAR));
|
||||
_tcscpy(table->nlf.m_szFont, line.gettoken_str(2));
|
||||
table->nlf.m_iFontSize = line.gettoken_int(3);
|
||||
|
||||
|
|
@ -2855,7 +2855,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
while (p >= str && (*p == _T('\r') || *p == _T('\n'))) p--;
|
||||
*++p=0;
|
||||
if (file_buf.getlen()) file_buf.add(_T("\n"),1);
|
||||
file_buf.add(str,_tcsclen(str));
|
||||
file_buf.add(str,_tcslen(str));
|
||||
}
|
||||
fclose(fp);
|
||||
}
|
||||
|
|
@ -3043,7 +3043,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
TCHAR *incdir = include_dirs.get();
|
||||
int incdirs = include_dirs.getnum();
|
||||
|
||||
for (int i = 0; i < incdirs; i++, incdir += _tcsclen(incdir) + 1) {
|
||||
for (int i = 0; i < incdirs; i++, incdir += _tcslen(incdir) + 1) {
|
||||
tstring curincdir = tstring(incdir) + PLATFORM_PATH_SEPARATOR_STR + dir;
|
||||
|
||||
boost::scoped_ptr<dir_reader> dr( new_dir_reader() );
|
||||
|
|
@ -3148,8 +3148,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
while (p >= str && (*p == _T('\r') || *p == _T('\n'))) p--;
|
||||
*++p=0;
|
||||
|
||||
bool endSlash = (str[0] && str[_tcsclen(str)-1] == _T('\\'));
|
||||
if (tmpstr.getlen() || endSlash) tmpstr.add(str,_tcsclen(str));
|
||||
bool endSlash = (str[0] && str[_tcslen(str)-1] == _T('\\'));
|
||||
if (tmpstr.getlen() || endSlash) tmpstr.add(str,_tcslen(str));
|
||||
|
||||
// if we have valid contents and not ending on slash, then done
|
||||
if (!endSlash && (str[0] || tmpstr.getlen())) break;
|
||||
|
|
@ -3225,8 +3225,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
TCHAR *src = line.gettoken_str(2+ignoreCase);
|
||||
TCHAR *search = line.gettoken_str(3+ignoreCase);
|
||||
TCHAR *replace = line.gettoken_str(4+ignoreCase);
|
||||
int searchlen=_tcsclen(search);
|
||||
int replacelen=_tcsclen(replace);
|
||||
int searchlen=_tcslen(search);
|
||||
int replacelen=_tcslen(replace);
|
||||
if (!searchlen)
|
||||
{
|
||||
ERROR_MSG(_T("!searchreplace: search string must not be empty for search/replace!\n"));
|
||||
|
|
@ -3237,7 +3237,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
|
||||
while (*src)
|
||||
{
|
||||
if (ignoreCase ? _tcsncicmp(src,search,searchlen) : _tcsncmp(src,search,searchlen))
|
||||
if (ignoreCase ? _tcsnicmp(src,search,searchlen) : _tcsncmp(src,search,searchlen))
|
||||
valout.add(src++,1);
|
||||
else
|
||||
{
|
||||
|
|
@ -3423,7 +3423,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
|
||||
if (line.gettoken_str(a)[0]==_T('-'))
|
||||
{
|
||||
if (!_tcsncicmp(line.gettoken_str(a)+1,_T("un."),3))
|
||||
if (!_tcsnicmp(line.gettoken_str(a)+1,_T("un."),3))
|
||||
ret=add_section(_T("un."),line.gettoken_str(a+1));
|
||||
else
|
||||
ret=add_section(_T(""),line.gettoken_str(a+1));
|
||||
|
|
@ -3508,7 +3508,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
}
|
||||
SCRIPT_MSG(_T("Function: \"%s\"\n"),line.gettoken_str(1));
|
||||
#ifndef NSIS_CONFIG_UNINSTALL_SUPPORT
|
||||
if (!_tcsncicmp(line.gettoken_str(1),_T("un."),3))
|
||||
if (!_tcsnicmp(line.gettoken_str(1),_T("un."),3))
|
||||
{
|
||||
ERROR_MSG(_T("Error: Uninstall function declared, no NSIS_CONFIG_UNINSTALL_SUPPORT\n"));
|
||||
return PS_ERROR;
|
||||
|
|
@ -3652,7 +3652,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
int a = 1;
|
||||
int trim = 0;
|
||||
while (line.gettoken_str(a)[0] == _T('/')) {
|
||||
if (!_tcsncicmp(line.gettoken_str(a),_T("/TRIM"),5)) {
|
||||
if (!_tcsnicmp(line.gettoken_str(a),_T("/TRIM"),5)) {
|
||||
if (!_tcsicmp(line.gettoken_str(a)+5,_T("LEFT"))) trim = 1;
|
||||
else if (!_tcsicmp(line.gettoken_str(a)+5,_T("RIGHT"))) trim = 2;
|
||||
else if (!_tcsicmp(line.gettoken_str(a)+5,_T("CENTER"))) trim = 3;
|
||||
|
|
@ -3829,13 +3829,13 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
case TOK_CALL:
|
||||
if (!line.gettoken_str(1)[0] || (line.gettoken_str(1)[0]==_T(':') && !line.gettoken_str(1)[1] )) PRINTHELP()
|
||||
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
|
||||
if (uninstall_mode && _tcsncicmp(line.gettoken_str(1),_T("un."),3)
|
||||
if (uninstall_mode && _tcsnicmp(line.gettoken_str(1),_T("un."),3)
|
||||
&& (GetUserVarIndex(line,1) < 0) && line.gettoken_str(1)[0]!=_T(':'))
|
||||
{
|
||||
ERROR_MSG(_T("Call must be used with function names starting with \"un.\" in the uninstall section.\n"));
|
||||
PRINTHELP()
|
||||
}
|
||||
if (!uninstall_mode && !_tcsncicmp(line.gettoken_str(1),_T("un."),3))
|
||||
if (!uninstall_mode && !_tcsnicmp(line.gettoken_str(1),_T("un."),3))
|
||||
{
|
||||
ERROR_MSG(_T("Call must not be used with functions starting with \"un.\" in the non-uninstall sections.\n"));
|
||||
PRINTHELP()
|
||||
|
|
@ -3885,8 +3885,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
{
|
||||
if (p[0] == _T('\\') && p[1] != _T('\\')) p++;
|
||||
_tcsnccpy(out_path,p,1024-1);
|
||||
if (*CharPrev(out_path,out_path+_tcsclen(out_path))==_T('\\'))
|
||||
*CharPrev(out_path,out_path+_tcsclen(out_path))=0; // remove trailing slash
|
||||
if (*CharPrev(out_path,out_path+_tcslen(out_path))==_T('\\'))
|
||||
*CharPrev(out_path,out_path+_tcslen(out_path))=0; // remove trailing slash
|
||||
}
|
||||
if (!*out_path) PRINTHELP()
|
||||
SCRIPT_MSG(_T("CreateDirectory: \"%s\"\n"),out_path);
|
||||
|
|
@ -4151,7 +4151,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
TCHAR *s=(line.gettoken_str(7));
|
||||
|
||||
TCHAR b[255];
|
||||
for (unsigned int spos=0; (spos <= _tcsclen(s)) && (spos <= 255); spos++)
|
||||
for (unsigned int spos=0; (spos <= _tcslen(s)) && (spos <= 255); spos++)
|
||||
b[spos]=_totupper(*(s+spos));
|
||||
_tcscpy(s,b);
|
||||
|
||||
|
|
@ -4559,7 +4559,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
rec=1;
|
||||
a++;
|
||||
}
|
||||
else if (which_token == TOK_FILE && !_tcsncicmp(line.gettoken_str(a),_T("/oname="),7))
|
||||
else if (which_token == TOK_FILE && !_tcsnicmp(line.gettoken_str(a),_T("/oname="),7))
|
||||
{
|
||||
TCHAR *on=line.gettoken_str(a)+7;
|
||||
a++;
|
||||
|
|
@ -4596,9 +4596,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
|
||||
return PS_OK;
|
||||
}
|
||||
if (!_tcsncicmp(line.gettoken_str(a),_T("/x"),2))
|
||||
if (!_tcsnicmp(line.gettoken_str(a),_T("/x"),2))
|
||||
{
|
||||
while (!_tcsncicmp(line.gettoken_str(a),_T("/x"),2))
|
||||
while (!_tcsnicmp(line.gettoken_str(a),_T("/x"),2))
|
||||
{
|
||||
a++;
|
||||
|
||||
|
|
@ -5393,7 +5393,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
_tcscat(str, line.gettoken_str(2));
|
||||
_tcscat(str, _T("%"));
|
||||
ent.offsets[1]=add_string(str);
|
||||
if (ent.offsets[0] < 0 || _tcsclen(line.gettoken_str(2))<1) PRINTHELP()
|
||||
if (ent.offsets[0] < 0 || _tcslen(line.gettoken_str(2))<1) PRINTHELP()
|
||||
}
|
||||
ent.offsets[2]=1;
|
||||
SCRIPT_MSG(_T("ReadEnvStr: %s->%s\n"),line.gettoken_str(2),line.gettoken_str(1));
|
||||
|
|
@ -5729,7 +5729,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
}
|
||||
ent.which=EW_SETBRANDINGIMAGE;
|
||||
for (int i = 1; i < line.getnumtokens(); i++)
|
||||
if (!_tcsncicmp(line.gettoken_str(i),_T("/IMGID="),7)) {
|
||||
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]);
|
||||
}
|
||||
|
|
@ -5795,7 +5795,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
{
|
||||
LANGID LangID=0;
|
||||
int a = 1;
|
||||
if (!_tcsncicmp(line.gettoken_str(a),_T("/LANG="),6))
|
||||
if (!_tcsnicmp(line.gettoken_str(a),_T("/LANG="),6))
|
||||
LangID=_ttoi(line.gettoken_str(a++)+6);
|
||||
if (line.getnumtokens()!=a+2) PRINTHELP();
|
||||
TCHAR *pKey = line.gettoken_str(a);
|
||||
|
|
@ -6398,8 +6398,8 @@ DefineList *CEXEBuild::searchParseString(const TCHAR *source_string, LineParser
|
|||
const TCHAR *tok = line->gettoken_str(parmOffs++);
|
||||
if (tok && *tok)
|
||||
{
|
||||
int toklen = _tcsclen(tok);
|
||||
while (*source_string && (ignCase?_tcsncicmp(source_string,tok,toklen):_tcsncmp(source_string,tok,toklen))) source_string++;
|
||||
int toklen = _tcslen(tok);
|
||||
while (*source_string && (ignCase?_tcsnicmp(source_string,tok,toklen):_tcsncmp(source_string,tok,toklen))) source_string++;
|
||||
|
||||
if (!*source_string)
|
||||
{
|
||||
|
|
@ -6422,8 +6422,8 @@ DefineList *CEXEBuild::searchParseString(const TCHAR *source_string, LineParser
|
|||
const TCHAR *src_start = source_string;
|
||||
if (tok && *tok)
|
||||
{
|
||||
int toklen = _tcsclen(tok);
|
||||
while (*source_string && (ignCase?_tcsncicmp(source_string,tok,toklen):_tcsncmp(source_string,tok,toklen))) source_string++;
|
||||
int toklen = _tcslen(tok);
|
||||
while (*source_string && (ignCase?_tcsnicmp(source_string,tok,toklen):_tcsncmp(source_string,tok,toklen))) source_string++;
|
||||
|
||||
maxlen = source_string - src_start;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ int StringList::add(const TCHAR *str, int case_sensitive)
|
|||
{
|
||||
int a=find(str,case_sensitive);
|
||||
if (a >= 0 && case_sensitive!=-1) return a;
|
||||
return m_gr.add(str,(_tcsclen(str)+1)*sizeof(TCHAR))/sizeof(TCHAR);
|
||||
return m_gr.add(str,(_tcslen(str)+1)*sizeof(TCHAR))/sizeof(TCHAR);
|
||||
}
|
||||
|
||||
// use 2 for case sensitive end-of-string matches too
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class SortedStringList
|
|||
T newstruct={0,};
|
||||
int pos=find(name,case_sensitive,1);
|
||||
if (pos==-1) return -1;
|
||||
newstruct.name=(TCHAR*)malloc((_tcsclen(name)+1)*sizeof(TCHAR));
|
||||
newstruct.name=(TCHAR*)malloc((_tcslen(name)+1)*sizeof(TCHAR));
|
||||
if (!newstruct.name)
|
||||
{
|
||||
extern FILE *g_output;
|
||||
|
|
@ -166,7 +166,7 @@ class SortedStringList
|
|||
extern void quit();
|
||||
if (g_display_errors)
|
||||
{
|
||||
_ftprintf(g_output,_T("\nInternal compiler error #12345: GrowBuf realloc/malloc(%lu) failed.\n"),(unsigned long)((_tcsclen(name)+1)*sizeof(TCHAR)));
|
||||
_ftprintf(g_output,_T("\nInternal compiler error #12345: GrowBuf realloc/malloc(%lu) failed.\n"),(unsigned long)((_tcslen(name)+1)*sizeof(TCHAR)));
|
||||
fflush(g_output);
|
||||
}
|
||||
quit();
|
||||
|
|
@ -302,7 +302,7 @@ class SortedStringListND // no delete - can be placed in GrowBuf
|
|||
if (pos==-1) return alwaysreturnpos ? where : -1;
|
||||
|
||||
// Note that .name is set with the TCHAR* offset into m_strings.
|
||||
newstruct.name=m_strings.add(name,(_tcsclen(name)+1)*sizeof(TCHAR))/sizeof(TCHAR);
|
||||
newstruct.name=m_strings.add(name,(_tcslen(name)+1)*sizeof(TCHAR))/sizeof(TCHAR);
|
||||
|
||||
m_gr.add(&newstruct,sizeof(T));
|
||||
T *s=(T*) m_gr.get();
|
||||
|
|
@ -377,7 +377,7 @@ class SortedStringListND // no delete - can be placed in GrowBuf
|
|||
if (case_sensitive)
|
||||
res = _tcsncmp(str, pCurr, mymin((unsigned int) n_chars, pCurr_len));
|
||||
else
|
||||
res = _tcsncicmp(str, pCurr, mymin((unsigned int) n_chars, pCurr_len));
|
||||
res = _tcsnicmp(str, pCurr, mymin((unsigned int) n_chars, pCurr_len));
|
||||
|
||||
// If there is a match and we are looking for a partial match and
|
||||
// n_chars is NOT the length of the current string, then the
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue