drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Takashi Yano 2022-08-02 07:42:53 +09:00
parent d5229f8211
commit bfee9c6ab0
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
winsup/cygwin/fhandler_console.cc
View File

@ -3986,7 +3986,7 @@ fhandler_console::set_console_mode_to_native ()
DEF_HOOK (CreateProcessA); DEF_HOOK (CreateProcessA);
DEF_HOOK (CreateProcessW); DEF_HOOK (CreateProcessW);
DEF_HOOK (ContinueDebugEvent); DEF_HOOK (ContinueDebugEvent);
DEF_HOOK (LoadLibraryA); /* Hooked for ConEmu cygwin connector */ DEF_HOOK (GetProcAddress); /* Hooked for ConEmu cygwin connector */
static BOOL WINAPI static BOOL WINAPI
CreateProcessA_Hooked CreateProcessA_Hooked
@ -4029,17 +4029,12 @@ ContinueDebugEvent_Hooked
} }
/* Hooked for ConEmu cygwin connector */ /* Hooked for ConEmu cygwin connector */
static HMODULE WINAPI static FARPROC WINAPI
LoadLibraryA_Hooked (LPCSTR m) GetProcAddress_Hooked (HMODULE h, LPCSTR n)
{ {
const char *p; if (strcmp(n, "RequestTermConnector") == 0)
if ((p = strrchr(m, '\\')))
p++;
else
p = m;
if (strcasecmp(p, "ConEmuHk64.dll") == 0)
fhandler_console::set_disable_master_thread (true); fhandler_console::set_disable_master_thread (true);
return LoadLibraryA_Orig (m); return GetProcAddress_Orig (h, n);
} }
void void
@ -4068,7 +4063,7 @@ fhandler_console::fixup_after_fork_exec (bool execing)
static void static void
hook_conemu_cygwin_connector() hook_conemu_cygwin_connector()
{ {
DO_HOOK (NULL, LoadLibraryA); DO_HOOK (NULL, GetProcAddress);
} }
/* Ugly workaround to create invisible console required since Windows 7. /* Ugly workaround to create invisible console required since Windows 7.