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

Allow /INPUTCHARSET early on the command line.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6351 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-05-04 14:33:09 +00:00
parent 0653f46c07
commit 5878480fdc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/makenssi.cpp
View file

@ -297,7 +297,8 @@ int _tmain(int argc, TCHAR **argv)
if (_T('-') == argv[argpos][0] && !argv[argpos][1]) continue; // stdin if (_T('-') == argv[argpos][0] && !argv[argpos][1]) continue; // stdin
const TCHAR *swname = &argv[argpos][1]; const TCHAR *swname = &argv[argpos][1];
if (!_tcsicmp(swname,_T("VERSION"))) argc=0; if (!_tcsicmp(swname,_T("INPUTCHARSET")) || !_tcsicmp(swname,_T("ICS"))) ++argpos; // Skip
else if (!_tcsicmp(swname,_T("VERSION"))) argc=0;
else if (!_tcsicmp(swname,_T("NOTIFYHWND"))) else if (!_tcsicmp(swname,_T("NOTIFYHWND")))
{ {
initialparsefail=!HasReqParam(argv,++argpos,argc,true); initialparsefail=!HasReqParam(argv,++argpos,argc,true);
@ -507,11 +508,10 @@ int _tmain(int argc, TCHAR **argv)
} }
cmds_processed++; cmds_processed++;
} }
// Already parsed these // Already parsed these ("VERSION" never gets this far)
#ifdef _WIN32 #ifdef _WIN32
else if (!_tcsicmp(&argv[argpos][1],_T("RAW"))) {} else if (!_tcsicmp(&argv[argpos][1],_T("RAW"))) {}
#endif #endif
else if (!_tcsicmp(&argv[argpos][1],_T("VERSION"))) {}
else if (S7IsChEqualI('o',argv[argpos][1]) && argv[argpos][2]) {} else if (S7IsChEqualI('o',argv[argpos][1]) && argv[argpos][2]) {}
else else
break; break;

2
Source/util.cpp
View file

@ -795,7 +795,7 @@ bool WINAPI WinStdIO_OStreamInit(WINSIO_OSDATA&osd, FILE*strm, WORD cp, int bom)
bool succ = NStream::SetBinaryMode(fd); bool succ = NStream::SetBinaryMode(fd);
DWORD cbio = 0; DWORD cbio = 0;
ULARGE_INTEGER uli; ULARGE_INTEGER uli;
if (succ && GetFileSize64(osd.hNative, uli) && uli.QuadPart) if (succ && 0 != bom && GetFileSize64(osd.hNative, uli) && uli.QuadPart)
{ {
OVERLAPPED olap = {0}; // Used to read from start of file OVERLAPPED olap = {0}; // Used to read from start of file
unsigned char bufbom[4]; unsigned char bufbom[4];