AuroraMiddleware/winpty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flush INPUT_RECORD objects prior to SendMessage/GenerateConsoleCtrlEvent

Browse Source 
Fixes https://github.com/rprichard/winpty/issues/117
This commit is contained in:
Ryan Prichard 2017-05-17 05:29:07 -05:00
parent faf75f74b7
commit 096f978c7a
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/agent/ConsoleInput.cc
View File

@ -343,12 +343,19 @@ void ConsoleInput::doWrite(bool isEof)
idx += charSize;
}
m_byteQueue.erase(0, idx);
DWORD actual = 0;
if (records.size() > 0) {
if (!WriteConsoleInputW(m_conin, records.data(), records.size(), &actual)) {
trace("WriteConsoleInputW failed");
}
flushInputRecords(records);
}
void ConsoleInput::flushInputRecords(std::vector<INPUT_RECORD> &records)
{
if (records.size() == 0) {
return;
}
DWORD actual = 0;
if (!WriteConsoleInputW(m_conin, records.data(), records.size(), &actual)) {
trace("WriteConsoleInputW failed");
}
records.clear();
}
int ConsoleInput::scanInput(std::vector<INPUT_RECORD> &records,
@ -360,6 +367,7 @@ int ConsoleInput::scanInput(std::vector<INPUT_RECORD> &records,
// Ctrl-C.
if (input[0] == '\x03' && (inputConsoleMode() & ENABLE_PROCESSED_INPUT)) {
flushInputRecords(records);
trace("Ctrl-C");
BOOL ret = GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0);
trace("GenerateConsoleCtrlEvent: %d", ret);
@ -652,6 +660,7 @@ void ConsoleInput::appendKeyPress(std::vector<INPUT_RECORD> &records,
virtualKey == VK_HOME ||
virtualKey == VK_END) &&
!ctrl && !leftAlt && !rightAlt && !shift) {
flushInputRecords(records);
if (hasDebugInput) {
trace("sending keypress to console HWND");
}

1
src/agent/ConsoleInput.h
View File

@ -48,6 +48,7 @@ public:
private:
void doWrite(bool isEof);
void flushInputRecords(std::vector<INPUT_RECORD> &records);
int scanInput(std::vector<INPUT_RECORD> &records,
const char *input,
int inputSize,