General code refactor and reformat.

This commit is contained in:
2018-12-31 13:17:27 +00:00
parent 6b12cd1a8e
commit f2caa8c40f
413 changed files with 3554 additions and 6549 deletions

View File

@@ -33,8 +33,8 @@
using System;
using System.IO;
using System.Text;
using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.CommonTypes.Interfaces;
namespace DiscImageChef.DiscImages
@@ -46,33 +46,33 @@ namespace DiscImageChef.DiscImages
Stream stream = imageFilter.GetDataForkStream();
stream.Seek(0, SeekOrigin.Begin);
if (stream.Length < 32) return false;
if(stream.Length < 32) return false;
byte[] header = new byte[32];
stream.Read(header, 0, 32);
IntPtr hdrPtr = Marshal.AllocHGlobal(32);
Marshal.Copy(header, 0, hdrPtr, 32);
WCDiskImageFileHeader fheader = (WCDiskImageFileHeader)Marshal.PtrToStructure(hdrPtr, typeof(WCDiskImageFileHeader));
WCDiskImageFileHeader fheader =
(WCDiskImageFileHeader)Marshal.PtrToStructure(hdrPtr, typeof(WCDiskImageFileHeader));
Marshal.FreeHGlobal(hdrPtr);
/* check the signature */
if (Encoding.ASCII.GetString(fheader.signature).TrimEnd('\x00') != WCDiskImage.fileSignature)
return false;
if(Encoding.ASCII.GetString(fheader.signature).TrimEnd('\x00') != fileSignature) return false;
/* Some sanity checks on the values we just read. */
if (fheader.version > 1) return false;
if(fheader.version > 1) return false;
if (fheader.heads < 1 || fheader.heads > 2) return false;
if(fheader.heads < 1 || fheader.heads > 2) return false;
if (fheader.sectorsPerTrack < 8 || fheader.sectorsPerTrack > 18) return false;
if(fheader.sectorsPerTrack < 8 || fheader.sectorsPerTrack > 18) return false;
if (fheader.cylinders < 1 || fheader.cylinders > 80) return false;
if(fheader.cylinders < 1 || fheader.cylinders > 80) return false;
if (fheader.extraTracks[0] > 1 || fheader.extraTracks[1] > 1 || fheader.extraTracks[2] > 1 || fheader.extraTracks[3] > 1)
return false;
if(fheader.extraTracks[0] > 1 || fheader.extraTracks[1] > 1 || fheader.extraTracks[2] > 1 ||
fheader.extraTracks[3] > 1) return false;
if (((byte)fheader.extraFlags & ~0x03) != 0) return false;
if(((byte)fheader.extraFlags & ~0x03) != 0) return false;
// TODO: validate all sectors
// For now, having a valid header will suffice.