[fireball] 29003: - Merge 29002.

Author: fireball
Date: Tue Sep 11 16:31:30 2007
New Revision: 29003

URL: http://svn.reactos.org/svn/reactos?rev=29003&view=rev
Log:
- Merge 29002.

Modified:
    branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c
    branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c

Modified: branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dr…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c (original)
+++ branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c Tue Sep 11
16:31:30 2007
@@ -199,6 +199,9 @@
 
       NewStatus = IoVerifyVolume(DeviceToVerify, FALSE);
       DPRINT1("IoVerifyVolume() retuned (Status %lx)\n", NewStatus);
+
+      if (NewStatus == STATUS_SUCCESS || NewStatus == STATUS_WRONG_VOLUME)
+          Status = STATUS_SUCCESS;
     }
 
   DPRINT("Returning Status %x\n", Status);

Modified: branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dr…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c (original)
+++ branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c Tue Sep 11
16:31:30 2007
@@ -141,6 +141,10 @@
   DPRINT ("Status %lx\n", Status);
   if (!NT_SUCCESS(Status))
     {
+      if (Status == STATUS_NO_MEDIA_IN_DEVICE || Status == STATUS_VERIFY_REQUIRED)
+      {
+          DeviceExt->VolumeDevice->Flags |= DO_VERIFY_VOLUME;
+      }
       DPRINT1 ("Status %lx\n", Status);
       return Status;
     }