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

Avoid infinite loop in readFontTable when ConEmu has adopted the console

Browse Source 
If we're only examining the table for debugging purposes, then read only
first 1000 fonts and dump them.

If we're reading the font table on XP, then use the undocumented
GetNumberOfConsoleFonts API.  Avoid this API on Vista and up, because it's
undocumented.  It ought to be stable enough on XP.

When ConEmu has adopted the agent console (e.g. there is a ConEmu tab for
the agent's console), then every font in the table will have the same size.
(For now, anyway.  Obviously, the ConEmu author may decide to change the
behavior.)

When `WINPTY_SHOW_CONSOLE=1` is set, and when ConEmu's "Process 'start'"
flag is set, ConEmu will still adopt the winpty-agent console.  It seems
that this case is still broken (on Vista and up), because winpty.dll
notices that its pipe clients have the wrong PID.  I'm not sure what to do
about this.  `WINPTY_SHOW_CONSOLE=1` is strictly intended for debugging
winpty, though, so there's no useful need for ConEmu to adopt the console.
There's no way for me to opt out.  I could disable the security check when
I detect ConEmu, but that's hazardous, and I'm not a fan of the API hooking
anyway.

winpty prints a content-free error, "Error creating winpty." in the above
case.  The error report could be improved to include the traced() error,
"Security check failed: pipe client pid (7492) does not match agent pid (7416)".

Second part of a fix for
https://github.com/rprichard/winpty/issues/70
This commit is contained in:
Ryan Prichard 2016-04-10 17:35:53 -05:00
parent edc979225b
commit 8a769b19f5
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/agent/ConsoleFont.cc
View File

@ -179,6 +179,9 @@ typedef BOOL WINAPI SetConsoleFont_t(
HANDLE hOutput,
DWORD dwFontIndex);
// undocumented XP API
typedef DWORD WINAPI GetNumberOfConsoleFonts_t();
// XP and up
typedef BOOL WINAPI GetCurrentConsoleFont_t(
HANDLE hOutput,
@ -236,18 +239,22 @@ class UndocumentedXPFontAPI : public XPFontAPI {
public:
UndocumentedXPFontAPI() : m_kernel32(L"kernel32.dll") {
GET_MODULE_PROC(m_kernel32, SetConsoleFont);
GET_MODULE_PROC(m_kernel32, GetNumberOfConsoleFonts);
}
bool valid() const {
return this->XPFontAPI::valid() &&
m_SetConsoleFont != NULL;
m_SetConsoleFont != NULL &&
m_GetNumberOfConsoleFonts != NULL;
}
DEFINE_ACCESSOR(SetConsoleFont)
DEFINE_ACCESSOR(GetNumberOfConsoleFonts)
private:
OsModule m_kernel32;
SetConsoleFont_t *m_SetConsoleFont;
GetNumberOfConsoleFonts_t *m_GetNumberOfConsoleFonts;
};
class VistaFontAPI : public XPFontAPI {
@ -272,9 +279,10 @@ private:
SetCurrentConsoleFontEx_t *m_SetCurrentConsoleFontEx;
};
static std::vector<std::pair<DWORD, COORD> > readFontTable(XPFontAPI &api, HANDLE conout) {
static std::vector<std::pair<DWORD, COORD> > readFontTable(
XPFontAPI &api, HANDLE conout, DWORD maxCount) {
std::vector<std::pair<DWORD, COORD> > ret;
for (DWORD i = 0;; ++i) {
for (DWORD i = 0; i < maxCount; ++i) {
COORD size = api.GetConsoleFontSize()(conout, i);
if (size.X == 0 && size.Y == 0) {
break;
@ -285,6 +293,7 @@ static std::vector<std::pair<DWORD, COORD> > readFontTable(XPFontAPI &api, HANDL
}
static void dumpFontTable(HANDLE conout, const char *prefix) {
const int kMaxCount = 1000;
if (!isTracingEnabled()) {
return;
}
@ -293,7 +302,8 @@ static void dumpFontTable(HANDLE conout, const char *prefix) {
trace("dumpFontTable: cannot dump font table -- missing APIs");
return;
}
std::vector<std::pair<DWORD, COORD> > table = readFontTable(api, conout);
std::vector<std::pair<DWORD, COORD> > table =
readFontTable(api, conout, kMaxCount);
std::string line;
char tmp[128];
size_t first = 0;
@ -313,6 +323,10 @@ static void dumpFontTable(HANDLE conout, const char *prefix) {
trace("%s", line.c_str());
first = last + 1;
}
if (table.size() == kMaxCount) {
trace("%sfonts: ... stopped reading at %d fonts ...",
prefix, kMaxCount);
}
}
static std::string stringToCodePoints(const std::wstring &str) {
@ -433,7 +447,11 @@ struct FontSizeComparator {
static void setSmallFontXP(UndocumentedXPFontAPI &api, HANDLE conout) {
// Read the console font table and sort it from smallest to largest.
std::vector<std::pair<DWORD, COORD> > table = readFontTable(api, conout);
const DWORD fontCount = api.GetNumberOfConsoleFonts()();
trace("setSmallFontXP: number of console fonts: %u",
static_cast<unsigned>(fontCount));
std::vector<std::pair<DWORD, COORD> > table =
readFontTable(api, conout, fontCount);
std::sort(table.begin(), table.end(), FontSizeComparator());
for (size_t i = 0; i < table.size(); ++i) {
// Skip especially narrow fonts to permit narrower terminals.