[ros-diffs] [reactos] 04/06: [CDFS] Addendum to 5429771b, 6c733856 and 3c64b4cb (r75579): When the CDFS driver is used as a fixed disk FS, the type of device it should return must not be FILE_DEVICE_CD_ROM, but must be the actual underlying one!

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f488102c863c46763f36c…

commit f488102c863c46763f36c837265a207dc59dadd5
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Dec 30 14:59:08 2018 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Dec 30 15:26:43 2018 +0100

    [CDFS] Addendum to 5429771b, 6c733856 and 3c64b4cb (r75579): When the CDFS driver is
used as a fixed disk FS,
    the type of device it should return must not be FILE_DEVICE_CD_ROM, but must be the
actual underlying one!
    
    This fixes recognizing *removable* USB keys as disks and not CD-ROMs.
    
    CORE-13184
---
 drivers/filesystems/cdfs/volinfo.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/filesystems/cdfs/volinfo.c b/drivers/filesystems/cdfs/volinfo.c
index 7448dd5850..f61c975886 100644
--- a/drivers/filesystems/cdfs/volinfo.c
+++ b/drivers/filesystems/cdfs/volinfo.c
@@ -418,7 +418,11 @@ Return Value:
     //
 
     Buffer->Characteristics = Vcb->TargetDeviceObject->Characteristics;
+#ifndef __REACTOS__
     Buffer->DeviceType = FILE_DEVICE_CD_ROM;
+#else
+    Buffer->DeviceType = Vcb->TargetDeviceObject->DeviceType;
+#endif
 
     //
     //  Adjust the length variable