diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-08-02 07:42:53 +0900 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-08-02 07:52:52 +0900 |
| commit | bfee9c6ab0c3c9a5742e84509d01ec6472aa62c4 (patch) | |
| tree | 6dfa7fe579a38a3b5826a9bb6d4e27a8cb69b25f | |
| parent | d5229f821160c9e9875c4b662f5be097b7cf6d18 (diff) | |
| download | newlib-bfee9c6ab0c3c9a5742e84509d01ec6472aa62c4.zip newlib-bfee9c6ab0c3c9a5742e84509d01ec6472aa62c4.tar.gz newlib-bfee9c6ab0c3c9a5742e84509d01ec6472aa62c4.tar.bz2 | |
Cygwin: console: Modify ConEmu cygwin connector hook.
- Previously, LoadLibraryA() is hooked for ConEmu cygwin connector.
With this patch, GetProcAddress() for "RequestTermConnector" is
hooked instead which is more essential for ConEmu cygwin connector.
| -rw-r--r-- | winsup/cygwin/fhandler_console.cc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index d17f03a..e3d8733 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -3986,7 +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 */ +DEF_HOOK (GetProcAddress); /* Hooked for ConEmu cygwin connector */ static BOOL WINAPI CreateProcessA_Hooked @@ -4029,17 +4029,12 @@ ContinueDebugEvent_Hooked } /* Hooked for ConEmu cygwin connector */ -static HMODULE WINAPI -LoadLibraryA_Hooked (LPCSTR m) +static FARPROC WINAPI +GetProcAddress_Hooked (HMODULE h, LPCSTR n) { - const char *p; - if ((p = strrchr(m, '\\'))) - p++; - else - p = m; - if (strcasecmp(p, "ConEmuHk64.dll") == 0) + if (strcmp(n, "RequestTermConnector") == 0) fhandler_console::set_disable_master_thread (true); - return LoadLibraryA_Orig (m); + return GetProcAddress_Orig (h, n); } void @@ -4068,7 +4063,7 @@ fhandler_console::fixup_after_fork_exec (bool execing) static void hook_conemu_cygwin_connector() { - DO_HOOK (NULL, LoadLibraryA); + DO_HOOK (NULL, GetProcAddress); } /* Ugly workaround to create invisible console required since Windows 7. |