Hook up old extraction to Test

Author: mnadareski

Test/Program.cs

@@ -12,6 +12,7 @@ public static void Main(string[] args)
             bool extract = true;
             bool outputInfo = false;
             string outputDirectory = string.Empty;
+            bool useOld = false;
 
             // If we have no args, show the help and quit
             if (args == null || args.Length == 0)
@@ -41,6 +42,10 @@ public static void Main(string[] args)
                 {
                     extract = false;
                 }
+                else if (arg == "-u" || arg == "--use-old")
+                {
+                    useOld = true;
+                }
                 else if (arg == "-o" || arg == "--output")
                 {
                     if (firstFileIndex == args.Length - 1)
@@ -68,9 +73,9 @@ public static void Main(string[] args)
             {
                 string arg = args[i];
                 if (arg.EndsWith(".cab", StringComparison.OrdinalIgnoreCase))
-                    ProcessCabinetPath(arg, outputInfo, extract, outputDirectory);
+                    ProcessCabinetPath(arg, outputInfo, extract, useOld, outputDirectory);
                 else if (arg.EndsWith(".hdr", StringComparison.OrdinalIgnoreCase))
-                    ProcessCabinetPath(arg, outputInfo, extract, outputDirectory);
+                    ProcessCabinetPath(arg, outputInfo, extract, useOld, outputDirectory);
                 else
                     Console.WriteLine($"{arg} is not a recognized file by extension");
             }
@@ -95,6 +100,7 @@ private static void DisplayHelp()
             Console.WriteLine("    -i, --info           Display cabinet information");
             Console.WriteLine("    -n, --no-extract     Don't extract the cabinet");
             Console.WriteLine("    -o, --output <path>  Set the output directory for extraction");
+            Console.WriteLine("    -u, --use-old        Use old extraction method");
             Console.WriteLine();
         }
 
@@ -104,7 +110,7 @@ private static void DisplayHelp()
         /// <param name="file">Name of the file to process</param>
         /// <param name="outputInfo">True to display the cabinet information, false otherwise</param>
         /// <param name="outputDirectory">Output directory for extraction</param>
-        private static void ProcessCabinetPath(string file, bool outputInfo, bool extract, string outputDirectory)
+        private static void ProcessCabinetPath(string file, bool outputInfo, bool extract, bool useOld, string outputDirectory)
         {
             if (!File.Exists(file))
             {
@@ -178,7 +184,7 @@ private static void ProcessCabinetPath(string file, bool outputInfo, bool extrac
                         Directory.CreateDirectory(directoryName);
 
                     Console.WriteLine($"Outputting file at index {i} to {newfile}...");
-                    cab.FileSave(i, newfile);
+                    cab.FileSave(i, newfile, useOld);
                 }
             }
         }

UnshieldSharp/InstallShieldCabinet.cs

@@ -62,7 +62,7 @@ public class InstallShieldCabinet
         /// <summary>
         /// Save the file at the given index to the filename specified
         /// </summary>
-        public bool FileSave(int index, string filename)
+        public bool FileSave(int index, string filename, bool useOld = false)
         {
             if (HeaderList == null)
             {
@@ -77,7 +77,7 @@ public bool FileSave(int index, string filename)
 
             // If the file is split
             if (fileDescriptor.LinkFlags == LinkFlags.LINK_PREV)
-                return FileSave((int)fileDescriptor.LinkPrevious, filename);
+                return FileSave((int)fileDescriptor.LinkPrevious, filename, useOld);
 
             // Get the reader at the index
             var reader = Reader.Create(this, index, fileDescriptor);
@@ -141,7 +141,10 @@ public bool FileSave(int index, string filename)
                     ulong readBytes = (ulong)(bytesToRead + 1);
 
                     // Uncompress into a buffer
-                    result = Uncompress(outputBuffer, ref bytesToWrite, inputBuffer, ref readBytes);
+                    if (useOld)
+                        result = UncompressOld(outputBuffer, ref bytesToWrite, inputBuffer, ref readBytes);
+                    else
+                        result = Uncompress(outputBuffer, ref bytesToWrite, inputBuffer, ref readBytes);
 
                     // If we didn't get a positive result that's not a data error (false positives)
                     if (result != zlibConst.Z_OK && result != zlibConst.Z_DATA_ERROR)