From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id E45B23857C7E; Mon, 1 Aug 2022 23:16:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E45B23857C7E 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: Modify ConEmu cygwin connector hook. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/cygwin-3_3-branch X-Git-Oldrev: 2b4f986e499f040966be72516dae5b01ef721d24 X-Git-Newrev: 7a469e6dd5e211a9bc7697e9330513edad8f2690 Message-Id: <20220801231641.E45B23857C7E@sourceware.org> Date: Mon, 1 Aug 2022 23:16:41 +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: Mon, 01 Aug 2022 23:16:42 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D7a469e6dd5e= 211a9bc7697e9330513edad8f2690 commit 7a469e6dd5e211a9bc7697e9330513edad8f2690 Author: Takashi Yano Date: Tue Aug 2 07:42:53 2022 +0900 Cygwin: console: Modify ConEmu cygwin connector hook. =20 - 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. Diff: --- winsup/cygwin/fhandler_console.cc | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_con= sole.cc index 41b3fd6b8..b5594a673 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -3988,7 +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 */ +DEF_HOOK (GetProcAddress); /* Hooked for ConEmu cygwin connector */ =20 static BOOL WINAPI CreateProcessA_Hooked @@ -4031,21 +4031,12 @@ ContinueDebugEvent_Hooked } =20 /* 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 =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 + if (strcmp(n, "RequestTermConnector") =3D=3D 0) fhandler_console::set_disable_master_thread (true); - return LoadLibraryA_Orig (m); + return GetProcAddress_Orig (h, n); } =20 void @@ -4074,7 +4065,7 @@ fhandler_console::fixup_after_fork_exec (bool execing) static void hook_conemu_cygwin_connector() { - DO_HOOK (NULL, LoadLibraryA); + DO_HOOK (NULL, GetProcAddress); } =20 // #define WINSTA_ACCESS (WINSTA_READATTRIBUTES | STANDARD_RIGHTS_READ | S= TANDARD_RIGHTS_WRITE | WINSTA_CREATEDESKTOP | WINSTA_EXITWINDOWS)