Quick and dirty global setting for forcing un-compression of

sets.

ROMVault2/DatMaker.cs

@@ -57,11 +57,11 @@ namespace ROMVault2
 
         private static string clean(string s)
         {
+            s = s.Replace("&", "&");
             s = s.Replace("\"", """);
             s = s.Replace("'", "'");
             s = s.Replace("<", "&lt;");
             s = s.Replace(">", "&gt;");
-            s = s.Replace("&", "&amp;");
             return s;
         }
 

ROMVault2/DatReaders/DatCmpReader.cs

@@ -142,6 +142,8 @@ namespace ROMVault2.DatReaders
             }
 
             thisFileType = forceZipping.ToLower() != "no" ? FileType.ZipFile : FileType.File;
+            if (Settings.FixLevel == eFixLevel.Uncompressed)
+                thisFileType = FileType.File;
             tDir.Dat = tDat;
             return true;
 

ROMVault2/DatReaders/DatDOSReader.cs

@@ -97,7 +97,7 @@ namespace ROMVault2.DatReaders
                 }
             }
 
-            thisFileType = FileType.ZipFile;
+            thisFileType = Settings.FixLevel == eFixLevel.Uncompressed ? FileType.File : FileType.ZipFile;
             tDir.Dat = tDat;
             return true;
 

ROMVault2/DatReaders/DatMessXMLReader.cs

@@ -16,7 +16,9 @@ namespace ROMVault2.DatReaders
 
         public static bool ReadDat(ref RvDir tDat, XmlDocument doc)
         {
-            if (!LoadHeaderFromDat(ref tDat, ref doc))
+            FileType thisFileType = FileType.Unknown;
+
+            if (!LoadHeaderFromDat(ref tDat, ref doc, ref thisFileType))
                 return false;
 
             if (doc.DocumentElement == null)
@@ -27,13 +29,13 @@ namespace ROMVault2.DatReaders
                 return false;
             for (int i = 0; i < gameNodeList.Count; i++)
             {
-                LoadGameFromDat(ref tDat, gameNodeList[i]);
+                LoadGameFromDat(ref tDat, gameNodeList[i], thisFileType);
             }
 
             return true;
         }
 
-        private static bool LoadHeaderFromDat(ref RvDir tDir, ref XmlDocument doc)
+        private static bool LoadHeaderFromDat(ref RvDir tDir, ref XmlDocument doc, ref FileType thisFileType)
         {
             XmlNodeList head = doc.SelectNodes("softwarelist");
             if (head == null)
@@ -62,21 +64,38 @@ namespace ROMVault2.DatReaders
                     tDat.AddData(RvDat.DatData.MergeType, "split");
                     break;
             }
-
-
+            
+            val = VarFix.String(head[0].Attributes.GetNamedItem("forcepacking")).ToLower();
+            switch (val.ToLower())
+            {
+                case "zip":
+                    tDat.AddData(RvDat.DatData.FileType, "zip");
+                    thisFileType = FileType.ZipFile;
+                    break;
+                case "unzip":
+                case "file":
+                    tDat.AddData(RvDat.DatData.FileType, "file");
+                    thisFileType = FileType.File;
+                    break;
+                default:
+                    thisFileType = FileType.ZipFile;
+                    break;
+            }
+            if (Settings.FixLevel == eFixLevel.Uncompressed)
+                thisFileType = FileType.File;
 
             tDir.Dat = tDat;
             return true;
         }
 
-        private static void LoadGameFromDat(ref RvDir tDat, XmlNode gameNode)
+        private static void LoadGameFromDat(ref RvDir tDat, XmlNode gameNode, FileType thisFileType)
         {
             if (gameNode.Attributes == null)
                 return;
 
             RvDir parent = tDat;
 
-            RvDir tDir = new RvDir(FileType.Zip)
+            RvDir tDir = new RvDir(DBTypeGet.DirFromFile(thisFileType))
                         {
                             Name = VarFix.CleanFileName(gameNode.Attributes.GetNamedItem("name")),
                             Game = new RvGame(),
@@ -137,7 +156,7 @@ namespace ROMVault2.DatReaders
                         if (romNodeList != null)
                             for (int iR = 0; iR < romNodeList.Count; iR++)
                             {
-                                LoadRomFromDat(ref tDir, romNodeList[iR]);
+                                LoadRomFromDat(ref tDir, romNodeList[iR], thisFileType);
                             }
                     }
             }
@@ -164,7 +183,7 @@ namespace ROMVault2.DatReaders
 
         }
 
-        private static void LoadRomFromDat(ref RvDir tGame, XmlNode romNode)
+        private static void LoadRomFromDat(ref RvDir tGame, XmlNode romNode, FileType thisFileType)
         {
             if (romNode.Attributes == null)
                 return;
@@ -173,7 +192,7 @@ namespace ROMVault2.DatReaders
             string loadflag = VarFix.String(romNode.Attributes.GetNamedItem("loadflag"));
             if (name != null)
             {
-                RvFile tRom = new RvFile(FileType.ZipFile)
+                RvFile tRom = new RvFile(thisFileType) // changed
                                      {
                                          Name = VarFix.CleanFullFileName(name),
                                          Size = VarFix.ULong(romNode.Attributes.GetNamedItem("size")),

ROMVault2/DatReaders/DatReader.cs

@@ -270,6 +270,10 @@ namespace ROMVault2.DatReaders
                             // loop the ROMs in the parent sets
                             for (int r1 = 0; r1 < romofGame.ChildCount; r1++)
                             {
+                                // don't search fixes for files marked as nodump
+                                if (((RvFile)mGame.Child(r)).Status == "nodump" || ((RvFile)romofGame.Child(r1)).Status == "nodump")
+                                    continue;
+
                                 // only find fixes if the Name and the Size of the ROMs are the same
                                 if (mGame.Child(r).Name != romofGame.Child(r1).Name || ((RvFile)mGame.Child(r)).Size != ((RvFile)romofGame.Child(r1)).Size)
                                     continue;
@@ -285,11 +289,13 @@ namespace ROMVault2.DatReaders
                                 if (b1)
                                 {
                                     ((RvFile)mGame.Child(r)).CRC = ((RvFile)romofGame.Child(r1)).CRC;
+                                    ((RvFile)mGame.Child(r)).FileStatusSet(FileStatus.CRCFromDAT);
                                     ((RvFile)mGame.Child(r)).Status = "(CRCFound)";
                                 }
                                 else
                                 {
                                     ((RvFile)romofGame.Child(r1)).CRC = ((RvFile)mGame.Child(r)).CRC;
+                                    ((RvFile)romofGame.Child(r1)).FileStatusSet(FileStatus.CRCFromDAT);
                                     ((RvFile)romofGame.Child(r1)).Status = "(CRCFound)";
                                 }
 
@@ -428,6 +434,8 @@ namespace ROMVault2.DatReaders
                                     byte[] chdMD51 = ((RvFile)romofGame.Child(r1)).MD5CHD;
                                     if (chdMD50 != null && chdMD51 != null && !ArrByte.bCompare(chdMD50, chdMD51)) continue;
 
+                                    // don't merge if only one of the ROM is nodump
+                                    if ((((RvFile)romofGame.Child(r1)).Status == "nodump") != (((RvFile)mGame.Child(r)).Status == "nodump")) continue;
 
                                     found = true;
                                     break;
@@ -446,9 +454,9 @@ namespace ROMVault2.DatReaders
                 return;
 
             string parentName = searchGame.Game.GetData(RvGame.GameData.RomOf);
-            if (String.IsNullOrEmpty(parentName) || parentName==searchGame.Name)
+            if (String.IsNullOrEmpty(parentName) || parentName == searchGame.Name)
                 parentName = searchGame.Game.GetData(RvGame.GameData.CloneOf);
-            if (String.IsNullOrEmpty(parentName) || parentName==searchGame.Name)
+            if (String.IsNullOrEmpty(parentName) || parentName == searchGame.Name)
                 return;
 
             int intIndex;

ROMVault2/DatReaders/DatXMLReader.cs

@@ -28,20 +28,24 @@ namespace ROMVault2.DatReaders
             XmlNodeList dirNodeList = doc.DocumentElement.SelectNodes("dir");
             if (dirNodeList != null)
             {
-                for (int i = 0; i < dirNodeList.Count; i++)
-                {
-                    LoadDirFromDat(ref tDat, dirNodeList[i], thisFileType);
-                }
+                foreach (XmlNode dirNode in dirNodeList)
+                    LoadDirFromDat(ref tDat, dirNode, thisFileType);
             }
 
             XmlNodeList gameNodeList = doc.DocumentElement.SelectNodes("game");
 
             if (gameNodeList != null)
             {
-                for (int i = 0; i < gameNodeList.Count; i++)
-                {
-                    LoadGameFromDat(ref tDat, gameNodeList[i], thisFileType);
-                }
+                foreach (XmlNode gameNode in gameNodeList)
+                    LoadGameFromDat(ref tDat, gameNode, thisFileType);
+            }
+
+            XmlNodeList machineNodeList = doc.DocumentElement.SelectNodes("machine");
+
+            if (machineNodeList != null)
+            {
+                foreach (XmlNode machineNode in machineNodeList)
+                    LoadGameFromDat(ref tDat, machineNode, thisFileType);
             }
 
             return true;
@@ -60,22 +64,27 @@ namespace ROMVault2.DatReaders
             XmlNodeList dirNodeList = doc.DocumentElement.SelectNodes("dir");
             if (dirNodeList != null)
             {
-                for (int i = 0; i < dirNodeList.Count; i++)
-                {
-                    LoadDirFromDat(ref tDat, dirNodeList[i], thisFileType);
-                }
+                foreach (XmlNode dirNode in dirNodeList)
+                    LoadDirFromDat(ref tDat, dirNode, thisFileType);
             }
 
             XmlNodeList gameNodeList = doc.DocumentElement.SelectNodes("game");
 
             if (gameNodeList != null)
             {
-                for (int i = 0; i < gameNodeList.Count; i++)
-                {
-                    LoadGameFromDat(ref tDat, gameNodeList[i], thisFileType);
-                }
+                foreach (XmlNode gameNode in gameNodeList)
+                    LoadGameFromDat(ref tDat, gameNode, thisFileType);
             }
 
+            XmlNodeList machineNodeList = doc.DocumentElement.SelectNodes("machine");
+
+            if (machineNodeList != null)
+            {
+                foreach (XmlNode machineNode in machineNodeList)
+                    LoadGameFromDat(ref tDat, machineNode, thisFileType);
+            }
+
+
             return true;
         }
 
@@ -149,13 +158,15 @@ namespace ROMVault2.DatReaders
                     }
                     val = VarFix.String(packingNode.Attributes.GetNamedItem("dir")).ToLower(); // noautodir , nogame
                     if (!String.IsNullOrEmpty(val))
-                        tDat.AddData(RvDat.DatData.DirSetup,val);
+                        tDat.AddData(RvDat.DatData.DirSetup, val);
                 }
             }
 
             // Look for: <notzipped>true</notzipped>
             string notzipped = VarFix.String(head.SelectSingleNode("notzipped"));
             if (notzipped.ToLower() == "true" || notzipped.ToLower() == "yes") thisFileType = FileType.File;
+            if (Settings.FixLevel == eFixLevel.Uncompressed)
+                thisFileType = FileType.File;
 
             tDir.Dat = tDat;
             return true;

ROMVault2/FrmMain.cs

@@ -33,6 +33,7 @@ namespace ROMVault2
         private static readonly Color CWhite = Color.FromArgb(255, 255, 255);
 
         private readonly Color[] _displayColor;
+        private readonly Color[] _fontColor;
 
         private bool _updatingGameGrid;
 	
@@ -70,6 +71,7 @@ namespace ROMVault2
 
 
             _displayColor = new Color[(int)RepStatus.EndValue];
+            _fontColor = new Color[(int)RepStatus.EndValue];
 
             // RepStatus.UnSet
 
@@ -101,6 +103,9 @@ namespace ROMVault2
 
             _displayColor[(int)RepStatus.Deleted] = CWhite;
 
+            for (int i = 0; i < (int)RepStatus.EndValue; i++)
+                _fontColor[i] = contrasty(_displayColor[i]);
+
             _gameGridColumnXPositions = new int[(int)RepStatus.EndValue];
 
             DirTree.Setup(ref DB.DirTree);
@@ -745,6 +750,7 @@ namespace ROMVault2
             RvDir tRvDir = (RvDir)GameGrid.Rows[e.RowIndex].Tag;
             ReportStatus tDirStat = tRvDir.DirStatus;
             Color bgCol = Color.FromArgb(255, 255, 255);
+            Color fgCol = Color.FromArgb(0, 0, 0);
 
             if (cellBounds.Width == 0 || cellBounds.Height == 0)
                 return;
@@ -754,6 +760,7 @@ namespace ROMVault2
                 if (tDirStat.Get(t1) <= 0) continue;
 
                 bgCol = _displayColor[(int)t1];
+                fgCol = _fontColor[(int)t1];
                 break;
             }
 
@@ -761,6 +768,7 @@ namespace ROMVault2
             {
                 e.CellStyle.BackColor = bgCol;
                 e.CellStyle.SelectionBackColor = bgCol;
+                e.CellStyle.ForeColor = fgCol;
 
                 Bitmap bmp = new Bitmap(cellBounds.Width, cellBounds.Height);
                 Graphics g = Graphics.FromImage(bmp);
@@ -799,6 +807,7 @@ namespace ROMVault2
             else if (GameGrid.Columns[e.ColumnIndex].Name == "CGame")
             {
                 e.CellStyle.BackColor = bgCol;
+                e.CellStyle.ForeColor = fgCol;
 
                 if (String.IsNullOrEmpty(tRvDir.FileName))
                     e.Value = tRvDir.Name;
@@ -808,6 +817,7 @@ namespace ROMVault2
             else if (GameGrid.Columns[e.ColumnIndex].Name == "CDescription")
             {
                 e.CellStyle.BackColor = bgCol;
+                e.CellStyle.ForeColor = fgCol;
 
                 if (tRvDir.Game != null)
                     e.Value = tRvDir.Game.GetData(RvGame.GameData.Description);
@@ -1292,6 +1302,13 @@ namespace ROMVault2
             }
         }
 
+        // returns either white or black, depending of quick luminance of the Color " a "
+        // called when the _displayColor is finished, in order to populate the _fontColor table.
+        private Color contrasty(Color a)
+        {
+            return (a.R << 1) + a.B + a.G + (a.G << 2) < 1024 ? Color.White : Color.Black;
+        }
+
         private void AddRom(RvFile tRomTable, string pathAdd)
         {
 
@@ -1302,8 +1319,11 @@ namespace ROMVault2
                 RomGrid.Rows[row].Tag = tRomTable;
 
                 for (int i = 0; i < RomGrid.Rows[row].Cells.Count; i++)
-                    RomGrid.Rows[row].Cells[i].Style.BackColor = _displayColor[(int)tRomTable.RepStatus];
-
+                {
+                    DataGridViewCellStyle cs = RomGrid.Rows[row].Cells[i].Style;
+                    cs.BackColor = _displayColor[(int)tRomTable.RepStatus];
+                    cs.ForeColor = _fontColor[(int)tRomTable.RepStatus];
+                }
                 string fname = pathAdd + tRomTable.Name;
                 if (!string.IsNullOrEmpty(tRomTable.FileName))
                     fname += " (Found: " + tRomTable.FileName + ")";
@@ -1441,6 +1461,7 @@ namespace ROMVault2
         private void SettingsToolStripMenuItemClick(object sender, EventArgs e)
         {
             FrmSettings fcfg = new FrmSettings();
+            fcfg.UpdateDats += UpdateDats;
             fcfg.ShowDialog(this);
             fcfg.Dispose();
         }

ROMVault2/FrmSetDir.cs

@@ -80,7 +80,7 @@ namespace ROMVault2
                                              {
                                                  ShowNewFolderButton = true,
                                                  Description = Resources.FrmSetDir_BtnSetRomLocationClick_Please_select_a_folder_for_This_Rom_Set,
-                                                 RootFolder = (Settings.IsMono ? Environment.SpecialFolder.MyComputer : Environment.SpecialFolder.DesktopDirectory),
+                                                 RootFolder =  Environment.SpecialFolder.MyComputer,
                                                  SelectedPath = DBHelper.GetRealPath(_datLocation)
                                              };
             if (browse.ShowDialog() == DialogResult.OK)

ROMVault2/FrmSettings.cs

@@ -8,11 +8,17 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using ROMVault2.Properties;
+using System.IO;
+using ROMVault2.RvDB;
 
 namespace ROMVault2
 {
     public partial class FrmSettings : Form
     {
+        public delegate void UpdateDatsDelegate();
+
+        public event UpdateDatsDelegate UpdateDats;
+
         public FrmSettings()
         {
             InitializeComponent();
@@ -29,6 +35,7 @@ namespace ROMVault2
             cboFixLevel.Items.Add("Level1");
             cboFixLevel.Items.Add("Level2");
             cboFixLevel.Items.Add("Level3");
+            cboFixLevel.Items.Add("Uncompressed");
         }
 
         private void FrmConfigLoad(object sender, EventArgs e)
@@ -54,6 +61,26 @@ namespace ROMVault2
 
         private void BtnOkClick(object sender, EventArgs e)
         {
+            if (Settings.FixLevel != (eFixLevel)cboFixLevel.SelectedIndex)
+            {
+                if (Settings.FixLevel == eFixLevel.Uncompressed ||
+                   (eFixLevel)cboFixLevel.SelectedIndex == eFixLevel.Uncompressed)
+                {
+                    DialogResult dlg = MessageBox.Show("Changing from/to uncompressed requires the cache file to be deleted.\nDo you want to proceed?", "Settings", MessageBoxButtons.YesNoCancel);
+
+                    if (dlg == DialogResult.Cancel)
+                        Close();
+
+                    if (dlg != DialogResult.Yes)
+                        return;
+
+                    File.Delete(Settings.CacheFile);
+                    DB.Read(sender, new System.ComponentModel.DoWorkEventArgs(null));
+                    Settings.FixLevel = (eFixLevel)cboFixLevel.SelectedIndex;
+                    UpdateDats();
+                }
+            }
+
             Settings.DatRoot = lblDATRoot.Text;
             Settings.ScanLevel = (eScanLevel)cboScanLevel.SelectedIndex;
             Settings.FixLevel = (eFixLevel)cboFixLevel.SelectedIndex;
@@ -88,7 +115,7 @@ namespace ROMVault2
                                              {
                                                  ShowNewFolderButton = true,
                                                  Description = Resources.FrmSettings_BtnDatClick_Please_select_a_folder_for_DAT_Root,
-                                                 RootFolder = (Settings.IsMono ? Environment.SpecialFolder.MyComputer : Environment.SpecialFolder.DesktopDirectory),
+                                                 RootFolder = Environment.SpecialFolder.MyComputer,
                                                  SelectedPath = Settings.DatRoot
                                              };
 

ROMVault2/Program.cs

@@ -15,11 +15,8 @@ namespace ROMVault2
         //public static UsernamePassword Up;
         public static readonly Encoding Enc = Encoding.GetEncoding(28591);
         public const string Version = "2.2";
-        public const int SubVersion = 1;
-
-        public static string ErrorMessage;
-        public static string URL;
-
+        public const int SubVersion = 5;
+        
         public static SynchronizationContext SyncCont;
 
         /// <summary>
@@ -39,15 +36,7 @@ namespace ROMVault2
             progress.ShowDialog();
 
             progress.Dispose();
-
-            if (!String.IsNullOrEmpty(ErrorMessage))
-            {
-                MessageBox.Show(ErrorMessage);
-                if (!String.IsNullOrEmpty(URL))
-                    System.Diagnostics.Process.Start(URL);
-                return;
-            }
-
+                       
             Application.Run(new FrmMain());
         }
     }

ROMVault2/ROMVault2.csproj

@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ROMVault2</RootNamespace>
-    <AssemblyName>ROMVault22</AssemblyName>
+    <AssemblyName>ROMVault225</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -35,7 +35,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>Stage\</OutputPath>
+    <OutputPath>..\..\Stage\</OutputPath>
     <DefineConstants>TRACE;DEBUG;UNMANAGED;COMPRESS;LZMA_STREAM;DOTNET20</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

ROMVault2/Report.cs

@@ -40,8 +40,8 @@ namespace ROMVault2
             {
                 ShowNewFolderButton = true,
                 Description = @"Please select a folder for Dats",
-                RootFolder = (Settings.IsMono ? Environment.SpecialFolder.MyComputer : Environment.SpecialFolder.DesktopDirectory),
-                SelectedPath = @"apps"
+                RootFolder = Environment.SpecialFolder.MyComputer,
+                SelectedPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Reports")
             };
 
             if (browse.ShowDialog() != DialogResult.OK) return;
@@ -195,7 +195,7 @@ namespace ROMVault2
             SaveFileDialog saveFileDialog1 = new SaveFileDialog
             {
                 Title = @"Generate Full Report",
-                FileName = @"RVFullReport"+CleanTime()+".txt",
+                FileName = @"RVFullReport" + CleanTime() + ".txt",
                 Filter = @"Rom Vault Report (*.txt)|*.txt|All Files (*.*)|*.*",
                 FilterIndex = 1
             };
@@ -226,7 +226,7 @@ namespace ROMVault2
             SaveFileDialog saveFileDialog1 = new SaveFileDialog
             {
                 Title = @"Generate Fix Report",
-                FileName = @"RVFixReport"+CleanTime()+".txt",
+                FileName = @"RVFixReport" + CleanTime() + ".txt",
                 Filter = @"Rom Vault Fixing Report (*.txt)|*.txt|All Files (*.*)|*.*",
                 FilterIndex = 1
             };

ROMVault2/Settings.cs

@@ -28,7 +28,8 @@ namespace ROMVault2
         TrrntZipLevel3,
         Level1,
         Level2,
-        Level3
+        Level3,
+        Uncompressed
     }
 
     public static class Settings

ROMVault2/SupportedFiles/Files/UnCompFiles.cs

@@ -6,18 +6,21 @@
 
 using System.IO;
 using System.Security.Cryptography;
+using System.Threading;
 using ROMVault2.SupportedFiles.Zip.ZLib;
 
 namespace ROMVault2.SupportedFiles.Files
 {
     public static class UnCompFiles
     {
-        private const int Buffersize = 4096;
-        private static readonly byte[] Buffer;
+        private const int Buffersize = 4096 * 1024;
+        private static readonly byte[] Buffer0;
+        private static readonly byte[] Buffer1;
 
         static UnCompFiles()
         {
-            Buffer = new byte[Buffersize];
+            Buffer0 = new byte[Buffersize];
+            Buffer1 = new byte[Buffersize];
         }
 
         public static int CheckSumRead(string filename, bool testDeep, out byte[] crc, out byte[] bMD5, out byte[] bSHA1)
@@ -26,11 +29,7 @@ namespace ROMVault2.SupportedFiles.Files
             bSHA1 = null;
             crc = null;
 
-            Stream ds;
-            int errorCode = IO.FileStream.OpenFileRead(filename, out ds);
-            if (errorCode != 0)
-                return errorCode;
-
+            Stream ds = null;
             CRC32Hash crc32 = new CRC32Hash();
 
             MD5 md5 = null;
@@ -38,24 +37,66 @@ namespace ROMVault2.SupportedFiles.Files
             SHA1 sha1 = null;
             if (testDeep) sha1 = SHA1.Create();
 
-            long sizetogo = ds.Length;
-        
-            while (sizetogo > 0)
+            try
             {
-                int sizenow = sizetogo > Buffersize ? Buffersize : (int)sizetogo;
+                int errorCode = IO.FileStream.OpenFileRead(filename, out ds);
+                if (errorCode != 0)
+                    return errorCode;
 
-                ds.Read(Buffer, 0, sizenow);
-                crc32.TransformBlock(Buffer, 0, sizenow, null, 0);
-                if (testDeep) md5.TransformBlock(Buffer, 0, sizenow, null, 0);
-                if (testDeep) sha1.TransformBlock(Buffer, 0, sizenow, null, 0);
-                sizetogo -= sizenow;
+                long sizetogo = ds.Length;
+
+                // Pre load the first buffer0
+                int sizeNext = sizetogo > Buffersize ? Buffersize : (int)sizetogo;
+                ds.Read(Buffer0, 0, sizeNext);
+                int sizebuffer = sizeNext;
+                sizetogo -= sizeNext;
+                bool whichBuffer = true;
+
+                while (sizebuffer > 0)
+                {
+                    sizeNext = sizetogo > Buffersize ? Buffersize : (int)sizetogo;
+
+                    Thread t0 = null;
+                    if (sizeNext > 0)
+                    {
+                        t0 = new Thread(() => { ds.Read(whichBuffer ? Buffer1 : Buffer0, 0, sizeNext); });
+                        t0.Start();
+                    }
+
+                    byte[] buffer = whichBuffer ? Buffer0 : Buffer1;
+                    Thread t1 = new Thread(() => { crc32.TransformBlock(buffer, 0, sizebuffer, null, 0); });
+                    t1.Start();
+                    if (testDeep)
+                    {
+                        Thread t2 = new Thread(() => { md5.TransformBlock(buffer, 0, sizebuffer, null, 0); });
+                        Thread t3 = new Thread(() => { sha1.TransformBlock(buffer, 0, sizebuffer, null, 0); });
+                        t2.Start();
+                        t3.Start();
+                        t2.Join();
+                        t3.Join();
+                    }
+                    if (t0 != null)
+                        t0.Join();
+                    t1.Join();
+
+                    sizebuffer = sizeNext;
+                    sizetogo -= sizeNext;
+                    whichBuffer = !whichBuffer;
+                }
+
+                crc32.TransformFinalBlock(Buffer0, 0, 0);
+                if (testDeep) md5.TransformFinalBlock(Buffer0, 0, 0);
+                if (testDeep) sha1.TransformFinalBlock(Buffer0, 0, 0);
+
+                ds.Close();
             }
+            catch
+            {
+                if (ds != null)
+                    ds.Close();
 
-            crc32.TransformFinalBlock(Buffer, 0, 0);
-            if (testDeep) md5.TransformFinalBlock(Buffer, 0, 0);
-            if (testDeep) sha1.TransformFinalBlock(Buffer, 0, 0);
-
-            ds.Close();
+                return 0x17;
+            }
 
             crc = crc32.Hash;
             if (testDeep) bMD5 = md5.Hash;
@@ -63,8 +104,5 @@ namespace ROMVault2.SupportedFiles.Files
 
             return 0;
         }
-
-
-
     }
 }

ROMVault2/SupportedFiles/Zip/zipFile.cs

@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
+using System.Threading;
 using ROMVault2.SupportedFiles.Zip.ZLib;
 
 // UInt16 = ushort
@@ -17,11 +18,12 @@ using ROMVault2.SupportedFiles.Zip.ZLib;
 
 namespace ROMVault2.SupportedFiles.Zip
 {
-  
+
     public class ZipFile
     {
-        const int Buffersize = 4096 * 128;
-        private static byte[] _buffer;
+        const int Buffersize = 4096 * 1024;
+        private static byte[] _buffer0;
+        private static byte[] _buffer1;
 
         private const uint LocalFileHeaderSignature = 0x04034b50;
         private const uint CentralDirectoryHeaderSigniature = 0x02014b50;
@@ -48,10 +50,10 @@ namespace ROMVault2.SupportedFiles.Zip
 
             public bool Zip64 { get; private set; }
             public bool TrrntZip { get; private set; }
-            
+
             public byte[] sha1 { get; private set; }
             public byte[] md5 { get; private set; }
-            
+
             public ZipReturn FileStatus = ZipReturn.ZipUntested;
             public LocalFile(Stream zipFs)
             {
@@ -414,7 +416,7 @@ namespace ROMVault2.SupportedFiles.Zip
                     _generalPurposeBitFlag = br.ReadUInt16();
                     if ((_generalPurposeBitFlag & 8) == 8)
                         return ZipReturn.ZipCannotFastOpen;
-                    
+
                     _compressionMethod = br.ReadUInt16();
                     _lastModFileTime = br.ReadUInt16();
                     _lastModFileDate = br.ReadUInt16();
@@ -482,7 +484,7 @@ namespace ROMVault2.SupportedFiles.Zip
 
                     _dataLocation = (ulong)_zipFs.Position;
                     return ZipReturn.ZipGood;
-                    
+
                 }
                 catch
                 {
@@ -717,25 +719,53 @@ namespace ROMVault2.SupportedFiles.Zip
                     MD5 lmd5 = System.Security.Cryptography.MD5.Create();
                     SHA1 lsha1 = System.Security.Cryptography.SHA1.Create();
 
-                    ulong sizetogo = UncompressedSize;
-                    if (_buffer == null)
-                        _buffer = new byte[Buffersize];
-
-                    while (sizetogo > 0)
+                    if (_buffer0 == null)
                     {
-                        int sizenow = sizetogo > Buffersize ? Buffersize : (int)sizetogo;
-                        sInput.Read(_buffer, 0, sizenow);
-
-                        crc32.TransformBlock(_buffer, 0, sizenow, null, 0);
-                        lmd5.TransformBlock(_buffer, 0, sizenow, null, 0);
-                        lsha1.TransformBlock(_buffer, 0, sizenow, null, 0);
-
-                        sizetogo = sizetogo - (ulong)sizenow;
+                        _buffer0 = new byte[Buffersize];
+                        _buffer1 = new byte[Buffersize];
                     }
 
-                    crc32.TransformFinalBlock(_buffer, 0, 0);
-                    lmd5.TransformFinalBlock(_buffer, 0, 0);
-                    lsha1.TransformFinalBlock(_buffer, 0, 0);
+                    ulong sizetogo = UncompressedSize;
+
+                    // Pre load the first buffer0
+                    int sizeNext = sizetogo > Buffersize ? Buffersize : (int)sizetogo;
+                    sInput.Read(_buffer0, 0, sizeNext);
+                    int sizebuffer = sizeNext;
+                    sizetogo -= (ulong)sizeNext;
+                    bool whichBuffer = true;
+
+                    while (sizebuffer > 0)
+                    {
+                        sizeNext = sizetogo > Buffersize ? Buffersize : (int)sizetogo;
+
+                        Thread t0 = null;
+                        if (sizeNext > 0)
+                        {
+                            t0 = new Thread(() => { sInput.Read(whichBuffer ? _buffer1 : _buffer0, 0, sizeNext); });
+                            t0.Start();
+                        }
+
+                        byte[] buffer = whichBuffer ? _buffer0 : _buffer1;
+                        Thread t1 = new Thread(() => { crc32.TransformBlock(buffer, 0, sizebuffer, null, 0); });
+                        Thread t2 = new Thread(() => { lmd5.TransformBlock(buffer, 0, sizebuffer, null, 0); });
+                        Thread t3 = new Thread(() => { lsha1.TransformBlock(buffer, 0, sizebuffer, null, 0); });
+                        t1.Start();
+                        t2.Start();
+                        t3.Start();
+                        if (t0 != null)
+                            t0.Join();
+                        t1.Join();
+                        t2.Join();
+                        t3.Join();
+
+                        sizebuffer = sizeNext;
+                        sizetogo -= (ulong)sizeNext;
+                        whichBuffer = !whichBuffer;
+                    }
+
+                    crc32.TransformFinalBlock(_buffer0, 0, 0);
+                    lmd5.TransformFinalBlock(_buffer0, 0, 0);
+                    lsha1.TransformFinalBlock(_buffer0, 0, 0);
 
                     byte[] testcrc = crc32.Hash;
                     md5 = lmd5.Hash;
@@ -1365,7 +1395,7 @@ namespace ROMVault2.SupportedFiles.Zip
             _localFiles[_localFiles.Count - 1].LocalFileAddDirectory();
         }
 
-        
+
         /*
         public void BreakTrrntZip(string filename)
         {
@@ -1525,7 +1555,7 @@ namespace ROMVault2.SupportedFiles.Zip
             int pos1 = 0;
             int pos2 = 0;
 
-            for (; ; )
+            for (;;)
             {
                 if (pos1 == bytes1.Length)
                     return ((pos2 == bytes2.Length) ? 0 : -1);

ROMVault2/rvImages.cs

@@ -11,10 +11,7 @@ namespace ROMVault2
 {
     public static class rvImages
     {
-        private static List<string> names;
-        private static List<Bitmap> images; 
-
-
+     
         public static Bitmap GetBitmap(string bitmapName)
         {
             object bmObj = rvImages1.ResourceManager.GetObject(bitmapName);