Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 03:46:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FASTFAT]

Browse source 
- Stop passing DO, directly pass VCB
- Try to compute some unique value as internal ID for objects. As MS, return the LBO

CORE-13489

svn path=/trunk/; revision=75210
This commit is contained in:
Pierre Schweitzer 2017-06-26 18:10:43 +00:00
parent ef0ae276af
commit 0706d8cb47
3 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/filesystems/fastfat/fastio.c
View file

@ -142,7 +142,7 @@ VfatFastIoQueryBasicInfo(
Status = VfatGetBasicInformation(FileObject, Status = VfatGetBasicInformation(FileObject,
FCB, FCB,
DeviceObject, DeviceObject->DeviceExtension,
Buffer, Buffer,
&BufferLength); &BufferLength);

53
reactos/drivers/filesystems/fastfat/finfo.c
View file

@ -125,13 +125,13 @@ NTSTATUS
VfatGetPositionInformation( VfatGetPositionInformation(
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PVFATFCB FCB, PVFATFCB FCB,
PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt,
PFILE_POSITION_INFORMATION PositionInfo, PFILE_POSITION_INFORMATION PositionInfo,
PULONG BufferLength) PULONG BufferLength)
{ {
UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(FileObject);
UNREFERENCED_PARAMETER(FCB); UNREFERENCED_PARAMETER(FCB);
UNREFERENCED_PARAMETER(DeviceObject); UNREFERENCED_PARAMETER(DeviceExt);
DPRINT("VfatGetPositionInformation()\n"); DPRINT("VfatGetPositionInformation()\n");
@ -239,18 +239,14 @@ NTSTATUS
VfatGetBasicInformation( VfatGetBasicInformation(
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PVFATFCB FCB, PVFATFCB FCB,
PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt,
PFILE_BASIC_INFORMATION BasicInfo, PFILE_BASIC_INFORMATION BasicInfo,
PULONG BufferLength) PULONG BufferLength)
{ {
PDEVICE_EXTENSION DeviceExt;
UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(FileObject);
DPRINT("VfatGetBasicInformation()\n"); DPRINT("VfatGetBasicInformation()\n");
DeviceExt = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension;
if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) if (*BufferLength < sizeof(FILE_BASIC_INFORMATION))
return STATUS_BUFFER_OVERFLOW; return STATUS_BUFFER_OVERFLOW;
@ -310,11 +306,9 @@ NTSTATUS
VfatSetDispositionInformation( VfatSetDispositionInformation(
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PVFATFCB FCB, PVFATFCB FCB,
PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt,
PFILE_DISPOSITION_INFORMATION DispositionInfo) PFILE_DISPOSITION_INFORMATION DispositionInfo)
{ {
PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension;
DPRINT("FsdSetDispositionInformation(<%wZ>, Delete %u)\n", &FCB->PathNameU, DispositionInfo->DeleteFile); DPRINT("FsdSetDispositionInformation(<%wZ>, Delete %u)\n", &FCB->PathNameU, DispositionInfo->DeleteFile);
ASSERT(DeviceExt != NULL); ASSERT(DeviceExt != NULL);
@ -965,14 +959,14 @@ NTSTATUS
VfatGetNameInformation( VfatGetNameInformation(
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PVFATFCB FCB, PVFATFCB FCB,
PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt,
PFILE_NAME_INFORMATION NameInfo, PFILE_NAME_INFORMATION NameInfo,
PULONG BufferLength) PULONG BufferLength)
{ {
ULONG BytesToCopy; ULONG BytesToCopy;
UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(FileObject);
UNREFERENCED_PARAMETER(DeviceObject); UNREFERENCED_PARAMETER(DeviceExt);
ASSERT(NameInfo != NULL); ASSERT(NameInfo != NULL);
ASSERT(FCB != NULL); ASSERT(FCB != NULL);
@ -1009,6 +1003,7 @@ static
NTSTATUS NTSTATUS
VfatGetInternalInformation( VfatGetInternalInformation(
PVFATFCB Fcb, PVFATFCB Fcb,
PDEVICE_EXTENSION DeviceExt,
PFILE_INTERNAL_INFORMATION InternalInfo, PFILE_INTERNAL_INFORMATION InternalInfo,
PULONG BufferLength) PULONG BufferLength)
{ {
@ -1017,8 +1012,9 @@ VfatGetInternalInformation(
if (*BufferLength < sizeof(FILE_INTERNAL_INFORMATION)) if (*BufferLength < sizeof(FILE_INTERNAL_INFORMATION))
return STATUS_BUFFER_OVERFLOW; 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); *BufferLength -= sizeof(FILE_INTERNAL_INFORMATION);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1107,12 +1103,10 @@ NTSTATUS
VfatGetEaInformation( VfatGetEaInformation(
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PVFATFCB Fcb, PVFATFCB Fcb,
PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt,
PFILE_EA_INFORMATION Info, PFILE_EA_INFORMATION Info,
PULONG BufferLength) PULONG BufferLength)
{ {
PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension;
UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(FileObject);
UNREFERENCED_PARAMETER(Fcb); UNREFERENCED_PARAMETER(Fcb);
@ -1137,7 +1131,7 @@ NTSTATUS
VfatGetAllInformation( VfatGetAllInformation(
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PVFATFCB Fcb, PVFATFCB Fcb,
PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt,
PFILE_ALL_INFORMATION Info, PFILE_ALL_INFORMATION Info,
PULONG BufferLength) PULONG BufferLength)
{ {
@ -1150,28 +1144,28 @@ VfatGetAllInformation(
return STATUS_BUFFER_OVERFLOW; return STATUS_BUFFER_OVERFLOW;
/* Basic Information */ /* Basic Information */
Status = VfatGetBasicInformation(FileObject, Fcb, DeviceObject, &Info->BasicInformation, BufferLength); Status = VfatGetBasicInformation(FileObject, Fcb, DeviceExt, &Info->BasicInformation, BufferLength);
if (!NT_SUCCESS(Status)) return Status; if (!NT_SUCCESS(Status)) return Status;
/* Standard Information */ /* Standard Information */
Status = VfatGetStandardInformation(Fcb, &Info->StandardInformation, BufferLength); Status = VfatGetStandardInformation(Fcb, &Info->StandardInformation, BufferLength);
if (!NT_SUCCESS(Status)) return Status; if (!NT_SUCCESS(Status)) return Status;
/* Internal Information */ /* Internal Information */
Status = VfatGetInternalInformation(Fcb, &Info->InternalInformation, BufferLength); Status = VfatGetInternalInformation(Fcb, DeviceExt, &Info->InternalInformation, BufferLength);
if (!NT_SUCCESS(Status)) return Status; if (!NT_SUCCESS(Status)) return Status;
/* EA Information */ /* EA Information */
Status = VfatGetEaInformation(FileObject, Fcb, DeviceObject, &Info->EaInformation, BufferLength); Status = VfatGetEaInformation(FileObject, Fcb, DeviceExt, &Info->EaInformation, BufferLength);
if (!NT_SUCCESS(Status)) return Status; if (!NT_SUCCESS(Status)) return Status;
/* Access Information: The IO-Manager adds this information */ /* Access Information: The IO-Manager adds this information */
*BufferLength -= sizeof(FILE_ACCESS_INFORMATION); *BufferLength -= sizeof(FILE_ACCESS_INFORMATION);
/* Position 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; if (!NT_SUCCESS(Status)) return Status;
/* Mode Information: The IO-Manager adds this information */ /* Mode Information: The IO-Manager adds this information */
*BufferLength -= sizeof(FILE_MODE_INFORMATION); *BufferLength -= sizeof(FILE_MODE_INFORMATION);
/* Alignment Information: The IO-Manager adds this information */ /* Alignment Information: The IO-Manager adds this information */
*BufferLength -= sizeof(FILE_ALIGNMENT_INFORMATION); *BufferLength -= sizeof(FILE_ALIGNMENT_INFORMATION);
/* Name Information */ /* Name Information */
Status = VfatGetNameInformation(FileObject, Fcb, DeviceObject, &Info->NameInformation, BufferLength); Status = VfatGetNameInformation(FileObject, Fcb, DeviceExt, &Info->NameInformation, BufferLength);
return Status; return Status;
} }
@ -1473,7 +1467,7 @@ VfatQueryInformation(
case FilePositionInformation: case FilePositionInformation:
Status = VfatGetPositionInformation(IrpContext->FileObject, Status = VfatGetPositionInformation(IrpContext->FileObject,
FCB, FCB,
IrpContext->DeviceObject, IrpContext->DeviceExt,
SystemBuffer, SystemBuffer,
&BufferLength); &BufferLength);
break; break;
@ -1481,7 +1475,7 @@ VfatQueryInformation(
case FileBasicInformation: case FileBasicInformation:
Status = VfatGetBasicInformation(IrpContext->FileObject, Status = VfatGetBasicInformation(IrpContext->FileObject,
FCB, FCB,
IrpContext->DeviceObject, IrpContext->DeviceExt,
SystemBuffer, SystemBuffer,
&BufferLength); &BufferLength);
break; break;
@ -1489,13 +1483,14 @@ VfatQueryInformation(
case FileNameInformation: case FileNameInformation:
Status = VfatGetNameInformation(IrpContext->FileObject, Status = VfatGetNameInformation(IrpContext->FileObject,
FCB, FCB,
IrpContext->DeviceObject, IrpContext->DeviceExt,
SystemBuffer, SystemBuffer,
&BufferLength); &BufferLength);
break; break;
case FileInternalInformation: case FileInternalInformation:
Status = VfatGetInternalInformation(FCB, Status = VfatGetInternalInformation(FCB,
IrpContext->DeviceExt,
SystemBuffer, SystemBuffer,
&BufferLength); &BufferLength);
break; break;
@ -1510,7 +1505,7 @@ VfatQueryInformation(
case FileAllInformation: case FileAllInformation:
Status = VfatGetAllInformation(IrpContext->FileObject, Status = VfatGetAllInformation(IrpContext->FileObject,
FCB, FCB,
IrpContext->DeviceObject, IrpContext->DeviceExt,
SystemBuffer, SystemBuffer,
&BufferLength); &BufferLength);
break; break;
@ -1518,7 +1513,7 @@ VfatQueryInformation(
case FileEaInformation: case FileEaInformation:
Status = VfatGetEaInformation(IrpContext->FileObject, Status = VfatGetEaInformation(IrpContext->FileObject,
FCB, FCB,
IrpContext->DeviceObject, IrpContext->DeviceExt,
SystemBuffer, SystemBuffer,
&BufferLength); &BufferLength);
break; break;
@ -1630,7 +1625,7 @@ VfatSetInformation(
case FileDispositionInformation: case FileDispositionInformation:
Status = VfatSetDispositionInformation(IrpContext->FileObject, Status = VfatSetDispositionInformation(IrpContext->FileObject,
FCB, FCB,
IrpContext->DeviceObject, IrpContext->DeviceExt,
SystemBuffer); SystemBuffer);
break; break;

2
reactos/drivers/filesystems/fastfat/vfat.h
View file

@ -946,7 +946,7 @@ NTSTATUS
VfatGetBasicInformation( VfatGetBasicInformation(
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PVFATFCB FCB, PVFATFCB FCB,
PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt,
PFILE_BASIC_INFORMATION BasicInfo, PFILE_BASIC_INFORMATION BasicInfo,
PULONG BufferLength); PULONG BufferLength);