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

Fix a couple of simple unicode merge and substart related bugs

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6195 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-12-05 22:52:54 +00:00
parent 8b457d1aa2
commit 359ad0a055
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/makensis.nsi
View file

@ -115,7 +115,7 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
RMDir /r $SMPROGRAMS\NSIS RMDir /r $SMPROGRAMS\NSIS
SetOverwrite on SetOverwrite on
File /oname=makensis.exe ..\Bin\substart.exe File ..\makensis.exe
File ..\makensisw.exe File ..\makensisw.exe
File ..\COPYING File ..\COPYING
File ..\NSIS.chm File ..\NSIS.chm

2
Source/script.cpp
View file

@ -915,7 +915,7 @@ int CEXEBuild::LoadLicenseFile(TCHAR *file, TCHAR** pdata, LineParser &line, BOO
} }
if (!memcmp(data+1,_T("{\\rtf"),5*sizeof(TCHAR))) if (!memcmp(data+1,_T("{\\rtf"),5*sizeof(TCHAR)))
*data = SF_RTF; *data = SF_RTF;
else if (unicode) else if (*unicode)
*data = SF_TEXT|SF_UNICODE; *data = SF_TEXT|SF_UNICODE;
else else
*data = SF_TEXT; *data = SF_TEXT;

2
Source/tstring.h
View file

@ -38,7 +38,7 @@ typedef std::ofstream tofstream;
typedef std::ifstream tifstream; typedef std::ifstream tifstream;
// Use the following macros to open text files. // Use the following macros to open text files.
#define FOPENTEXT(file, mode) fopen(file, mode) #define FOPENTEXT(file, mode) fopen(file, mode)
#define FOPENTEXT2(file, mode, unicode) (*unicode=FALSE, fopen(file, mode)) #define FOPENTEXT2(file, mode, unicode) (*(unicode)=FALSE, fopen(file, mode))
#endif #endif
#ifndef _UNICODE #ifndef _UNICODE