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

Unicode on posix fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6217 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2012-03-01 21:06:14 +00:00
parent 382b2fa282
commit 7cf2ef1a08
7 changed files with 110 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/script.cpp
View file

@ -2565,7 +2565,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
int k=line.gettoken_enum(1, _T("all\0IDD_LICENSE\0IDD_DIR\0IDD_SELCOM\0IDD_INST\0IDD_INSTFILES\0IDD_UNINST\0IDD_VERIFY\0IDD_LICENSE_FSRB\0IDD_LICENSE_FSCB\0"));
if (k<0) PRINTHELP();
FILE *fui = FOPEN(line.gettoken_str(2), _T("rb"));
FILE *fui = FOPEN(line.gettoken_str(2), ("rb"));
if (!fui) {
ERROR_MSG(_T("Error: Can't open \"%s\"!\n"), line.gettoken_str(2));
return PS_ERROR;
@ -3188,6 +3188,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
case TOK_P_EXECUTE:
{
TCHAR *exec=line.gettoken_str(1);
SCRIPT_MSG(_T("!execute: \"%s\"\n"),exec);
#ifdef _WIN32
PROCESS_INFORMATION pi;
STARTUPINFO si={sizeof(STARTUPINFO),};
@ -3202,7 +3203,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
system(execfixed);
my_convert_free(execfixed);
#endif
SCRIPT_MSG(_T("!execute: \"%s\"\n"),exec);
}
case TOK_P_ADDINCLUDEDIR:
{