diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-09-20 13:28:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-09-20 13:28:02 (GMT) |
| commit | 379c5166ff2b67a5202ab43a3a4c3539dc080389 (patch) | |
| tree | dadfb4cd011ae6b110545343aaef353a02294404 /win/tclWinConsole.c | |
| parent | 9fd52465aa94df025df3ffe32891576de0e319e2 (diff) | |
| parent | 3147adf34639c8a4c2aa49422c70fafb3b59c722 (diff) | |
| download | tcl-379c5166ff2b67a5202ab43a3a4c3539dc080389.zip tcl-379c5166ff2b67a5202ab43a3a4c3539dc080389.tar.gz tcl-379c5166ff2b67a5202ab43a3a4c3539dc080389.tar.bz2 | |
merge 8.6
Diffstat (limited to 'win/tclWinConsole.c')
| -rw-r--r-- | win/tclWinConsole.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c index 6800115..449bea9 100644 --- a/win/tclWinConsole.c +++ b/win/tclWinConsole.c @@ -1037,7 +1037,7 @@ WaitForRead( return 1; } - if (PeekConsoleInput(handle, &input, 1, &count) == FALSE) { + if (PeekConsoleInputW(handle, &input, 1, &count) == FALSE) { /* * Check to see if the peek failed because of EOF. */ @@ -1337,7 +1337,7 @@ TclWinOpenConsoleChannel( modes |= ENABLE_LINE_INPUT; SetConsoleMode(infoPtr->handle, modes); - infoPtr->reader.readyEvent = CreateEvent(NULL, TRUE, TRUE, NULL); + infoPtr->reader.readyEvent = CreateEventW(NULL, TRUE, TRUE, NULL); infoPtr->reader.thread = CreateThread(NULL, 256, ConsoleReaderThread, TclPipeThreadCreateTI(&infoPtr->reader.TI, infoPtr, infoPtr->reader.readyEvent), 0, NULL); @@ -1346,7 +1346,7 @@ TclWinOpenConsoleChannel( if (permissions & TCL_WRITABLE) { - infoPtr->writer.readyEvent = CreateEvent(NULL, TRUE, TRUE, NULL); + infoPtr->writer.readyEvent = CreateEventW(NULL, TRUE, TRUE, NULL); infoPtr->writer.thread = CreateThread(NULL, 256, ConsoleWriterThread, TclPipeThreadCreateTI(&infoPtr->writer.TI, infoPtr, infoPtr->writer.readyEvent), 0, NULL); @@ -1360,11 +1360,7 @@ TclWinOpenConsoleChannel( Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto"); Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\032 {}"); -#ifdef UNICODE Tcl_SetChannelOption(NULL, infoPtr->channel, "-encoding", "unicode"); -#else - Tcl_SetChannelOption(NULL, infoPtr->channel, "-encoding", encoding); -#endif return infoPtr->channel; } |