OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0028350: Draw Harness - DRAWEXE hangs up immediatly when redirecting input stream on Windows

Browse Source 
Fallback using fgetws() instead of ReadConsoleW() for reading input from a pipe.
This commit is contained in:
kgv 2017-01-15 14:43:41 +03:00 committed by apn
parent bda0b631c8
commit 7755fe829e
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Draw/Draw_Window.cxx
View File

@ -2041,8 +2041,18 @@ static DWORD WINAPI readStdinThreadFunc()
return 1; return 1;
} }
// set console locale // Console locale could be set to the system codepage .OCP (UTF-8 is not properly supported on Windows).
// However, to use it, we have to care using std::wcerr/fwprintf/WriteConsoleW for non-ascii strings everywhere (including Tcl itself),
// or otherwise we can have incomplete output issues
// (e.g. UNICODE string will be NOT just corrupted as in case when we don't set setlocale()
// but will break further normal output to console due to special characters being accidentally handled by console in the wrong way).
//setlocale (LC_ALL, ".OCP"); //setlocale (LC_ALL, ".OCP");
// _O_U16TEXT can be used with fgetws() to get similar result as ReadConsoleW() without affecting setlocale(),
// however it would break pipe input
//_setmode (_fileno(stdin), _O_U16TEXT);
bool isConsoleInput = true;
for (;;) for (;;)
{ {
while (console_semaphore != WAIT_CONSOLE_COMMAND) while (console_semaphore != WAIT_CONSOLE_COMMAND)
@ -2050,23 +2060,38 @@ static DWORD WINAPI readStdinThreadFunc()
Sleep (100); Sleep (100);
} }
const HANDLE anStdIn = ::GetStdHandle (STD_INPUT_HANDLE);
if (anStdIn != NULL
&& anStdIn != INVALID_HANDLE_VALUE
&& isConsoleInput)
{
DWORD aNbRead = 0; DWORD aNbRead = 0;
if (ReadConsoleW (GetStdHandle(STD_INPUT_HANDLE), console_command, THE_COMMAND_SIZE, &aNbRead, NULL)) if (ReadConsoleW (anStdIn, console_command, THE_COMMAND_SIZE, &aNbRead, NULL))
//if (fgetws (console_command, THE_COMMAND_SIZE, stdin)) // fgetws() works only for characters within active locale (see setlocale())
{ {
console_command[aNbRead] = L'\0'; console_command[aNbRead] = L'\0';
// tcl will skip newline symbols - no need to strip them here console_semaphore = HAS_CONSOLE_COMMAND;
/*--aNbRead;
for (; aNbRead >= 0; --aNbRead)
{
if (console_command[aNbRead] == L'\r'
|| console_command[aNbRead] == L'\n')
{
console_command[aNbRead] = '\0';
continue; continue;
} }
break; else
}*/ {
const DWORD anErr = GetLastError();
if (anErr == ERROR_INVALID_HANDLE)
{
// fallback using fgetws() which would work with pipes
// but supports Unicode only through multi-byte encoding (which is not UTF-8)
isConsoleInput = false;
}
else
{
std::cerr << "Error #" << anErr << " occurred while reading console input\n";
continue;
}
}
}
// fgetws() works only for characters within active locale (see setlocale())
if (fgetws (console_command, THE_COMMAND_SIZE, stdin))
{
console_semaphore = HAS_CONSOLE_COMMAND; console_semaphore = HAS_CONSOLE_COMMAND;
} }
} }