Unicode port: Turn console & output logs to UTF-8. Adapted MakensisW for UTF-8

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6083 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-05-05 14:14:48 +00:00
parent b8f6c16fcd
commit 743ad095f5
6 changed files with 30 additions and 19 deletions

View file

@ -30,6 +30,8 @@
#include "util.h"
#include <nsis-version.h>
#include <fcntl.h>
#include <io.h>
using namespace std;
@ -268,6 +270,9 @@ int _tmain(int argc, TCHAR **argv)
int no_logo=0;
int in_files=0;
#ifdef _UNICODE
_setmode(_fileno(stdout), _O_U8TEXT); // set console output as UTF-8
#endif
try
{
build.initialize(argv[0]);

View file

@ -22,7 +22,7 @@
FILE* FileOpenUnicodeText(const TCHAR* file, const TCHAR* mode)
{
extern FILE *g_output;
CValidateUnicode::FILE_TYPE ftype = CValidateUnicode::UTF_16LE;
CValidateUnicode::FILE_TYPE ftype = CValidateUnicode::UTF_8; // default file format is UTF-8
// If we are reading an existing file, check to see what type of file it
// is first.