Author: tthompson
Date: Wed Jul 13 14:49:46 2016
New Revision: 71922
URL: http://svn.reactos.org/svn/reactos?rev=71922&view=rev
Log:
[NTFS]
Various minor changes to fix GCC build.
Modified:
branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c
branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c
Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c?rev=71922&r1=71921&r2=71922&view=diff
==============================================================================
--- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1]
(original)
+++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1]
Wed Jul 13 14:49:46 2016
@@ -202,7 +202,7 @@
}
// advance Destination to the final "attribute" and write the end type
- (ULONG_PTR)Destination += Destination->Length;
+ Destination = (PNTFS_ATTR_RECORD)((ULONG_PTR)Destination +
Destination->Length);
Destination->Type = AttributeEnd;
// write the final marker (which shares the same offset and type as the
Length field)
@@ -245,7 +245,7 @@
ULONG NextAssignedCluster;
ULONG AssignedClusters;
- NTSTATUS Status = GetLastClusterInDataRun(Fcb->Vcb,
&AttrContext->Record, &LastClusterInDataRun.QuadPart);
+ NTSTATUS Status = GetLastClusterInDataRun(Fcb->Vcb,
&AttrContext->Record, (PULONGLONG)&LastClusterInDataRun.QuadPart);
DPRINT1("GetLastClusterInDataRun returned: %I64u\n",
LastClusterInDataRun.QuadPart);
DPRINT1("Highest VCN of record: %I64u\n",
AttrContext->Record.NonResident.HighestVCN);
Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c?rev=71922&r1=71921&r2=71922&view=diff
==============================================================================
--- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1]
(original)
+++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1]
Wed Jul 13 14:49:46 2016
@@ -114,9 +114,11 @@
PFILE_RECORD_HEADER BitmapRecord;
PNTFS_ATTR_CONTEXT DataContext;
ULONGLONG BitmapDataSize;
- PCHAR BitmapData;
+ PUCHAR BitmapData;
ULONGLONG FreeClusters = 0;
RTL_BITMAP Bitmap;
+ ULONG AssignedRun;
+ ULONG LengthWritten;
DPRINT1("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt,
FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters);
@@ -174,8 +176,7 @@
// TODO: Observe MFT reservation zone
// Can we get one contiguous run?
- ULONG AssignedRun = RtlFindClearBitsAndSet(&Bitmap, DesiredClusters,
FirstDesiredCluster);
- ULONG LengthWritten;
+ AssignedRun = RtlFindClearBitsAndSet(&Bitmap, DesiredClusters,
FirstDesiredCluster);
if (AssignedRun != 0xFFFFFFFF)
{
