diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-07-28 21:58:04 +0900 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-07-28 23:56:42 +0900 |
| commit | f2e39d5230bb73258604446acb84d01ef503268d (patch) | |
| tree | ec7af7774c369b16978a7dc63d446b9436931c95 | |
| parent | d4aacd50e6cfd3188a29c04fc04c126e367c33e8 (diff) | |
| download | newlib-f2e39d5230bb73258604446acb84d01ef503268d.tar.gz newlib-f2e39d5230bb73258604446acb84d01ef503268d.tar.bz2 newlib-f2e39d5230bb73258604446acb84d01ef503268d.zip | |
Cygwin: console: Add workaround for ConEmu cygwin connector.
- ConEmu cygwin connector conflicts with cons_master_thread since
it does not use read() to read console input. With this patch,
cons_master_thread is disabled in ConEmu cygwin connector.
| -rw-r--r-- | winsup/cygwin/fhandler_console.cc | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index c20239d13..37262f638 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -1604,6 +1604,8 @@ fhandler_console::dup (fhandler_base *child, int flags) return 0; } +static void hook_conemu_cygwin_connector(); + int fhandler_console::open (int flags, mode_t) { @@ -1691,6 +1693,8 @@ fhandler_console::open (int flags, mode_t) if (myself->pid == con.owner) { + if (GetModuleHandle ("ConEmuHk64.dll")) + hook_conemu_cygwin_connector (); char name[MAX_PATH]; shared_name (name, CONS_THREAD_SYNC, get_minor ()); thread_sync_event = CreateEvent(NULL, FALSE, FALSE, name); @@ -3982,6 +3986,7 @@ fhandler_console::set_console_mode_to_native () DEF_HOOK (CreateProcessA); DEF_HOOK (CreateProcessW); DEF_HOOK (ContinueDebugEvent); +DEF_HOOK (LoadLibraryA); /* Hooked for ConEmu cygwin connector */ static BOOL WINAPI CreateProcessA_Hooked @@ -4023,6 +4028,20 @@ ContinueDebugEvent_Hooked return ContinueDebugEvent_Orig (p, t, s); } +/* Hooked for ConEmu cygwin connector */ +static HMODULE WINAPI +LoadLibraryA_Hooked (LPCSTR m) +{ + const char *p; + if ((p = strrchr(m, '\\'))) + p++; + else + p = m; + if (strcasecmp(p, "ConEmuHk64.dll") == 0) + fhandler_console::set_disable_master_thread (true); + return LoadLibraryA_Orig (m); +} + void fhandler_console::fixup_after_fork_exec (bool execing) { @@ -4046,6 +4065,12 @@ fhandler_console::fixup_after_fork_exec (bool execing) DO_HOOK (NULL, ContinueDebugEvent); } +static void +hook_conemu_cygwin_connector() +{ + DO_HOOK (NULL, LoadLibraryA); +} + /* Ugly workaround to create invisible console required since Windows 7. First try to just attach to any console which may have started this |