From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 6B219385803D; Thu, 20 May 2021 21:08:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6B219385803D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: utils: ldd: use GetFinalPathNameByHandleW X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 8c6c9b097dc1f6cef0f9ccca47503a158ca3d64d X-Git-Newrev: 6462a0844db160b341a41bfb8c1083d3b9367042 Message-Id: <20210520210802.6B219385803D@sourceware.org> Date: Thu, 20 May 2021 21:08:02 +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, 20 May 2021 21:08:02 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6462a0844db160b341a41bfb8c1083d3b9367042 commit 6462a0844db160b341a41bfb8c1083d3b9367042 Author: Corinna Vinschen Date: Thu May 20 23:07:05 2021 +0200 Cygwin: utils: ldd: use GetFinalPathNameByHandleW drop replacement function GetFileNameFromHandle which was only required pre-Vista. Signed-off-by: Corinna Vinschen Diff: --- winsup/utils/ldd.cc | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/winsup/utils/ldd.cc b/winsup/utils/ldd.cc index 1e1863c1c..183e02cd4 100644 --- a/winsup/utils/ldd.cc +++ b/winsup/utils/ldd.cc @@ -56,7 +56,6 @@ struct option longopts[] = const char *opts = "dhruvV"; static int process_file (const wchar_t *); -static void *drive_map; static int error (const char *fmt, ...) @@ -155,32 +154,6 @@ get_module_filename (HANDLE hp, HMODULE hm) return buf; } -static BOOL -GetFileNameFromHandle(HANDLE hFile, WCHAR pszFilename[MAX_PATH+1]) -{ - BOOL result = FALSE; - ULONG len = 0; - OBJECT_NAME_INFORMATION *ntfn = (OBJECT_NAME_INFORMATION *) alloca (65536); - NTSTATUS status = NtQueryObject (hFile, ObjectNameInformation, - ntfn, 65536, &len); - if (NT_SUCCESS (status)) - { - PWCHAR win32path = ntfn->Name.Buffer; - win32path[ntfn->Name.Length / sizeof (WCHAR)] = L'\0'; - - /* NtQueryObject returns a native NT path. (Try to) convert to Win32. */ - if (!drive_map) - drive_map = (void *) cygwin_internal (CW_ALLOC_DRIVE_MAP); - if (drive_map) - win32path = (PWCHAR) cygwin_internal (CW_MAP_DRIVE_MAP, drive_map, - win32path); - pszFilename[0] = L'\0'; - wcsncat (pszFilename, win32path, MAX_PATH); - result = TRUE; - } - return result; -} - static wchar_t * load_dll (const wchar_t *fn) { @@ -288,8 +261,8 @@ print_dlls (dlls *dll, const wchar_t *dllfn, const wchar_t *process_fn) if (!fullpath) { // if no path found yet, try getting it from an open handle to the DLL - wchar_t dllname[MAX_PATH+1]; - if (GetFileNameFromHandle (dll->hFile, dllname)) + wchar_t dllname[PATH_MAX]; + if (GetFinalPathNameByHandleW (dll->hFile, dllname, PATH_MAX, 0)) { fn = tocyg (dllname); saw_file (basename (fn)); @@ -465,8 +438,6 @@ main (int argc, char **argv) while ((fn = *argv++)) if (report (fn, multiple)) ret = 1; - if (drive_map) - cygwin_internal (CW_FREE_DRIVE_MAP, drive_map); exit (ret); }