drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: utils: ldd: use GetFinalPathNameByHandleW 

drop replacement function GetFileNameFromHandle which was
only required pre-Vista.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-05-20 23:07:05 +02:00
parent 8c6c9b097d
commit 6462a0844d
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
winsup/utils/ldd.cc
View File

@ -56,7 +56,6 @@ struct option longopts[] =
const char *opts = "dhruvV"; const char *opts = "dhruvV";
static int process_file (const wchar_t *); static int process_file (const wchar_t *);
static void *drive_map;
static int static int
error (const char *fmt, ...) error (const char *fmt, ...)
@ -155,32 +154,6 @@ get_module_filename (HANDLE hp, HMODULE hm)
return buf; 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 * static wchar_t *
load_dll (const wchar_t *fn) 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 (!fullpath)
{ {
// if no path found yet, try getting it from an open handle to the DLL // if no path found yet, try getting it from an open handle to the DLL
wchar_t dllname[MAX_PATH+1]; wchar_t dllname[PATH_MAX];
if (GetFileNameFromHandle (dll->hFile, dllname)) if (GetFinalPathNameByHandleW (dll->hFile, dllname, PATH_MAX, 0))
{ {
fn = tocyg (dllname); fn = tocyg (dllname);
saw_file (basename (fn)); saw_file (basename (fn));
@ -465,8 +438,6 @@ main (int argc, char **argv)
while ((fn = *argv++)) while ((fn = *argv++))
if (report (fn, multiple)) if (report (fn, multiple))
ret = 1; ret = 1;
if (drive_map)
cygwin_internal (CW_FREE_DRIVE_MAP, drive_map);
exit (ret); exit (ret);
} }