From fb6e28b8a0714e4a343ae40c656c832a6167ee79 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Wed, 12 Jan 2005 11:07:31 +0000 Subject: [PATCH] Herve Poussineau - Use documented structures names instead of ReactOS equivalents. - Replace CcMapData with CcPinRead on places where we're modifying the data. svn path=/trunk/; revision=12956 --- reactos/drivers/fs/vfat/dir.c | 18 +++++++++--------- reactos/drivers/fs/vfat/dirwr.c | 22 +++++++++++----------- reactos/drivers/fs/vfat/fat.c | 12 ++++++------ reactos/drivers/fs/vfat/volume.c | 6 +++--- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/reactos/drivers/fs/vfat/dir.c b/reactos/drivers/fs/vfat/dir.c index f1c2804b3dc..3fe9ae83023 100644 --- a/reactos/drivers/fs/vfat/dir.c +++ b/reactos/drivers/fs/vfat/dir.c @@ -166,14 +166,14 @@ VfatGetFileDirectoryInformation (PVFAT_DIRENTRY_CONTEXT DirContext, NTSTATUS VfatGetFileFullDirectoryInformation (PVFAT_DIRENTRY_CONTEXT DirContext, PDEVICE_EXTENSION DeviceExt, - PFILE_FULL_DIRECTORY_INFORMATION pInfo, + PFILE_FULL_DIR_INFORMATION pInfo, ULONG BufferLength) { - if ((sizeof (FILE_FULL_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) + if ((sizeof (FILE_FULL_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) return STATUS_BUFFER_OVERFLOW; pInfo->FileNameLength = DirContext->LongNameU.Length; pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_FULL_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_FULL_DIR_INFORMATION) + DirContext->LongNameU.Length); RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); // pInfo->FileIndex=; if (DeviceExt->Flags & VCB_IS_FATX) @@ -220,10 +220,10 @@ VfatGetFileFullDirectoryInformation (PVFAT_DIRENTRY_CONTEXT DirContext, NTSTATUS VfatGetFileBothInformation (PVFAT_DIRENTRY_CONTEXT DirContext, PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIRECTORY_INFORMATION pInfo, + PFILE_BOTH_DIR_INFORMATION pInfo, ULONG BufferLength) { - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) return STATUS_BUFFER_OVERFLOW; if (DeviceExt->Flags & VCB_IS_FATX) @@ -231,7 +231,7 @@ VfatGetFileBothInformation (PVFAT_DIRENTRY_CONTEXT DirContext, pInfo->FileNameLength = DirContext->LongNameU.Length; RtlCopyMemory(pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length); pInfo->ShortName[0] = 0; pInfo->ShortNameLength = 0; // pInfo->FileIndex=; @@ -264,7 +264,7 @@ VfatGetFileBothInformation (PVFAT_DIRENTRY_CONTEXT DirContext, { pInfo->FileNameLength = DirContext->LongNameU.Length; pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length); RtlCopyMemory(pInfo->ShortName, DirContext->ShortNameU.Buffer, DirContext->ShortNameU.Length); pInfo->ShortNameLength = DirContext->ShortNameU.Length; RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); @@ -427,13 +427,13 @@ NTSTATUS DoQuery (PVFAT_IRP_CONTEXT IrpContext) case FileFullDirectoryInformation: RC = VfatGetFileFullDirectoryInformation (&DirContext, IrpContext->DeviceExt, - (PFILE_FULL_DIRECTORY_INFORMATION) Buffer, + (PFILE_FULL_DIR_INFORMATION) Buffer, BufferLength); break; case FileBothDirectoryInformation: RC = VfatGetFileBothInformation (&DirContext, IrpContext->DeviceExt, - (PFILE_BOTH_DIRECTORY_INFORMATION) Buffer, + (PFILE_BOTH_DIR_INFORMATION) Buffer, BufferLength); break; default: diff --git a/reactos/drivers/fs/vfat/dirwr.c b/reactos/drivers/fs/vfat/dirwr.c index 8fdd988faf0..e280c597de9 100644 --- a/reactos/drivers/fs/vfat/dirwr.c +++ b/reactos/drivers/fs/vfat/dirwr.c @@ -49,7 +49,7 @@ VfatUpdateEntry (PVFATFCB pFcb) Offset.u.HighPart = 0; Offset.u.LowPart = dirIndex * SizeDirEntry; - if (CcMapData (pFcb->parentFcb->FileObject, &Offset, SizeDirEntry, + if (CcPinRead (pFcb->parentFcb->FileObject, &Offset, SizeDirEntry, TRUE, &Context, (PVOID*)&PinEntry)) { pFcb->Flags &= ~FCB_IS_DIRTY; @@ -99,7 +99,7 @@ vfatFindDirSpace(PDEVICE_EXTENSION DeviceExt, CcUnpinData(Context); } // FIXME: check return value - CcMapData (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, + CcPinRead (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); FileOffset.u.LowPart += DeviceExt->FatInfo.BytesPerCluster; } @@ -153,7 +153,7 @@ vfatFindDirSpace(PDEVICE_EXTENSION DeviceExt, // clear the new dir cluster FileOffset.u.LowPart = (ULONG)(pDirFcb->RFCB.FileSize.QuadPart - DeviceExt->FatInfo.BytesPerCluster); - CcMapData (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, + CcPinRead (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); if (DeviceExt->Flags & VCB_IS_FATX) memset(pFatEntry, 0xff, DeviceExt->FatInfo.BytesPerCluster); @@ -164,7 +164,7 @@ vfatFindDirSpace(PDEVICE_EXTENSION DeviceExt, { // clear the entry after the last new entry FileOffset.u.LowPart = (*start + nbSlots) * SizeDirEntry; - CcMapData (pDirFcb->FileObject, &FileOffset, SizeDirEntry, + CcPinRead (pDirFcb->FileObject, &FileOffset, SizeDirEntry, TRUE, &Context, (PVOID*)&pFatEntry); if (DeviceExt->Flags & VCB_IS_FATX) memset(pFatEntry, 0xff, SizeDirEntry); @@ -448,7 +448,7 @@ FATAddEntry (PDEVICE_EXTENSION DeviceExt, { /* one cluster */ CHECKPOINT; - CcMapData (ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY), + CcPinRead (ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY), TRUE, &Context, (PVOID*)&pFatEntry); if (nbSlots > 1) { @@ -463,13 +463,13 @@ FATAddEntry (PDEVICE_EXTENSION DeviceExt, size = DeviceExt->FatInfo.BytesPerCluster - (DirContext.StartIndex * sizeof(FAT_DIR_ENTRY)) % DeviceExt->FatInfo.BytesPerCluster; i = size / sizeof(FAT_DIR_ENTRY); - CcMapData (ParentFcb->FileObject, &FileOffset, size, TRUE, + CcPinRead (ParentFcb->FileObject, &FileOffset, size, TRUE, &Context, (PVOID*)&pFatEntry); RtlCopyMemory(pFatEntry, Buffer, size); CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); FileOffset.u.LowPart += size; - CcMapData (ParentFcb->FileObject, &FileOffset, + CcPinRead (ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY) - size, TRUE, &Context, (PVOID*)&pFatEntry); if (nbSlots - 1 > i) @@ -587,7 +587,7 @@ FATXAddEntry (PDEVICE_EXTENSION DeviceExt, /* add entry into parent directory */ FileOffset.u.HighPart = 0; FileOffset.u.LowPart = DirContext.StartIndex * sizeof(FATX_DIR_ENTRY); - CcMapData(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), + CcPinRead(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), TRUE, &Context, (PVOID*)&pFatXDirEntry); RtlCopyMemory(pFatXDirEntry, &DirContext.DirEntry.FatX, sizeof(FATX_DIR_ENTRY)); CcSetDirtyPinnedData(Context, NULL); @@ -641,7 +641,7 @@ FATDelEntry (PDEVICE_EXTENSION DeviceExt, PVFATFCB pFcb) CcUnpinData(Context); } Offset.u.LowPart = (i * sizeof(FAT_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; - CcMapData (pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, TRUE, + CcPinRead (pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, TRUE, &Context, (PVOID*)&pDirEntry); } pDirEntry[i % (PAGE_SIZE / sizeof(FAT_DIR_ENTRY))].Filename[0] = 0xe5; @@ -690,10 +690,10 @@ FATXDelEntry (PDEVICE_EXTENSION DeviceExt, PVFATFCB pFcb) DPRINT ("delete entry: %d\n", StartIndex); Offset.u.HighPart = 0; Offset.u.LowPart = (StartIndex * sizeof(FATX_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; - if (!CcMapData (pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, TRUE, + if (!CcPinRead (pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, TRUE, &Context, (PVOID*)&pDirEntry)) { - DPRINT1("CcMapData(Offset %x:%x, Length %d) failed\n", Offset.u.HighPart, Offset.u.LowPart, PAGE_SIZE); + DPRINT1("CcPinRead(Offset %x:%x, Length %d) failed\n", Offset.u.HighPart, Offset.u.LowPart, PAGE_SIZE); return STATUS_UNSUCCESSFUL; } pDirEntry = &pDirEntry[StartIndex % (PAGE_SIZE / sizeof(FATX_DIR_ENTRY))]; diff --git a/reactos/drivers/fs/vfat/fat.c b/reactos/drivers/fs/vfat/fat.c index 433f21324b4..3ed65ea7e63 100644 --- a/reactos/drivers/fs/vfat/fat.c +++ b/reactos/drivers/fs/vfat/fat.c @@ -157,7 +157,7 @@ FAT16FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, for (i = StartCluster; i < FatLength; ) { Offset.QuadPart = ROUND_DOWN(i * 2, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) { DPRINT1("CcMapData(Offset %x, Length %d) failed\n", (ULONG)Offset.QuadPart, ChunkSize); return STATUS_UNSUCCESSFUL; @@ -209,7 +209,7 @@ FAT12FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, PULONG Cluster) *Cluster = 0; StartCluster = DeviceExt->LastAvailableCluster; Offset.QuadPart = 0; - if(!CcMapData(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) { DPRINT1("CcMapData(Offset %x, Length %d) failed\n", (ULONG)Offset.QuadPart, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector); return STATUS_UNSUCCESSFUL; @@ -274,7 +274,7 @@ FAT32FindAndMarkAvailableCluster (PDEVICE_EXTENSION DeviceExt, PULONG Cluster) for (i = StartCluster; i < FatLength;) { Offset.QuadPart = ROUND_DOWN(i * 4, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) { DPRINT1("CcMapData(Offset %x, Length %d) failed\n", (ULONG)Offset.QuadPart, ChunkSize); return STATUS_UNSUCCESSFUL; @@ -491,7 +491,7 @@ FAT12WriteCluster(PDEVICE_EXTENSION DeviceExt, LARGE_INTEGER Offset; Offset.QuadPart = 0; - if(!CcMapData(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -540,7 +540,7 @@ FAT16WriteCluster(PDEVICE_EXTENSION DeviceExt, ChunkSize = CACHEPAGESIZE(DeviceExt); FATOffset = ClusterToWrite * 2; Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -574,7 +574,7 @@ FAT32WriteCluster(PDEVICE_EXTENSION DeviceExt, FATOffset = (ClusterToWrite * 4); Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } diff --git a/reactos/drivers/fs/vfat/volume.c b/reactos/drivers/fs/vfat/volume.c index cc6cbb88c5b..a2521002eb1 100644 --- a/reactos/drivers/fs/vfat/volume.c +++ b/reactos/drivers/fs/vfat/volume.c @@ -233,7 +233,7 @@ FsdSetFsLabelInformation(PDEVICE_OBJECT DeviceObject, /* Search existing volume entry on disk */ FileOffset.QuadPart = 0; - if (CcMapData(pRootFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&Entry)) + if (CcPinRead(pRootFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&Entry)) { while (TRUE) { @@ -256,7 +256,7 @@ FsdSetFsLabelInformation(PDEVICE_OBJECT DeviceObject, { CcUnpinData(Context); FileOffset.u.LowPart += PAGE_SIZE; - if (!CcMapData(pRootFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&Entry)) + if (!CcPinRead(pRootFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&Entry)) { Context = NULL; break; @@ -277,7 +277,7 @@ FsdSetFsLabelInformation(PDEVICE_OBJECT DeviceObject, { FileOffset.u.HighPart = 0; FileOffset.u.LowPart = VolumeLabelDirIndex * SizeDirEntry; - CcMapData(pRootFcb->FileObject, &FileOffset, SizeDirEntry, + CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry, TRUE, &Context, (PVOID*)&Entry); RtlCopyMemory(Entry, &VolumeLabelDirEntry, SizeDirEntry); CcSetDirtyPinnedData(Context, NULL);