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

In FILE_ID_BOTH_DIR_INFORMATION it's actually FileId, not IndexNumber

Browse Source 
* ntdll.h (FILE_ID_BOTH_DIR_INFORMATION): Revert IndexNumber to FileId
        since it's actually right here.
        * fhandler_disk_file.cc: Accommodate above change.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-12-09 18:11:47 +01:00
parent 5b9873fa72
commit 3da81956e2
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2015-12-09 Corinna Vinschen <corinna@vinschen.de>
* ntdll.h (FILE_ID_BOTH_DIR_INFORMATION): Revert IndexNumber to FileId
since it's actually right here.
* fhandler_disk_file.cc: Accommodate above change.
2015-12-08 Corinna Vinschen <corinna@vinschen.de> 2015-12-08 Corinna Vinschen <corinna@vinschen.de>
* thread.cc (pthread::setcancelstate): Remove unnecessary locking. * thread.cc (pthread::setcancelstate): Remove unnecessary locking.

4
winsup/cygwin/fhandler_disk_file.cc
View File

@ -494,7 +494,7 @@ fhandler_base::fstat_by_name (struct stat *buf)
debug_printf ("%y = NtQueryDirectoryFile(%S)", status, debug_printf ("%y = NtQueryDirectoryFile(%S)", status,
pc.get_nt_native_path ()); pc.get_nt_native_path ());
else else
ino = fdi_buf.fdi.IndexNumber.QuadPart; ino = fdi_buf.fdi.FileId.QuadPart;
} }
} }
return fstat_helper (buf, 1); return fstat_helper (buf, 1);
@ -2339,7 +2339,7 @@ go_ahead:
FileNameLength = buf->FileNameLength; FileNameLength = buf->FileNameLength;
FileAttributes = buf->FileAttributes; FileAttributes = buf->FileAttributes;
if ((dir->__flags & dirent_set_d_ino)) if ((dir->__flags & dirent_set_d_ino))
de->d_ino = buf->IndexNumber.QuadPart; de->d_ino = buf->FileId.QuadPart;
} }
else if ((dir->__flags & dirent_nfs_d_ino)) else if ((dir->__flags & dirent_nfs_d_ino))
{ {

2
winsup/cygwin/ntdll.h
View File

@ -265,7 +265,7 @@ typedef struct _FILE_ID_BOTH_DIR_INFORMATION
ULONG EaSize; ULONG EaSize;
CCHAR ShortNameLength; CCHAR ShortNameLength;
WCHAR ShortName[12]; WCHAR ShortName[12];
LARGE_INTEGER IndexNumber; LARGE_INTEGER FileId;
WCHAR FileName[1]; WCHAR FileName[1];
} FILE_ID_BOTH_DIR_INFORMATION, *PFILE_ID_BOTH_DIR_INFORMATION; } FILE_ID_BOTH_DIR_INFORMATION, *PFILE_ID_BOTH_DIR_INFORMATION;