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

Unicode support for !define /file and !searchparse /file

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6329 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-04-10 02:51:33 +00:00
parent 936244da8d
commit 5fb2e9e166
2 changed files with 79 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/utf.cpp
View file

@ -387,23 +387,24 @@ tstring NStreamLineReader::GetErrorMessage(UINT Error, const TCHAR*Filename, UIN
switch(Error)
{
case NStream::ERR_BUFFEROVERFLOW:
msg = _T("Line too long: ");
msg = _T("Line too long");
break;
case NStream::ERR_IOERROR:
msg = _T("I/O error"), Filename = 0;
msg = _T("I/O error"), Filename = 0;
break;
case NStream::ERR_UNSUPPORTEDENCODING:
StreamEncoding().GetCPDisplayName(buf);
msg = tstring(buf) + _T(" is not supported"), Filename = 0;
break;
default:
msg = _T("Bad text encoding: ");
msg = _T("Bad text encoding");
break;
}
if (Filename)
{
_stprintf(buf,_T("%u"),Line);
msg = msg + Filename + _T(":") + buf;
const TCHAR *filelinesep = *Filename ? _T(":") : _T("");
_stprintf(buf,_T("%s%u"),filelinesep,Line);
msg = msg + _T(": ") + Filename + buf;
}
return msg + _T("\n");
}