JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: dll_list: drop FILE_BASIC_INFORMATION 

Querying FILE_BASIC_INFORMATION is needless since using win pid+threadid
for forkables dirname rather than newest last write time.
This commit is contained in:
Michael Haubenwallner 2019-04-30 16:14:09 +02:00 committed by Corinna Vinschen
parent a4e62e3a4c
commit 4c79da8017
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/dll_init.cc
View File

@ -372,7 +372,6 @@ dll_list::alloc (HINSTANCE h, per_process *p, dll_type type)
d->image_size = ((pefile*)h)->optional_hdr ()->SizeOfImage;
d->preferred_base = (void*) ((pefile*)h)->optional_hdr()->ImageBase;
d->type = type;
d->fbi.FileAttributes = INVALID_FILE_ATTRIBUTES;
d->fii.IndexNumber.QuadPart = -1LL;
if (!forkntsize)
d->forkable_ntname = NULL;

1
winsup/cygwin/dll_init.h
View File

@ -59,7 +59,6 @@ struct dll
DWORD image_size;
void* preferred_base;
PWCHAR modname;
FILE_BASIC_INFORMATION fbi;
FILE_INTERNAL_INFORMATION fii;
PWCHAR forkable_ntname;
WCHAR ntname[1]; /* must be the last data member */

7
winsup/cygwin/forkable.cc
View File

@ -158,7 +158,7 @@ rmdirs (WCHAR ntmaxpathbuf[NT_MAX_PATH])
static bool
stat_real_file_once (dll *d)
{
if (d->fbi.FileAttributes != INVALID_FILE_ATTRIBUTES)
if (d->fii.IndexNumber.QuadPart != -1LL)
return true;
tmp_pathbuf tp;
@ -194,13 +194,12 @@ stat_real_file_once (dll *d)
if (fhandle == INVALID_HANDLE_VALUE)
return false;
if (!dll_list::read_fii (fhandle, &d->fii) ||
!dll_list::read_fbi (fhandle, &d->fbi))
if (!dll_list::read_fii (fhandle, &d->fii))
system_printf ("WARNING: Unable to read real file attributes for %W",
pmsi1->SectionFileName.Buffer);
NtClose (fhandle);
return d->fbi.FileAttributes != INVALID_FILE_ATTRIBUTES;
return d->fii.IndexNumber.QuadPart != -1LL;
}
/* easy use of NtOpenFile */