From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 8991838582A1; Thu, 28 Jul 2022 15:17:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8991838582A1 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: console: Add workaround for ConEmu cygwin connector. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/cygwin-3_3-branch X-Git-Oldrev: 0853f89176eb66f50b015adfa6530983d3aa38ee X-Git-Newrev: 28d69dc863a60dc8b997d7f8e025d46d4b57e097 Message-Id: <20220728151728.8991838582A1@sourceware.org> Date: Thu, 28 Jul 2022 15:17:28 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jul 2022 15:17:28 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D28d69dc863a= 60dc8b997d7f8e025d46d4b57e097 commit 28d69dc863a60dc8b997d7f8e025d46d4b57e097 Author: Takashi Yano Date: Thu Jul 28 21:58:04 2022 +0900 Cygwin: console: Add workaround for ConEmu cygwin connector. =20 - 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. Diff: --- winsup/cygwin/fhandler_console.cc | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_con= sole.cc index e90b8d5ee..c7dc8c609 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -1602,6 +1602,8 @@ fhandler_console::dup (fhandler_base *child, int flag= s) return 0; } =20 +static void hook_conemu_cygwin_connector(); + int fhandler_console::open (int flags, mode_t) { @@ -1689,6 +1691,12 @@ fhandler_console::open (int flags, mode_t) =20 if (myself->pid =3D=3D con.owner) { +#ifdef __x86_64__ + if (GetModuleHandle ("ConEmuHk64.dll")) +#else + if (GetModuleHandle ("ConEmuHk.dll")) +#endif + hook_conemu_cygwin_connector (); char name[MAX_PATH]; shared_name (name, CONS_THREAD_SYNC, get_minor ()); thread_sync_event =3D CreateEvent(NULL, FALSE, FALSE, name); @@ -3980,6 +3988,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 */ =20 static BOOL WINAPI CreateProcessA_Hooked @@ -4021,6 +4030,24 @@ ContinueDebugEvent_Hooked return ContinueDebugEvent_Orig (p, t, s); } =20 +/* Hooked for ConEmu cygwin connector */ +static HMODULE WINAPI +LoadLibraryA_Hooked (LPCSTR m) +{ + const char *p; + if ((p =3D strrchr(m, '\\'))) + p++; + else + p =3D m; +#ifdef __x86_64__ + if (strcasecmp(p, "ConEmuHk64.dll") =3D=3D 0) +#else + if (strcasecmp(p, "ConEmuHk.dll") =3D=3D 0) +#endif + fhandler_console::set_disable_master_thread (true); + return LoadLibraryA_Orig (m); +} + void fhandler_console::fixup_after_fork_exec (bool execing) { @@ -4044,6 +4071,12 @@ fhandler_console::fixup_after_fork_exec (bool execin= g) DO_HOOK (NULL, ContinueDebugEvent); } =20 +static void +hook_conemu_cygwin_connector() +{ + DO_HOOK (NULL, LoadLibraryA); +} + // #define WINSTA_ACCESS (WINSTA_READATTRIBUTES | STANDARD_RIGHTS_READ | S= TANDARD_RIGHTS_WRITE | WINSTA_CREATEDESKTOP | WINSTA_EXITWINDOWS) #define WINSTA_ACCESS WINSTA_ALL_ACCESS