ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Avoid depending on the mount manager in fstat(). 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-03-17 10:29:28 +01:00
parent 4d7b49eae6
commit 23ed647773
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/msvcrt/file.c
View File

@ -1754,7 +1754,6 @@ int CDECL _fstat64(int fd, struct _stat64* buf)
ioinfo *info = get_ioinfo(fd); ioinfo *info = get_ioinfo(fd);
DWORD dw; DWORD dw;
DWORD type; DWORD type;
BY_HANDLE_FILE_INFORMATION hfi;
TRACE(":fd (%d) stat (%p)\n", fd, buf); TRACE(":fd (%d) stat (%p)\n", fd, buf);
if (info->handle == INVALID_HANDLE_VALUE) if (info->handle == INVALID_HANDLE_VALUE)
@ -1771,7 +1770,6 @@ int CDECL _fstat64(int fd, struct _stat64* buf)
return -1; return -1;
} }
memset(&hfi, 0, sizeof(hfi));
memset(buf, 0, sizeof(struct _stat64)); memset(buf, 0, sizeof(struct _stat64));
type = GetFileType(info->handle); type = GetFileType(info->handle);
if (type == FILE_TYPE_PIPE) if (type == FILE_TYPE_PIPE)
@ -1788,25 +1786,30 @@ int CDECL _fstat64(int fd, struct _stat64* buf)
} }
else /* FILE_TYPE_DISK etc. */ else /* FILE_TYPE_DISK etc. */
{ {
if (!GetFileInformationByHandle(info->handle, &hfi)) FILE_BASIC_INFORMATION basic_info;
FILE_STANDARD_INFORMATION std_info;
IO_STATUS_BLOCK io;
NTSTATUS status;
if ((status = NtQueryInformationFile( info->handle, &io, &basic_info, sizeof(basic_info), FileBasicInformation )) ||
(status = NtQueryInformationFile( info->handle, &io, &std_info, sizeof(std_info), FileStandardInformation )))
{ {
WARN(":failed-last error (%d)\n",GetLastError()); WARN(":failed-error %x\n",status);
msvcrt_set_errno(ERROR_INVALID_PARAMETER); msvcrt_set_errno(ERROR_INVALID_PARAMETER);
release_ioinfo(info); release_ioinfo(info);
return -1; return -1;
} }
buf->st_mode = _S_IFREG | 0444; buf->st_mode = _S_IFREG | 0444;
if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) if (!(basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY))
buf->st_mode |= 0222; buf->st_mode |= 0222;
buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; buf->st_size = std_info.EndOfFile.QuadPart;
RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastAccessTime, &dw);
buf->st_atime = dw; buf->st_atime = dw;
RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastWriteTime, &dw);
buf->st_mtime = buf->st_ctime = dw; buf->st_mtime = buf->st_ctime = dw;
buf->st_nlink = hfi.nNumberOfLinks; buf->st_nlink = std_info.NumberOfLinks;
TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",basic_info.FileAttributes, buf->st_mode);
} }
TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",hfi.dwFileAttributes,
buf->st_mode);
release_ioinfo(info); release_ioinfo(info);
return 0; return 0;
} }