[pschweitzer] 75210: [FASTFAT] - Stop passing DO, directly pass VCB - Try to compute some unique value as internal ID for objects. As MS, return the LBO CORE-13489
Author: pschweitzer Date: Mon Jun 26 18:10:43 2017 New Revision: 75210
URL: http://svn.reactos.org/svn/reactos?rev=75210&view=rev Log: [FASTFAT] - Stop passing DO, directly pass VCB - Try to compute some unique value as internal ID for objects. As MS, return the LBO
CORE-13489
Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/vfat.h
Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat... ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Mon Jun 26 18:10:43 2017 @@ -142,7 +142,7 @@
Status = VfatGetBasicInformation(FileObject, FCB, - DeviceObject, + DeviceObject->DeviceExtension, Buffer, &BufferLength);
Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat... ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon Jun 26 18:10:43 2017 @@ -125,13 +125,13 @@ VfatGetPositionInformation( PFILE_OBJECT FileObject, PVFATFCB FCB, - PDEVICE_OBJECT DeviceObject, + PDEVICE_EXTENSION DeviceExt, PFILE_POSITION_INFORMATION PositionInfo, PULONG BufferLength) { UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(FCB); - UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(DeviceExt);
DPRINT("VfatGetPositionInformation()\n");
@@ -239,17 +239,13 @@ VfatGetBasicInformation( PFILE_OBJECT FileObject, PVFATFCB FCB, - PDEVICE_OBJECT DeviceObject, + PDEVICE_EXTENSION DeviceExt, PFILE_BASIC_INFORMATION BasicInfo, PULONG BufferLength) { - PDEVICE_EXTENSION DeviceExt; - UNREFERENCED_PARAMETER(FileObject);
DPRINT("VfatGetBasicInformation()\n"); - - DeviceExt = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension;
if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_OVERFLOW; @@ -310,11 +306,9 @@ VfatSetDispositionInformation( PFILE_OBJECT FileObject, PVFATFCB FCB, - PDEVICE_OBJECT DeviceObject, + PDEVICE_EXTENSION DeviceExt, PFILE_DISPOSITION_INFORMATION DispositionInfo) { - PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; - DPRINT("FsdSetDispositionInformation(<%wZ>, Delete %u)\n", &FCB->PathNameU, DispositionInfo->DeleteFile);
ASSERT(DeviceExt != NULL); @@ -965,14 +959,14 @@ VfatGetNameInformation( PFILE_OBJECT FileObject, PVFATFCB FCB, - PDEVICE_OBJECT DeviceObject, + PDEVICE_EXTENSION DeviceExt, PFILE_NAME_INFORMATION NameInfo, PULONG BufferLength) { ULONG BytesToCopy;
UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(DeviceExt);
ASSERT(NameInfo != NULL); ASSERT(FCB != NULL); @@ -1009,6 +1003,7 @@ NTSTATUS VfatGetInternalInformation( PVFATFCB Fcb, + PDEVICE_EXTENSION DeviceExt, PFILE_INTERNAL_INFORMATION InternalInfo, PULONG BufferLength) { @@ -1017,8 +1012,9 @@
if (*BufferLength < sizeof(FILE_INTERNAL_INFORMATION)) return STATUS_BUFFER_OVERFLOW; - // FIXME: get a real index, that can be used in a create operation - InternalInfo->IndexNumber.QuadPart = 0; + + InternalInfo->IndexNumber.QuadPart = (LONGLONG)vfatDirEntryGetFirstCluster(DeviceExt, &Fcb->entry) * DeviceExt->FatInfo.BytesPerCluster; + *BufferLength -= sizeof(FILE_INTERNAL_INFORMATION); return STATUS_SUCCESS; } @@ -1107,12 +1103,10 @@ VfatGetEaInformation( PFILE_OBJECT FileObject, PVFATFCB Fcb, - PDEVICE_OBJECT DeviceObject, + PDEVICE_EXTENSION DeviceExt, PFILE_EA_INFORMATION Info, PULONG BufferLength) { - PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; - UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(Fcb);
@@ -1137,7 +1131,7 @@ VfatGetAllInformation( PFILE_OBJECT FileObject, PVFATFCB Fcb, - PDEVICE_OBJECT DeviceObject, + PDEVICE_EXTENSION DeviceExt, PFILE_ALL_INFORMATION Info, PULONG BufferLength) { @@ -1150,28 +1144,28 @@ return STATUS_BUFFER_OVERFLOW;
/* Basic Information */ - Status = VfatGetBasicInformation(FileObject, Fcb, DeviceObject, &Info->BasicInformation, BufferLength); + Status = VfatGetBasicInformation(FileObject, Fcb, DeviceExt, &Info->BasicInformation, BufferLength); if (!NT_SUCCESS(Status)) return Status; /* Standard Information */ Status = VfatGetStandardInformation(Fcb, &Info->StandardInformation, BufferLength); if (!NT_SUCCESS(Status)) return Status; /* Internal Information */ - Status = VfatGetInternalInformation(Fcb, &Info->InternalInformation, BufferLength); + Status = VfatGetInternalInformation(Fcb, DeviceExt, &Info->InternalInformation, BufferLength); if (!NT_SUCCESS(Status)) return Status; /* EA Information */ - Status = VfatGetEaInformation(FileObject, Fcb, DeviceObject, &Info->EaInformation, BufferLength); + Status = VfatGetEaInformation(FileObject, Fcb, DeviceExt, &Info->EaInformation, BufferLength); if (!NT_SUCCESS(Status)) return Status; /* Access Information: The IO-Manager adds this information */ *BufferLength -= sizeof(FILE_ACCESS_INFORMATION); /* Position Information */ - Status = VfatGetPositionInformation(FileObject, Fcb, DeviceObject, &Info->PositionInformation, BufferLength); + Status = VfatGetPositionInformation(FileObject, Fcb, DeviceExt, &Info->PositionInformation, BufferLength); if (!NT_SUCCESS(Status)) return Status; /* Mode Information: The IO-Manager adds this information */ *BufferLength -= sizeof(FILE_MODE_INFORMATION); /* Alignment Information: The IO-Manager adds this information */ *BufferLength -= sizeof(FILE_ALIGNMENT_INFORMATION); /* Name Information */ - Status = VfatGetNameInformation(FileObject, Fcb, DeviceObject, &Info->NameInformation, BufferLength); + Status = VfatGetNameInformation(FileObject, Fcb, DeviceExt, &Info->NameInformation, BufferLength);
return Status; } @@ -1473,7 +1467,7 @@ case FilePositionInformation: Status = VfatGetPositionInformation(IrpContext->FileObject, FCB, - IrpContext->DeviceObject, + IrpContext->DeviceExt, SystemBuffer, &BufferLength); break; @@ -1481,7 +1475,7 @@ case FileBasicInformation: Status = VfatGetBasicInformation(IrpContext->FileObject, FCB, - IrpContext->DeviceObject, + IrpContext->DeviceExt, SystemBuffer, &BufferLength); break; @@ -1489,13 +1483,14 @@ case FileNameInformation: Status = VfatGetNameInformation(IrpContext->FileObject, FCB, - IrpContext->DeviceObject, + IrpContext->DeviceExt, SystemBuffer, &BufferLength); break;
case FileInternalInformation: Status = VfatGetInternalInformation(FCB, + IrpContext->DeviceExt, SystemBuffer, &BufferLength); break; @@ -1510,7 +1505,7 @@ case FileAllInformation: Status = VfatGetAllInformation(IrpContext->FileObject, FCB, - IrpContext->DeviceObject, + IrpContext->DeviceExt, SystemBuffer, &BufferLength); break; @@ -1518,7 +1513,7 @@ case FileEaInformation: Status = VfatGetEaInformation(IrpContext->FileObject, FCB, - IrpContext->DeviceObject, + IrpContext->DeviceExt, SystemBuffer, &BufferLength); break; @@ -1630,7 +1625,7 @@ case FileDispositionInformation: Status = VfatSetDispositionInformation(IrpContext->FileObject, FCB, - IrpContext->DeviceObject, + IrpContext->DeviceExt, SystemBuffer); break;
Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat... ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Mon Jun 26 18:10:43 2017 @@ -946,7 +946,7 @@ VfatGetBasicInformation( PFILE_OBJECT FileObject, PVFATFCB FCB, - PDEVICE_OBJECT DeviceObject, + PDEVICE_EXTENSION DeviceExt, PFILE_BASIC_INFORMATION BasicInfo, PULONG BufferLength);
-
pschweitzer＠svn.reactos.org