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

Unicode port: Generate Unicode LangStrings even if source was an ANSI file

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6093 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-05-28 13:10:16 +00:00
parent e097a25855
commit 90e05acdd3
8 changed files with 70 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/makenssi.cpp
View file

@ -197,7 +197,8 @@ static tstring get_home()
static int process_config(CEXEBuild& build, tstring& conf)
{
FILE *cfg=FOPENTEXT(conf.c_str(),"rt");
BOOL unicode;
FILE *cfg=FOPENTEXT2(conf.c_str(),"rt",&unicode);
if (cfg)
{
if (build.display_script)
@ -205,7 +206,7 @@ static int process_config(CEXEBuild& build, tstring& conf)
_ftprintf(g_output,_T("Processing config: \n"));
fflush(g_output);
}
int ret=build.process_script(cfg,(TCHAR*)conf.c_str());
int ret=build.process_script(cfg,(TCHAR*)conf.c_str(),unicode);
fclose(cfg);
if (ret != PS_OK && ret != PS_EOF)
{
@ -484,6 +485,7 @@ int _tmain(int argc, TCHAR **argv)
{
TCHAR sfile[1024];
BOOL unicode=FALSE;
if (!_tcscmp(argv[argpos],_T("-")) && !in_files)
{
fp=stdin;
@ -492,11 +494,11 @@ int _tmain(int argc, TCHAR **argv)
else
{
_tcscpy(sfile,argv[argpos]);
fp=FOPENTEXT(sfile,"rt");
fp=FOPENTEXT2(sfile,"rt",&unicode);
if (!fp)
{
_stprintf(sfile,_T("%s.nsi"),argv[argpos]);
fp=FOPENTEXT(sfile,"rt");
fp=FOPENTEXT2(sfile,"rt",&unicode);
if (!fp)
{
if (build.display_errors)
@ -522,7 +524,7 @@ int _tmain(int argc, TCHAR **argv)
_ftprintf(g_output,_T("Processing script file: \"%s\"\n"),sfile);
fflush(g_output);
}
int ret=build.process_script(fp,sfile);
int ret=build.process_script(fp,sfile,unicode);
if (fp != stdin) fclose(fp);
if (ret != PS_EOF && ret != PS_OK)