[FASTFAT]

Get rid of the ENTRY_DELETED2, ENTRY_VOLUME2 and ENTRY_END2 macros.

svn path=/trunk/; revision=73831

diff --git a/reactos/drivers/filesystems/fastfat/create.c b/reactos/drivers/filesystems/fastfat/create.c
index fdbd46d..25f92ba 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/create.c
+++ b/reactos/drivers/filesystems/fastfat/create.c
@@ -115,6 +115,7 @@ FindFile(
     UNICODE_STRING PathNameU;
     UNICODE_STRING FileToFindUpcase;
     BOOLEAN WildCard;
     UNICODE_STRING PathNameU;
     UNICODE_STRING FileToFindUpcase;
     BOOLEAN WildCard;

+    BOOLEAN IsFatX = vfatVolumeIsFatX(DeviceExt);

 
     DPRINT("FindFile(Parent %p, FileToFind '%wZ', DirIndex: %u)\n",
            Parent, FileToFindU, DirContext->DirIndex);
 
     DPRINT("FindFile(Parent %p, FileToFind '%wZ', DirIndex: %u)\n",
            Parent, FileToFindU, DirContext->DirIndex);


@@ -151,7 +152,7 @@ FindFile(
         if (rcFcb)
         {
             ULONG startIndex = rcFcb->startIndex;
         if (rcFcb)
         {
             ULONG startIndex = rcFcb->startIndex;

-            if (vfatVolumeIsFatX(DeviceExt) && !vfatFCBIsRoot(Parent))
+            if (IsFatX && !vfatFCBIsRoot(Parent))

             {
                 startIndex += 2;
             }
             {
                 startIndex += 2;
             }


@@ -194,7 +195,7 @@ FindFile(
         {
             break;
         }
         {
             break;
         }

-        if (ENTRY_VOLUME(DeviceExt, &DirContext->DirEntry))
+        if (ENTRY_VOLUME(IsFatX, &DirContext->DirEntry))

         {
             DirContext->DirIndex++;
             continue;
         {
             DirContext->DirIndex++;
             continue;

diff --git a/reactos/drivers/filesystems/fastfat/dirwr.c b/reactos/drivers/filesystems/fastfat/dirwr.c
index d9e864f..0dded6e 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/dirwr.c
+++ b/reactos/drivers/filesystems/fastfat/dirwr.c
@@ -161,9 +161,10 @@ vfatFindDirSpace(
     PVOID Context = NULL;
     NTSTATUS Status;
     ULONG SizeDirEntry;
     PVOID Context = NULL;
     NTSTATUS Status;
     ULONG SizeDirEntry;

+    BOOLEAN IsFatX = vfatVolumeIsFatX(DeviceExt);

     FileOffset.QuadPart = 0;
 
     FileOffset.QuadPart = 0;
 

-    if (vfatVolumeIsFatX(DeviceExt))
+    if (IsFatX)

         SizeDirEntry = sizeof(FATX_DIR_ENTRY);
     else
         SizeDirEntry = sizeof(FAT_DIR_ENTRY);
         SizeDirEntry = sizeof(FATX_DIR_ENTRY);
     else
         SizeDirEntry = sizeof(FAT_DIR_ENTRY);


@@ -190,11 +191,11 @@ vfatFindDirSpace(
 
             FileOffset.u.LowPart += DeviceExt->FatInfo.BytesPerCluster;
         }
 
             FileOffset.u.LowPart += DeviceExt->FatInfo.BytesPerCluster;
         }

-        if (ENTRY_END(DeviceExt, pFatEntry))
+        if (ENTRY_END(IsFatX, pFatEntry))

         {
             break;
         }
         {
             break;
         }

-        if (ENTRY_DELETED(DeviceExt, pFatEntry))
+        if (ENTRY_DELETED(IsFatX, pFatEntry))

         {
             nbFree++;
         }
         {
             nbFree++;
         }


@@ -249,7 +250,7 @@ vfatFindDirSpace(
             }
             _SEH2_END;
 
             }
             _SEH2_END;
 

-            if (vfatVolumeIsFatX(DeviceExt))
+            if (IsFatX)

                 memset(pFatEntry, 0xff, DeviceExt->FatInfo.BytesPerCluster);
             else
                 RtlZeroMemory(pFatEntry, DeviceExt->FatInfo.BytesPerCluster);
                 memset(pFatEntry, 0xff, DeviceExt->FatInfo.BytesPerCluster);
             else
                 RtlZeroMemory(pFatEntry, DeviceExt->FatInfo.BytesPerCluster);


@@ -268,7 +269,7 @@ vfatFindDirSpace(
             }
             _SEH2_END;
 
             }
             _SEH2_END;
 

-            if (vfatVolumeIsFatX(DeviceExt))
+            if (IsFatX)

                 memset(pFatEntry, 0xff, SizeDirEntry);
             else
                 RtlZeroMemory(pFatEntry, SizeDirEntry);
                 memset(pFatEntry, 0xff, SizeDirEntry);
             else
                 RtlZeroMemory(pFatEntry, SizeDirEntry);

diff --git a/reactos/drivers/filesystems/fastfat/fcb.c b/reactos/drivers/filesystems/fastfat/fcb.c
index 6f88f7a..f8bbab5 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/fcb.c
+++ b/reactos/drivers/filesystems/fastfat/fcb.c
@@ -778,6 +778,7 @@ vfatDirFindFile(
     WCHAR ShortNameBuffer[13];
     BOOLEAN FoundLong = FALSE;
     BOOLEAN FoundShort = FALSE;
     WCHAR ShortNameBuffer[13];
     BOOLEAN FoundLong = FALSE;
     BOOLEAN FoundShort = FALSE;

+    BOOLEAN IsFatX = vfatVolumeIsFatX(pDeviceExt);

 
     ASSERT(pDeviceExt);
     ASSERT(pDirectoryFCB);
 
     ASSERT(pDeviceExt);
     ASSERT(pDirectoryFCB);


@@ -816,7 +817,7 @@ vfatDirFindFile(
         DPRINT("  Index:%u  longName:%wZ\n",
                DirContext.DirIndex, &DirContext.LongNameU);
 
         DPRINT("  Index:%u  longName:%wZ\n",
                DirContext.DirIndex, &DirContext.LongNameU);
 

-        if (!ENTRY_VOLUME(pDeviceExt, &DirContext.DirEntry))
+        if (!ENTRY_VOLUME(IsFatX, &DirContext.DirEntry))

         {
             if (DirContext.LongNameU.Length == 0 ||
                 DirContext.ShortNameU.Length == 0)
         {
             if (DirContext.LongNameU.Length == 0 ||
                 DirContext.ShortNameU.Length == 0)

diff --git a/reactos/drivers/filesystems/fastfat/fsctl.c b/reactos/drivers/filesystems/fastfat/fsctl.c
index c299276..876e7f8 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/fsctl.c
+++ b/reactos/drivers/filesystems/fastfat/fsctl.c
@@ -431,7 +431,7 @@ ReadVolumeLabel(
     {
         while (TRUE)
         {
     {
         while (TRUE)
         {

-            if (ENTRY_VOLUME2(IsFatX, Entry))
+            if (ENTRY_VOLUME(IsFatX, Entry))

             {
                 /* copy volume label */
                 if (IsFatX)
             {
                 /* copy volume label */
                 if (IsFatX)


@@ -446,7 +446,7 @@ ReadVolumeLabel(
                 }
                 break;
             }
                 }
                 break;
             }

-            if (ENTRY_END2(IsFatX, Entry))
+            if (ENTRY_END(IsFatX, Entry))

             {
                 break;
             }
             {
                 break;
             }

diff --git a/reactos/drivers/filesystems/fastfat/vfat.h b/reactos/drivers/filesystems/fastfat/vfat.h
index dbc56e5..7887945 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/vfat.h
+++ b/reactos/drivers/filesystems/fastfat/vfat.h
@@ -197,13 +197,9 @@ typedef struct _slot slot;
 
 #define LONGNAME_MAX_LENGTH    256             // max length for a long filename
 
 
 #define LONGNAME_MAX_LENGTH    256             // max length for a long filename
 

-#define ENTRY_DELETED(DeviceExt, DirEntry) (vfatVolumeIsFatX(DeviceExt) ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat)))
-#define ENTRY_VOLUME(DeviceExt, DirEntry) (vfatVolumeIsFatX(DeviceExt) ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat)))
-#define ENTRY_END(DeviceExt, DirEntry) (vfatVolumeIsFatX(DeviceExt) ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat)))
-
-#define ENTRY_DELETED2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat)))
-#define ENTRY_VOLUME2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat)))
-#define ENTRY_END2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat)))
+#define ENTRY_DELETED(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat)))
+#define ENTRY_VOLUME(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat)))
+#define ENTRY_END(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat)))

 
 #define FAT_ENTRY_DELETED(DirEntry)  ((DirEntry)->Filename[0] == 0xe5)
 #define FAT_ENTRY_END(DirEntry)      ((DirEntry)->Filename[0] == 0)
 
 #define FAT_ENTRY_DELETED(DirEntry)  ((DirEntry)->Filename[0] == 0xe5)
 #define FAT_ENTRY_END(DirEntry)      ((DirEntry)->Filename[0] == 0)

diff --git a/reactos/drivers/filesystems/fastfat/volume.c b/reactos/drivers/filesystems/fastfat/volume.c
index d04cb49..8f5871b 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/volume.c
+++ b/reactos/drivers/filesystems/fastfat/volume.c
@@ -250,17 +250,19 @@ FsdSetFsLabelInformation(
     CHAR cString[43];
     ULONG SizeDirEntry;
     ULONG EntriesPerPage;
     CHAR cString[43];
     ULONG SizeDirEntry;
     ULONG EntriesPerPage;

+    BOOLEAN IsFatX;

 
     DPRINT("FsdSetFsLabelInformation()\n");
 
     DeviceExt = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension;
 
     DPRINT("FsdSetFsLabelInformation()\n");
 
     DeviceExt = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension;

+    IsFatX = vfatVolumeIsFatX(DeviceExt);

 
     if (sizeof(DeviceObject->Vpb->VolumeLabel) < FsLabelInfo->VolumeLabelLength)
     {
         return STATUS_NAME_TOO_LONG;
     }
 
 
     if (sizeof(DeviceObject->Vpb->VolumeLabel) < FsLabelInfo->VolumeLabelLength)
     {
         return STATUS_NAME_TOO_LONG;
     }
 

-    if (vfatVolumeIsFatX(DeviceExt))
+    if (IsFatX)

     {
         if (FsLabelInfo->VolumeLabelLength / sizeof(WCHAR) > 42)
             return STATUS_NAME_TOO_LONG;
     {
         if (FsLabelInfo->VolumeLabelLength / sizeof(WCHAR) > 42)
             return STATUS_NAME_TOO_LONG;


@@ -289,7 +291,7 @@ FsdSetFsLabelInformation(
     if (!NT_SUCCESS(Status))
         return Status;
 
     if (!NT_SUCCESS(Status))
         return Status;
 

-    if (vfatVolumeIsFatX(DeviceExt))
+    if (IsFatX)

     {
         RtlCopyMemory(VolumeLabelDirEntry.FatX.Filename, cString, LabelLen);
         memset(&VolumeLabelDirEntry.FatX.Filename[LabelLen], ' ', 42 - LabelLen);
     {
         RtlCopyMemory(VolumeLabelDirEntry.FatX.Filename, cString, LabelLen);
         memset(&VolumeLabelDirEntry.FatX.Filename[LabelLen], ' ', 42 - LabelLen);


@@ -328,7 +330,7 @@ FsdSetFsLabelInformation(
     {
         while (TRUE)
         {
     {
         while (TRUE)
         {

-            if (ENTRY_VOLUME(DeviceExt, Entry))
+            if (ENTRY_VOLUME(IsFatX, Entry))

             {
                 /* Update entry */
                 LabelFound = TRUE;
             {
                 /* Update entry */
                 LabelFound = TRUE;


@@ -338,7 +340,7 @@ FsdSetFsLabelInformation(
                 break;
             }
 
                 break;
             }
 

-            if (ENTRY_END(DeviceExt, Entry))
+            if (ENTRY_END(IsFatX, Entry))

             {
                 break;
             }
             {
                 break;
             }