Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added a check for valid result pointers in GetDiskFreeSpaceExW.

Browse source 
- Changed from CreateFileW to NtCreateFile in GetVolumeInformationW.
  CreateFileW doesn't allow to open directories.

svn path=/trunk/; revision=3367
This commit is contained in:
Hartmut Birr 2002-08-18 21:07:59 +00:00
parent 0127899031
commit 92de298b36
1 changed files with 48 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
reactos/lib/kernel32/file/volume.c
View file

@ -1,4 +1,4 @@
/* $Id: volume.c,v 1.22 2002/04/26 13:07:33 ekohl Exp $ /* $Id: volume.c,v 1.23 2002/08/18 21:07:59 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -303,13 +303,16 @@ GetDiskFreeSpaceExW(
FileFsSize.BytesPerSector * FileFsSize.SectorsPerAllocationUnit; FileFsSize.BytesPerSector * FileFsSize.SectorsPerAllocationUnit;
// FIXME: Use quota information // FIXME: Use quota information
lpFreeBytesAvailableToCaller->QuadPart = if (lpFreeBytesAvailableToCaller)
BytesPerCluster.QuadPart * FileFsSize.AvailableAllocationUnits.QuadPart; lpFreeBytesAvailableToCaller->QuadPart =
BytesPerCluster.QuadPart * FileFsSize.AvailableAllocationUnits.QuadPart;
lpTotalNumberOfBytes->QuadPart =
BytesPerCluster.QuadPart * FileFsSize.TotalAllocationUnits.QuadPart; if (lpTotalNumberOfBytes)
lpTotalNumberOfFreeBytes->QuadPart = lpTotalNumberOfBytes->QuadPart =
BytesPerCluster.QuadPart * FileFsSize.AvailableAllocationUnits.QuadPart; BytesPerCluster.QuadPart * FileFsSize.TotalAllocationUnits.QuadPart;
if (lpTotalNumberOfFreeBytes)
lpTotalNumberOfFreeBytes->QuadPart =
BytesPerCluster.QuadPart * FileFsSize.AvailableAllocationUnits.QuadPart;
CloseHandle(hFile); CloseHandle(hFile);
return TRUE; return TRUE;
@ -502,6 +505,8 @@ GetVolumeInformationW(
PFILE_FS_VOLUME_INFORMATION FileFsVolume; PFILE_FS_VOLUME_INFORMATION FileFsVolume;
PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute;
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING NtPathU;
USHORT Buffer[FS_VOLUME_BUFFER_SIZE]; USHORT Buffer[FS_VOLUME_BUFFER_SIZE];
USHORT Buffer2[FS_ATTRIBUTE_BUFFER_SIZE]; USHORT Buffer2[FS_ATTRIBUTE_BUFFER_SIZE];
@ -514,13 +519,41 @@ GetVolumeInformationW(
DPRINT("FileFsVolume %p\n", FileFsVolume); DPRINT("FileFsVolume %p\n", FileFsVolume);
DPRINT("FileFsAttribute %p\n", FileFsAttribute); DPRINT("FileFsAttribute %p\n", FileFsAttribute);
hFile = CreateFileW(lpRootPathName, if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpRootPathName,
FILE_READ_ATTRIBUTES, &NtPathU,
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
NULL, NULL))
OPEN_EXISTING, {
FILE_ATTRIBUTE_NORMAL, DPRINT("Invalid path\n");
NULL); SetLastError(ERROR_BAD_PATHNAME);
return FALSE;
}
InitializeObjectAttributes(&ObjectAttributes,
&NtPathU,
FILE_READ_ATTRIBUTES,
NULL,
NULL);
errCode = NtCreateFile (&hFile,
FILE_GENERIC_READ,
&ObjectAttributes,
&IoStatusBlock,
NULL,
0,
FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OPEN,
0,
NULL,
0);
RtlFreeUnicodeString(&NtPathU);
if (!NT_SUCCESS(errCode))
{
SetLastErrorByStatus (errCode);
return FALSE;
}
DPRINT("hFile: %x\n", hFile); DPRINT("hFile: %x\n", hFile);
errCode = NtQueryVolumeInformationFile(hFile, errCode = NtQueryVolumeInformationFile(hFile,