diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index d983fcce4..1ab962013 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -573,6 +573,7 @@
+
diff --git a/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj b/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj
index b219069a2..d0e1efef5 100644
--- a/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj
+++ b/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj
@@ -59,6 +59,7 @@
+
diff --git a/DiscImageChef.Filesystems/ReFS.cs b/DiscImageChef.Filesystems/ReFS.cs
new file mode 100644
index 000000000..b9a73f01d
--- /dev/null
+++ b/DiscImageChef.Filesystems/ReFS.cs
@@ -0,0 +1,160 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename : ReFS.cs
+// Author(s) : Natalia Portillo
+//
+// Component : Resilient File System plugin
+//
+// --[ Description ] ----------------------------------------------------------
+//
+// Identifies the Resilient File System and shows information.
+//
+// --[ License ] --------------------------------------------------------------
+//
+// This library is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 2.1 of the
+// License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, see .
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2018 Natalia Portillo
+// ****************************************************************************/
+
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using DiscImageChef.CommonTypes;
+using DiscImageChef.Console;
+using DiscImageChef.DiscImages;
+using Schemas;
+
+namespace DiscImageChef.Filesystems
+{
+ public class ReFS : IFilesystem
+ {
+ const uint FSRS = 0x53525346;
+ readonly byte[] refsSignature = {0x52, 0x65, 0x46, 0x53, 0x00, 0x00, 0x00, 0x00};
+ public string Name => "Resilient File System plugin";
+ public Guid Id => new Guid("37766C4E-EBF5-4113-A712-B758B756ABD6");
+ public FileSystemType XmlFsType { get; private set; }
+ public Encoding Encoding { get; private set; }
+
+ public bool Identify(IMediaImage imagePlugin, Partition partition)
+ {
+ RefsVolumeHeader refsVhdr = new RefsVolumeHeader();
+
+ uint sbSize = (uint)(Marshal.SizeOf(refsVhdr) / imagePlugin.Info.SectorSize);
+ if(Marshal.SizeOf(refsVhdr) % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+ if(partition.Start + sbSize >= partition.End) return false;
+
+ byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
+ if(sector.Length < Marshal.SizeOf(refsVhdr)) return false;
+
+ IntPtr sbPtr = Marshal.AllocHGlobal(Marshal.SizeOf(refsVhdr));
+ Marshal.Copy(sector, 0, sbPtr, Marshal.SizeOf(refsVhdr));
+ refsVhdr = (RefsVolumeHeader)Marshal.PtrToStructure(sbPtr, typeof(RefsVolumeHeader));
+ Marshal.FreeHGlobal(sbPtr);
+
+ return refsVhdr.identifier == FSRS && ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.mustBeZero) &&
+ refsVhdr.signature.SequenceEqual(refsSignature);
+ }
+
+ public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+ Encoding encoding)
+ {
+ Encoding = Encoding.UTF8;
+ information = "";
+ RefsVolumeHeader refsVhdr = new RefsVolumeHeader();
+
+ uint sbSize = (uint)(Marshal.SizeOf(refsVhdr) / imagePlugin.Info.SectorSize);
+ if(Marshal.SizeOf(refsVhdr) % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+ if(partition.Start + sbSize >= partition.End) return;
+
+ byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
+ if(sector.Length < Marshal.SizeOf(refsVhdr)) return;
+
+ IntPtr sbPtr = Marshal.AllocHGlobal(Marshal.SizeOf(refsVhdr));
+ Marshal.Copy(sector, 0, sbPtr, Marshal.SizeOf(refsVhdr));
+ refsVhdr = (RefsVolumeHeader)Marshal.PtrToStructure(sbPtr, typeof(RefsVolumeHeader));
+ Marshal.FreeHGlobal(sbPtr);
+
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.jump empty? = {0}",
+ ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.jump));
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.signature = {0}",
+ StringHandlers.CToString(refsVhdr.signature));
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.mustBeZero empty? = {0}",
+ ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.mustBeZero));
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.identifier = {0}",
+ StringHandlers.CToString(BitConverter.GetBytes(refsVhdr.identifier)));
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.length = {0}", refsVhdr.length);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.checksum = 0x{0:X4}", refsVhdr.checksum);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectors = {0}", refsVhdr.sectors);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.bytesPerSector = {0}", refsVhdr.bytesPerSector);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectorsPerCluster = {0}",
+ refsVhdr.sectorsPerCluster);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown1 zero? = {0}", refsVhdr.unknown1 == 0);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown2 zero? = {0}", refsVhdr.unknown2 == 0);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown3 zero? = {0}", refsVhdr.unknown3 == 0);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown4 zero? = {0}", refsVhdr.unknown4 == 0);
+ DicConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown5 empty? = {0}",
+ ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.unknown5));
+
+ if(refsVhdr.identifier != FSRS || !ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.mustBeZero) ||
+ !refsVhdr.signature.SequenceEqual(refsSignature)) return;
+
+ StringBuilder sb = new StringBuilder();
+
+ sb.AppendLine("Microsoft Resilient File System");
+ sb.AppendFormat("Volume uses {0} bytes per sector", refsVhdr.bytesPerSector).AppendLine();
+ sb.AppendFormat("Volume uses {0} sectors per cluster ({1} bytes)", refsVhdr.sectorsPerCluster,
+ refsVhdr.sectorsPerCluster * refsVhdr.bytesPerSector).AppendLine();
+ sb.AppendFormat("Volume has {0} sectors ({1} bytes)", refsVhdr.sectors,
+ refsVhdr.sectors * refsVhdr.bytesPerSector).AppendLine();
+
+ information = sb.ToString();
+
+ XmlFsType = new FileSystemType
+ {
+ Type = "Resilient File System",
+ ClusterSize = (int)(refsVhdr.bytesPerSector * refsVhdr.sectorsPerCluster),
+ Clusters = (long)(refsVhdr.sectors / refsVhdr.sectorsPerCluster)
+ };
+ }
+
+ [StructLayout(LayoutKind.Sequential, Pack = 1)]
+ struct RefsVolumeHeader
+ {
+ [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+ public byte[] jump;
+ [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+ public byte[] signature;
+ [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+ public byte[] mustBeZero;
+ public uint identifier;
+ public ushort length;
+ public ushort checksum;
+ public ulong sectors;
+ public uint bytesPerSector;
+ public uint sectorsPerCluster;
+ public uint unknown1;
+ public uint unknown2;
+ public ulong unknown3;
+ public ulong unknown4;
+ [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15872)]
+ public byte[] unknown5;
+ }
+ }
+}
\ No newline at end of file
diff --git a/DiscImageChef.Tests/Filesystems/ReFS.cs b/DiscImageChef.Tests/Filesystems/ReFS.cs
index d42b18ca8..dcf3a7f74 100644
--- a/DiscImageChef.Tests/Filesystems/ReFS.cs
+++ b/DiscImageChef.Tests/Filesystems/ReFS.cs
@@ -26,11 +26,11 @@
// Copyright © 2011-2018 Natalia Portillo
// ****************************************************************************/
-using System;
using System.Collections.Generic;
using System.IO;
using DiscImageChef.CommonTypes;
using DiscImageChef.DiscImages;
+using DiscImageChef.Filesystems;
using DiscImageChef.Filters;
using NUnit.Framework;
@@ -45,13 +45,13 @@ namespace DiscImageChef.Tests.Filesystems
readonly uint[] sectorsize = {512};
- readonly long[] clusters = {8388096};
+ readonly long[] clusters = {8372224};
readonly int[] clustersize = {4096};
readonly string[] volumename = {null};
- readonly string[] volumeserial = {"UNKNOWN"};
+ readonly string[] volumeserial = {null};
readonly string[] oemid = {null};
@@ -60,16 +60,16 @@ namespace DiscImageChef.Tests.Filesystems
{
for(int i = 0; i < testfiles.Length; i++)
{
- string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "refs_mbr", testfiles[i]);
- IFilter filter = new LZip();
+ string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "refs_mbr", testfiles[i]);
+ IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
- Assert.AreEqual(true, image.Open(filter), testfiles[i]);
- Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
+ Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+ Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
List partitions = Core.Partitions.GetAll(image);
- int part = -1;
- for(int j = 0; j < partitions.Count; j++)
+ int part = -1;
+ for(int j = 0; j < partitions.Count; j++)
if(partitions[j].Type == "0x07")
{
part = j;
@@ -77,17 +77,15 @@ namespace DiscImageChef.Tests.Filesystems
}
Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
- throw new NotImplementedException("ReFS is not yet implemented");
- /*
- Filesystem fs = new DiscImageChef.Filesystems.ReFS();
+ IFilesystem fs = new ReFS();
Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
- fs.GetInformation(image, partitions[part], out _);
- Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]);
- Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]);
- Assert.AreEqual("ReFS", fs.XmlFSType.Type, testfiles[i]);
- Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]);
- Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]);
- Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]);*/
+ fs.GetInformation(image, partitions[part], out _, null);
+ Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+ Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+ Assert.AreEqual("Resilient File System", fs.XmlFsType.Type, testfiles[i]);
+ Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+ Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+ Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
}
}
}