[ros-diffs] [reactos] 01/01: [CDFS_NEW] Bugfix for f88fe43: don't delete devices twice on shutdown. With that bugfix, I can install ROS from ISO on HDD without troubles :-) CORE-13184

[Pierre Schweitzer]

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

commit cbf0430b56b600c29c1f615117574afcce1a9027
Author: Pierre Schweitzer <pierre(a)reactos.org>
AuthorDate: Sun Nov 12 18:57:11 2017 +0100

    [CDFS_NEW] Bugfix for f88fe43: don't delete devices twice on shutdown.
    With that bugfix, I can install ROS from ISO on HDD without troubles :-)
    CORE-13184
---
 drivers/filesystems/cdfs_new/cdinit.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/filesystems/cdfs_new/cdinit.c
b/drivers/filesystems/cdfs_new/cdinit.c
index aac879a235..b6bec14c45 100755
--- a/drivers/filesystems/cdfs_new/cdinit.c
+++ b/drivers/filesystems/cdfs_new/cdinit.c
@@ -241,10 +241,16 @@ Return Value:
 
 --*/
 {
+#ifdef __REACTOS__
+    ASSERT(DeviceObject == CdData.FileSystemDeviceObject ||
+           DeviceObject == CdData.HddFileSystemDeviceObject);
+#endif
+
     IoUnregisterFileSystem (DeviceObject);
+#ifndef __REACTOS__
     IoDeleteDevice (CdData.FileSystemDeviceObject);
-#ifdef __REACTOS__
-    IoDeleteDevice (CdData.HddFileSystemDeviceObject);
+#else
+    IoDeleteDevice (DeviceObject);
 #endif
 
     CdCompleteRequest( NULL, Irp, STATUS_SUCCESS );