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

Unicode port: restore initial console codepage on exit

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6087 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-05-07 16:13:24 +00:00
parent bd4214a2db
commit 37cb17f3cc
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/makenssi.cpp
View file

@ -38,6 +38,9 @@ using namespace std;
int g_noconfig=0; int g_noconfig=0;
int g_display_errors=1; int g_display_errors=1;
FILE *g_output=stdout; FILE *g_output=stdout;
#ifdef _UNICODE
UINT g_initialCodepage;
#endif
void quit() void quit()
{ {
@ -54,6 +57,9 @@ static void myatexit()
{ {
dopause(); dopause();
if (g_output != stdout && g_output) fclose(g_output); if (g_output != stdout && g_output) fclose(g_output);
#ifdef _UNICODE
SetConsoleOutputCP(g_initialCodepage);
#endif
} }
static void sigint(int sig) static void sigint(int sig)
@ -272,6 +278,7 @@ int _tmain(int argc, TCHAR **argv)
#ifdef _UNICODE #ifdef _UNICODE
_setmode(_fileno(stdout), _O_U8TEXT); // set stdout to UTF-8 _setmode(_fileno(stdout), _O_U8TEXT); // set stdout to UTF-8
g_initialCodepage = GetConsoleOutputCP();
SetConsoleOutputCP(CP_UTF8); // set console output to UTF-8 (especially useful for subprocesses like !system) SetConsoleOutputCP(CP_UTF8); // set console output to UTF-8 (especially useful for subprocesses like !system)
#endif #endif
try try