From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 92YXIFJDc2DddQAAWB0awg (envelope-from ) for ; Sun, 11 Apr 2021 14:43:30 -0400 Received: by simark.ca (Postfix, from userid 112) id 75E341EF4F; Sun, 11 Apr 2021 14:43:30 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 159251E789 for ; Sun, 11 Apr 2021 14:43:29 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9383A384605A; Sun, 11 Apr 2021 18:43:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9383A384605A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1618166608; bh=kjPSel1pDanjpBq7MPkthKER8hgGhpwa1Q97oQQvCBI=; h=Date:To:In-Reply-To:Subject:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=N/W96kRJPK0URg4Et6lAHYLuGdLdSA5JQbNOEsvxB09OZ28ZOMgfPv0gFZMe/TyX0 Ff/jjw0xh906x0WT4MhOxxo0nC+DBDG2gVXGp6JP2OMA8qEhNTP4ijgl/rDkR/lNoV xGU8xg24kgdBguiZOglG5Hoc/Ex40lbmjTAR6UJk= Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id 5F67F384605A for ; Sun, 11 Apr 2021 18:43:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5F67F384605A Received: from fencepost.gnu.org ([2001:470:142:3::e]:38070) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVf3L-0005KQ-Mr; Sun, 11 Apr 2021 14:43:23 -0400 Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:2214 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lVf3L-0001sH-4k; Sun, 11 Apr 2021 14:43:23 -0400 Date: Sun, 11 Apr 2021 21:43:03 +0300 Message-Id: <83v98s3bns.fsf@gnu.org> To: Simon Marchi In-Reply-To: (message from Simon Marchi on Sun, 11 Apr 2021 08:27:55 -0400) Subject: Re: Subtle problems with "info sharedlibrary" on MS-Windows References: <83czw7p4nd.fsf@gnu.org> <777379173.1335754.1615393830518@mail.yahoo.com> <83mtvbne96.fsf@gnu.org> <259022839.1083386.1615397702855@mail.yahoo.com> <83y2dwbow6.fsf@gnu.org> <83lf9vbljw.fsf@gnu.org> <87sg3ygp1d.fsf@tromey.com> <834kge57z0.fsf@gnu.org> <91c6b291-f9f3-0ee9-1ef1-31ba6bb65326@polymtl.ca> <83v98t47po.fsf@gnu.org> X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Eli Zaretskii via Gdb-patches Reply-To: Eli Zaretskii Cc: tom@tromey.com, gdb-patches@sourceware.org Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" > Cc: tom@tromey.com, gdb-patches@sourceware.org > From: Simon Marchi > Date: Sun, 11 Apr 2021 08:27:55 -0400 > > > I'd actually prefer it the other way around, for 2 reasons: (a) the > > patch for windows-nat.c is already in, so it would make sense to fix > > gdbserver ASAP; (b) I built with the patch a recent snapshot of master > > where these conditions are still present, and I would like to avoid > > the need to build yet another snapshot just for this small change. > > Ok, now that I re-read the patch, I realize that the _WIN32_WCE macro > doesn't add much complexity, I thought it was worst at first. So, the > patch LGTM, with a proper commit message and ChangeLog entry of course. Thanks, done. Below is the actual change I pushed: commit 114ee2a4aef573bf43ab71b9d0b85aaccfd8852e Author: Eli Zaretskii AuthorDate: Sun Apr 11 21:37:29 2021 +0300 Commit: Eli Zaretskii CommitDate: Sun Apr 11 21:37:29 2021 +0300 Improve support for loading DLLs at run time in gdbserver. This fixes win32-low.cc in the same way as a recent change in windows-nat.c did for GDB: if the lpImageName member of the load-DLL debug event doesn't allow us to find the file name of the DLL, then loop over all the DLLs mapped into the inferior to find the one loaded at the same base address as given by the lpBaseOfDll member of the debug event. gdbserver/ChangeLog: 2021-04-11 Eli Zaretskii * win32-low.cc (win32_add_dll): New function, with body almost identical to what win32_add_all_dlls did. Accepts one argument; if that is non-NULL, returns the file name of the DLL that is loaded at the base address equal to that argument, or NULL if not found. If the argument is NULL, add all the DLLs loaded by the inferior to the list of solibs and return NULL. (win32_add_all_dlls): Now a thin wrapper around win32_add_dll. (windows_nat::handle_load_dll) [!_WIN32_WCE]: If get_image_name failed to glean the file name of the DLL, call win32_add_dll to try harder using the lpBaseOfDll member of the load-DLL event. diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 58ed0f0..029a2e4 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,16 @@ +2021-04-11 Eli Zaretskii + + * win32-low.cc (win32_add_dll): New function, with body almost + identical to what win32_add_all_dlls did. Accepts one argument; + if that is non-NULL, returns the file name of the DLL that is + loaded at the base address equal to that argument, or NULL if not + found. If the argument is NULL, add all the DLLs loaded by the + inferior to the list of solibs and return NULL. + (win32_add_all_dlls): Now a thin wrapper around win32_add_dll. + (windows_nat::handle_load_dll) [!_WIN32_WCE]: If get_image_name + failed to glean the file name of the DLL, call win32_add_dll to + try harder using the lpBaseOfDll member of the load-DLL event. + 2021-03-30 Luis Machado * server.cc (handle_general_set, handle_query): Update variable diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 1f319a2..f6d35ca 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1165,11 +1165,13 @@ load_psapi (void) #ifndef _WIN32_WCE -/* Iterate over all DLLs currently mapped by our inferior, and - add them to our list of solibs. */ +/* Iterate over all DLLs currently mapped by our inferior, looking for + a DLL loaded at LOAD_ADDR; if found, return its file name, + otherwise return NULL. If LOAD_ADDR is NULL, add all mapped DLLs + to our list of solibs. */ -static void -win32_add_all_dlls (void) +static char * +win32_add_dll (LPVOID load_addr) { size_t i; HMODULE dh_buf[1]; @@ -1178,7 +1180,7 @@ win32_add_all_dlls (void) BOOL ok; if (!load_psapi ()) - return; + return NULL; cbNeeded = 0; #ifdef __x86_64__ @@ -1196,11 +1198,11 @@ win32_add_all_dlls (void) &cbNeeded); if (!ok || !cbNeeded) - return; + return NULL; DllHandle = (HMODULE *) alloca (cbNeeded); if (!DllHandle) - return; + return NULL; #ifdef __x86_64__ if (wow64_process) @@ -1216,7 +1218,7 @@ win32_add_all_dlls (void) cbNeeded, &cbNeeded); if (!ok) - return; + return NULL; char system_dir[MAX_PATH]; char syswow_dir[MAX_PATH]; @@ -1252,7 +1254,7 @@ win32_add_all_dlls (void) for (i = 1; i < ((size_t) cbNeeded / sizeof (HMODULE)); i++) { MODULEINFO mi; - char dll_name[MAX_PATH]; + static char dll_name[MAX_PATH]; if (!(*win32_GetModuleInformation) (current_process_handle, DllHandle[i], @@ -1265,6 +1267,9 @@ win32_add_all_dlls (void) MAX_PATH) == 0) continue; + if (load_addr != nullptr && mi.lpBaseOfDll != load_addr) + continue; + const char *name = dll_name; /* Convert the DLL path of 32bit processes returned by GetModuleFileNameEx from the 64bit system directory to the @@ -1279,10 +1284,27 @@ win32_add_all_dlls (void) name = syswow_dll_path.c_str(); } - win32_add_one_solib (name, (CORE_ADDR) (uintptr_t) mi.lpBaseOfDll); + if (load_addr != nullptr) + { + if (name != dll_name) + strcpy (dll_name, name); + return dll_name; + } + else + win32_add_one_solib (name, (CORE_ADDR) (uintptr_t) mi.lpBaseOfDll); } + return NULL; } -#endif + +/* Iterate over all DLLs currently mapped by our inferior, and + add them to our list of solibs. */ + +static void +win32_add_all_dlls (void) +{ + win32_add_dll (NULL); +} +#endif /* !_WIN32_WCE */ typedef HANDLE (WINAPI *winapi_CreateToolhelp32Snapshot) (DWORD, DWORD); typedef BOOL (WINAPI *winapi_Module32First) (HANDLE, LPMODULEENTRY32); @@ -1298,7 +1320,12 @@ windows_nat::handle_load_dll () dll_name = get_image_name (current_process_handle, event->lpImageName, event->fUnicode); - if (!dll_name) +#ifndef _WIN32_WCE + if (dll_name == nullptr + && event->lpBaseOfDll != nullptr) + dll_name = win32_add_dll (event->lpBaseOfDll); +#endif + if (dll_name == nullptr) return; win32_add_one_solib (dll_name, (CORE_ADDR) (uintptr_t) event->lpBaseOfDll);