gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential issue with Unicode

Browse Source 
Fix potential compilation error C2664: 'HANDLE CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE)': cannot convert argument 1 from 'const char [8]' to 'LPCWSTR' with Unicode/MBCS, as reported here: https://github.com/root-project/cling/issues/186#issuecomment-404902026
This commit is contained in:
Bertrand Bellenot 2018-07-16 13:41:32 +02:00 committed by Axel Naumann
parent 13cbf38ae0
commit a75d9436bc
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/UserInterface/textinput/TerminalDisplayWin.cpp
View File

@ -19,6 +19,12 @@
#include <assert.h> #include <assert.h>
#ifdef UNICODE
#define filename L"CONOUT$"
#else
#define filename "CONOUT$"
#endif
namespace textinput { namespace textinput {
TerminalDisplayWin::TerminalDisplayWin(): TerminalDisplayWin::TerminalDisplayWin():
TerminalDisplay(false), fStartLine(0), fIsAttached(false), TerminalDisplay(false), fStartLine(0), fIsAttached(false),
@ -31,7 +37,7 @@ namespace textinput {
if (!isConsole) { if (!isConsole) {
// Prevent redirection from stealing our console handle, // Prevent redirection from stealing our console handle,
// simply open our own. // simply open our own.
fOut = ::CreateFile("CONOUT$", GENERIC_READ | GENERIC_WRITE, fOut = ::CreateFile(filename, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
::GetConsoleMode(fOut, &fOldMode); ::GetConsoleMode(fOut, &fOldMode);
@ -48,6 +54,8 @@ namespace textinput {
HandleResizeEvent(); HandleResizeEvent();
} }
#undef filename
TerminalDisplayWin::~TerminalDisplayWin() { TerminalDisplayWin::~TerminalDisplayWin() {
if (fDefaultAttributes) { if (fDefaultAttributes) {
::SetConsoleTextAttribute(fOut, fDefaultAttributes); ::SetConsoleTextAttribute(fOut, fDefaultAttributes);