libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-19 04:49:25 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: console: Fix for GNU screen/tmux in ConEmu

Browse Source 
If the master process of GNU screen or tmux is started in ConEmu
and ConEmu is closed, reattaching to the GNU screen/tmux in another
console will not work correctly. This is because the ConEmu master
process was already closed even though some console APIs are hooked
by ConEmuHk64.dll to communicate with ConEmu master process. With
this patch, to make them unhooked, DllMain() of ConEmuHk64.dll is
called with DLL_PROCESS_DETACH.

Fixes: 3721a756b0d8 ("Cygwin: console: Make the console accessible from other terminals.")
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
This commit is contained in:
Takashi Yano 2024-07-08 23:09:12 +09:00
parent 10477d95ec
commit 1fb17a4b2d
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
winsup/cygwin/fhandler/console.cc
View File

@ -33,6 +33,7 @@ details. */
#include "child_info.h"
#include "cygwait.h"
#include "winf.h"
#include "psapi.h"
/* Don't make this bigger than NT_MAX_PATH as long as the temporary buffer
is allocated using tmp_pathbuf!!! */
@ -1970,7 +1971,23 @@ fhandler_console::close ()
if (!have_execed && !invisible_console
&& (!CTTY_IS_VALID (myself->ctty)
|| get_device () == (dev_t) myself->ctty))
free_console ();
{
/* ConEmu hack. Detach from ConEmu to unhook console APIs. */
HMODULE h = GetModuleHandle ("ConEmuHk64.dll");
if (h)
{
MODULEINFO mi;
if (GetModuleInformation (GetCurrentProcess (), h, &mi, sizeof (mi)))
{
BOOL (*DllMain)(HINSTANCE, DWORD, LPVOID) =
(BOOL (*)(HINSTANCE, DWORD, LPVOID)) mi.EntryPoint;
DllMain (h, DLL_PROCESS_DETACH, NULL);
}
}
/* Freeing console to detach the process from the console. */
free_console ();
}
release_output_mutex ();