[ros-diffs] [ekohl] 69892: [FASTFAT] Ooops! That should not have been committed!

Author: ekohl
Date: Sat Nov 14 21:10:02 2015
New Revision: 69892

URL: http://svn.reactos.org/svn/reactos?rev=69892&view=rev
Log:
[FASTFAT]
Ooops! That should not have been committed!

Modified:
    trunk/reactos/drivers/filesystems/fastfat/finfo.c

Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/finfo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/finfo.c	[iso-8859-1] Sat Nov 14 21:10:02
2015
@@ -340,7 +340,6 @@
 
     if (*FCB->Attributes & FILE_ATTRIBUTE_READONLY)
     {
-DPRINT1("\n");
         return STATUS_CANNOT_DELETE;
     }
 
@@ -349,26 +348,21 @@
         (FCB->LongNameU.Length == 2 * sizeof(WCHAR) &&
FCB->LongNameU.Buffer[0] == L'.' && FCB->LongNameU.Buffer[1] ==
L'.'))
     {
         /* we cannot delete a '.', '..' or the root directory */
-
-DPRINT1("\n");
+        return STATUS_ACCESS_DENIED;
+    }
+
+    if (!MmFlushImageSection (FileObject->SectionObjectPointer, MmFlushForDelete))
+    {
+        /* can't delete a file if its mapped into a process */
+
+        DPRINT("MmFlushImageSection returned FALSE\n");
         return STATUS_CANNOT_DELETE;
-//        return STATUS_ACCESS_DENIED;
-    }
-
-    if (!MmFlushImageSection (FileObject->SectionObjectPointer, MmFlushForDelete))
-    {
-        /* can't delete a file if its mapped into a process */
-
-        DPRINT("MmFlushImageSection returned FALSE\n");
-DPRINT1("\n");
-        return STATUS_CANNOT_DELETE;
     }
 
     if (vfatFCBIsDirectory(FCB) && !VfatIsDirectoryEmpty(FCB))
     {
         /* can't delete a non-empty directory */
 
-DPRINT1("\n");
         return STATUS_DIRECTORY_NOT_EMPTY;
     }