DiskAccessLibrary - Win32 specific features can now be enabled or disabled using a conditional compilation symbol

DiskAccessLibrary/DiskAccessLibrary.csproj

@@ -15,7 +15,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;Win32</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -23,7 +23,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;Win32</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -57,6 +57,7 @@
     <Compile Include="Disks\VMDK\VirtualMachineDiskDescriptor.cs" />
     <Compile Include="Disks\VMDK\VirtualMachineDiskExtentEntry.cs" />
     <Compile Include="Disks\VMDK\VirtualMachineDiskType.cs" />
+    <Compile Include="Exceptions\CyclicRedundancyCheckException.cs" />
     <Compile Include="Exceptions\DeviceNotReadyException.cs" />
     <Compile Include="FileSystems\FileSystemHelper.cs" />
     <Compile Include="FileSystems\IExtendableFileSystem.cs" />
@@ -150,6 +151,8 @@
     <Compile Include="Volumes\SimpleVolume.cs" />
     <Compile Include="Volumes\SpannedVolume.cs" />
     <Compile Include="Volumes\StripedVolume.cs" />
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="Win32\Disks\DiskImage.Win32.cs" />
     <Compile Include="Win32\Disks\VMDK\SparseExtent.Win32.cs" />
     <Compile Include="Win32\Disks\VMDK\VirtualMachineDisk.Win32.cs" />

DiskAccessLibrary/Disks/VHD/VirtualHardDisk.cs

@@ -241,15 +241,17 @@ namespace DiskAccessLibrary
         /// <exception cref="System.UnauthorizedAccessException"></exception>
         public static VirtualHardDisk Create(string path, long length)
         {
-            bool hasManageVolumePrivilege = SecurityUtils.ObtainManageVolumePrivilege();
             FileStream stream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None);
             try
             {
                 stream.SetLength(length + 512); // VHD footer is 512 bytes
+#if Win32
+                bool hasManageVolumePrivilege = SecurityUtils.ObtainManageVolumePrivilege();
                 if (hasManageVolumePrivilege)
                 {
                     FileStreamUtils.SetValidLength(stream, length + 512);
                 }
+#endif
             }
             catch (IOException)
             {

DiskAccessLibrary/Exceptions/CyclicRedundancyCheckException.cs

@@ -0,0 +1,24 @@
+/* Copyright (C) 2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+ * 
+ * You can redistribute this program and/or modify it under the terms of
+ * the GNU Lesser Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ */
+using System.IO;
+
+namespace DiskAccessLibrary
+{
+    public class CyclicRedundancyCheckException : IOException
+    {
+        public CyclicRedundancyCheckException() : this("Data Error (Cyclic Redundancy Check)")
+        {
+        }
+
+        public CyclicRedundancyCheckException(string message) : base(message)
+        {
+#if Win32
+            HResult = (int)Win32Error.ERROR_CRC;
+#endif
+        }
+    }
+}

DiskAccessLibrary/Exceptions/DeviceNotReadyException.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -10,14 +10,15 @@ namespace DiskAccessLibrary
 {
     public class DeviceNotReadyException : IOException
     {
-        public DeviceNotReadyException() : base()
+        public DeviceNotReadyException() : this("Device Not Ready")
         {
-            HResult = (int)Win32Error.ERROR_NOT_READY;
         }
 
         public DeviceNotReadyException(string message) : base(message)
         {
+#if Win32
             HResult = (int)Win32Error.ERROR_NOT_READY;
+#endif
         }
     }
 }

DiskAccessLibrary/Win32/Utilities/FileStreamEx.cs

@@ -76,7 +76,8 @@ namespace DiskAccessLibrary
             }
             else if (errorCode == (int)Win32Error.ERROR_CRC)
             {
-                throw new IOException("Data errorCode (cyclic redundancy check).", (int)Win32Error.ERROR_CRC);
+                string message = defaultMessage + " Data Error (Cyclic Redundancy Check).";
+                throw new CyclicRedundancyCheckException(message);
             }
             else if (errorCode == (int)Win32Error.ERROR_NO_SYSTEM_RESOURCES)
             {

ISCSI/SCSITarget/VirtualSCSITarget.cs

@@ -368,21 +368,17 @@ namespace SCSI
                 response = FormatSenseData(SenseDataParameter.GetIllegalRequestLBAOutOfRangeSenseData());
                 return SCSIStatusCodeName.CheckCondition;
             }
+            catch (CyclicRedundancyCheckException)
+            {
+                Log(Severity.Error, "Read error: CRC error");
+                response = FormatSenseData(SenseDataParameter.GetWriteFaultSenseData());
+                return SCSIStatusCodeName.CheckCondition;
+            }
             catch (IOException ex)
             {
-                int error = Marshal.GetHRForException(ex);
-                if (error == (int)Win32Error.ERROR_CRC)
-                {
-                    Log(Severity.Error, "Read error: CRC error");
-                    response = FormatSenseData(SenseDataParameter.GetWriteFaultSenseData());
-                    return SCSIStatusCodeName.CheckCondition;
-                }
-                else
-                {
-                    Log(Severity.Error, "Read error: {0}", ex.ToString());
-                    response = FormatSenseData(SenseDataParameter.GetMediumErrorUnrecoverableReadErrorSenseData());
-                    return SCSIStatusCodeName.CheckCondition;
-                }
+                Log(Severity.Error, "Read error: {0}", ex.ToString());
+                response = FormatSenseData(SenseDataParameter.GetMediumErrorUnrecoverableReadErrorSenseData());
+                return SCSIStatusCodeName.CheckCondition;
             }
         }