From 5d49d4833f396b4c40d40c51a33f9fe72f2db06a Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 13 Jun 2018 11:26:40 -0700
Subject: [PATCH 1/4] Allow child process to be killed (#10)

---
 MainWindow.xaml    |  2 +-
 MainWindow.xaml.cs | 68 +++++++++++++++++++++++++++++++---------------
 2 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 5b9481dc..29fde9ee 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -65,7 +65,7 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
 
-            <Button x:Name="btn_Start" Grid.Row="0" Grid.Column="0" Height="22" Width="150" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Start Dumping" Click="btn_Start_Click" IsEnabled="False" />
+            <Button x:Name="btn_StartStop" Grid.Row="0" Grid.Column="0" Height="22" Width="150" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Start Dumping" Click="btn_StartStop_Click" IsEnabled="False" />
             <Button x:Name="btn_Search" Grid.Row="0" Grid.Column="1" Height="22" Width="150" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for disks" Click="btn_Search_Click" />
         </Grid>
 
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index ccfe4692..f1030a82 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -20,6 +20,7 @@ namespace DICUI
         private List<Tuple<char, string>> _drives { get; set; }
         private List<int> _driveSpeeds { get { return new List<int> { 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72 }; } }
         private List<Tuple<string, KnownSystem?, DiscType?>> _systems { get; set; }
+        private Process childProcess { get; set; }
 
         public MainWindow()
         {
@@ -37,19 +38,28 @@ namespace DICUI
 
         #region Events
 
-        private void btn_Start_Click(object sender, RoutedEventArgs e)
+        private void btn_StartStop_Click(object sender, RoutedEventArgs e)
         {
-            StartDumping();
+            if ((string)btn_StartStop.Content == "Start Dumping")
+            {
+                StartDumping();
+            }
+            else if ((string)btn_StartStop.Content == "Stop Dumping")
+            {
+                CancelDumping();
+            }
         }
 
         private void btn_OutputDirectoryBrowse_Click(object sender, RoutedEventArgs e)
         {
             BrowseFolder();
+            EnsureDiscInformation();
         }
 
         private void btn_Search_Click(object sender, RoutedEventArgs e)
         {
             PopulateDrives();
+            EnsureDiscInformation();
         }
 
         private void cmb_DiscType_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -61,6 +71,7 @@ namespace DICUI
         private void cmb_DriveLetter_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             GetOutputNames();
+            EnsureDiscInformation();
         }
 
         private void cmb_DriveSpeed_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -83,7 +94,7 @@ namespace DICUI
             cmb_DiscType.SelectedIndex = 0;
             cmb_DiscType_SelectionChanged(null, null);
 
-            btn_Start.IsEnabled = false;
+            btn_StartStop.IsEnabled = false;
         }
 
         /// <summary>
@@ -102,12 +113,12 @@ namespace DICUI
             if (cmb_DriveLetter.Items.Count > 0)
             {
                 lbl_Status.Content = "Valid optical disc found! Choose your Disc Type";
-                btn_Start.IsEnabled = true;
+                btn_StartStop.IsEnabled = true;
             }
             else
             {
                 lbl_Status.Content = "No valid optical disc found!";
-                btn_Start.IsEnabled = false;
+                btn_StartStop.IsEnabled = false;
             }
         }
 
@@ -143,7 +154,7 @@ namespace DICUI
             string driveLetter = cmb_DriveLetter.Text;
             string outputDirectory = txt_OutputDirectory.Text;
             string outputFilename = txt_OutputFilename.Text;
-            btn_Start.IsEnabled = false;
+            btn_StartStop.Content = "Stop Dumping";
 
             // Get the currently selected item
             var selected = cmb_DiscType.SelectedValue as Tuple<string, KnownSystem?, DiscType?>;
@@ -153,7 +164,7 @@ namespace DICUI
                 || !Utilities.ValidateParameters(txt_CustomParameters.Text))
             {
                 lbl_Status.Content = "Error! Current configuration is not supported!";
-                btn_Start.IsEnabled = true;
+                btn_StartStop.Content = "Start Dumping";
                 return;
             }
 
@@ -161,7 +172,7 @@ namespace DICUI
             if (!File.Exists(dicPath))
             {
                 lbl_Status.Content = "Error! Could not find DiscImageCreator!";
-                btn_Start.IsEnabled = true;
+                btn_StartStop.Content = "Start Dumping";
                 return;
             }
 
@@ -172,22 +183,22 @@ namespace DICUI
                 if (result == MessageBoxResult.No || result == MessageBoxResult.Cancel || result == MessageBoxResult.None)
                 {
                     lbl_Status.Content = "Dumping aborted!";
-                    btn_Start.IsEnabled = true;
+                    btn_StartStop.Content = "Start Dumping";
                     return;
                 }
             }
 
             lbl_Status.Content = "Beginning dumping process";
-			string parameters = txt_CustomParameters.Text;
+            string parameters = txt_CustomParameters.Text;
 
-			await Task.Run(
+            await Task.Run(
                 () =>
                 {
-                    Process process = new Process();
-                    process.StartInfo.FileName = dicPath;
-                    process.StartInfo.Arguments = parameters;
-                    process.Start();
-                    process.WaitForExit();
+                    childProcess = new Process();
+                    childProcess.StartInfo.FileName = dicPath;
+                    childProcess.StartInfo.Arguments = parameters;
+                    childProcess.Start();
+                    childProcess.WaitForExit();
                 });
 
             // Special cases
@@ -260,7 +271,7 @@ namespace DICUI
             if (!Utilities.FoundAllFiles(outputDirectory, outputFilename, selected.Item3))
             {
                 lbl_Status.Content = "Error! Please check output directory as dump may be incomplete!";
-                btn_Start.IsEnabled = true;
+                btn_StartStop.Content = "Start Dumping";
                 return;
             }
 
@@ -270,7 +281,20 @@ namespace DICUI
             List<string> formattedValues = Utilities.FormatOutputData(templateValues, selected.Item2, selected.Item3);
             bool success = Utilities.WriteOutputData(outputDirectory, outputFilename, formattedValues);
 
-            btn_Start.IsEnabled = true;
+            btn_StartStop.Content = "Start Dumping";
+        }
+
+        /// <summary>
+        /// Cancel an in-progress dumping process
+        /// </summary>
+        private void CancelDumping()
+        {
+            try
+            {
+                childProcess.Kill();
+            }
+            catch
+            { }
         }
 
         /// <summary>
@@ -291,21 +315,21 @@ namespace DICUI
             {
                 case DiscType.NONE:
                     lbl_Status.Content = "Please select a valid disc type";
-                    btn_Start.IsEnabled = false;
+                    btn_StartStop.IsEnabled = false;
                     break;
                 case DiscType.GameCubeGameDisc:
                 case DiscType.GDROM:
                     lbl_Status.Content = string.Format("{0} discs are partially supported by DIC", Utilities.DiscTypeToString(tuple.Item3));
-                    btn_Start.IsEnabled = true;
+                    btn_StartStop.IsEnabled = true;
                     break;
                 case DiscType.HDDVD:
                 case DiscType.UMD:
                     lbl_Status.Content = string.Format("{0} discs are not currently supported by DIC", Utilities.DiscTypeToString(tuple.Item3));
-                    btn_Start.IsEnabled = true;
+                    btn_StartStop.IsEnabled = true;
                     break;
                 default:
                     lbl_Status.Content = string.Format("{0} ready to dump", Utilities.DiscTypeToString(tuple.Item3));
-                    btn_Start.IsEnabled = true;
+                    btn_StartStop.IsEnabled = true;
                     break;
             }
 

From 905bd1a7dcf9de0eecd7aee6f6b8f29fd0e3bce2 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 13 Jun 2018 11:30:33 -0700
Subject: [PATCH 2/4] Add constants, use them, use child process more

---
 Constants.cs       |  6 ++++++
 MainWindow.xaml.cs | 40 ++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/Constants.cs b/Constants.cs
index dbd3293b..57a4abf6 100644
--- a/Constants.cs
+++ b/Constants.cs
@@ -1,5 +1,11 @@
 namespace DICUI
 {
+    public static class UIElements
+    {
+        public const string StartDumping = "Start Dumping";
+        public const string StopDumping = "Stop Dumping";
+    }
+
     public static class DICCommands
     {
         // Commands
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index f1030a82..7c796d48 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -40,11 +40,11 @@ namespace DICUI
 
         private void btn_StartStop_Click(object sender, RoutedEventArgs e)
         {
-            if ((string)btn_StartStop.Content == "Start Dumping")
+            if ((string)btn_StartStop.Content == UIElements.StartDumping)
             {
                 StartDumping();
             }
-            else if ((string)btn_StartStop.Content == "Stop Dumping")
+            else if ((string)btn_StartStop.Content == UIElements.StopDumping)
             {
                 CancelDumping();
             }
@@ -154,7 +154,7 @@ namespace DICUI
             string driveLetter = cmb_DriveLetter.Text;
             string outputDirectory = txt_OutputDirectory.Text;
             string outputFilename = txt_OutputFilename.Text;
-            btn_StartStop.Content = "Stop Dumping";
+            btn_StartStop.Content = UIElements.StopDumping;
 
             // Get the currently selected item
             var selected = cmb_DiscType.SelectedValue as Tuple<string, KnownSystem?, DiscType?>;
@@ -164,7 +164,7 @@ namespace DICUI
                 || !Utilities.ValidateParameters(txt_CustomParameters.Text))
             {
                 lbl_Status.Content = "Error! Current configuration is not supported!";
-                btn_StartStop.Content = "Start Dumping";
+                btn_StartStop.Content = UIElements.StartDumping;
                 return;
             }
 
@@ -172,7 +172,7 @@ namespace DICUI
             if (!File.Exists(dicPath))
             {
                 lbl_Status.Content = "Error! Could not find DiscImageCreator!";
-                btn_StartStop.Content = "Start Dumping";
+                btn_StartStop.Content = UIElements.StartDumping;
                 return;
             }
 
@@ -183,7 +183,7 @@ namespace DICUI
                 if (result == MessageBoxResult.No || result == MessageBoxResult.Cancel || result == MessageBoxResult.None)
                 {
                     lbl_Status.Content = "Dumping aborted!";
-                    btn_StartStop.Content = "Start Dumping";
+                    btn_StartStop.Content = UIElements.StartDumping;
                     return;
                 }
             }
@@ -212,7 +212,7 @@ namespace DICUI
                         break;
                     }
 
-                    Process sgraw = new Process()
+                    childProcess = new Process()
                     {
                         StartInfo = new ProcessStartInfo()
                         {
@@ -220,8 +220,8 @@ namespace DICUI
                             Arguments = "-v -r 4100 -R " + driveLetter + ": " + "ad 01 00 00 00 00 00 00 10 04 00 00 -o \"PIC.bin\""
                         },
                     };
-                    sgraw.Start();
-                    sgraw.WaitForExit();
+                    childProcess.Start();
+                    childProcess.WaitForExit();
                     break;
                 case KnownSystem.SonyPlayStation:
                     if (!File.Exists(psxtPath))
@@ -232,7 +232,7 @@ namespace DICUI
 
                     // Invoke the program with all 3 configurations
                     // TODO: Use these outputs for PSX information
-                    Process psxt001z = new Process()
+                    childProcess = new Process()
                     {
                         StartInfo = new ProcessStartInfo()
                         {
@@ -240,10 +240,10 @@ namespace DICUI
                             Arguments = "\"" + Utilities.GetFirstTrack(outputDirectory, outputFilename) + "\" > " + "\"" + Path.Combine(outputDirectory, "psxt001z.txt"),
                         },
                     };
-                    psxt001z.Start();
-                    psxt001z.WaitForExit();
+                    childProcess.Start();
+                    childProcess.WaitForExit();
 
-                    psxt001z = new Process()
+                    childProcess = new Process()
                     {
                         StartInfo = new ProcessStartInfo()
                         {
@@ -251,10 +251,10 @@ namespace DICUI
                             Arguments = "--libcrypt " + "\"" + Path.Combine(outputDirectory, outputFilename + ".sub") + "\" > " + "\"" + Path.Combine(outputDirectory, "libcrypt.txt"),
                         },
                     };
-                    psxt001z.Start();
-                    psxt001z.WaitForExit();
+                    childProcess.Start();
+                    childProcess.WaitForExit();
 
-                    psxt001z = new Process()
+                    childProcess = new Process()
                     {
                         StartInfo = new ProcessStartInfo()
                         {
@@ -262,8 +262,8 @@ namespace DICUI
                             Arguments = "--libcryptdrvfast " + driveLetter + " > " + "\"" + Path.Combine(outputDirectory, "libcryptdrv.log"),
                         },
                     };
-                    psxt001z.Start();
-                    psxt001z.WaitForExit();
+                    childProcess.Start();
+                    childProcess.WaitForExit();
                     break;
             }
 
@@ -271,7 +271,7 @@ namespace DICUI
             if (!Utilities.FoundAllFiles(outputDirectory, outputFilename, selected.Item3))
             {
                 lbl_Status.Content = "Error! Please check output directory as dump may be incomplete!";
-                btn_StartStop.Content = "Start Dumping";
+                btn_StartStop.Content = UIElements.StartDumping;
                 return;
             }
 
@@ -281,7 +281,7 @@ namespace DICUI
             List<string> formattedValues = Utilities.FormatOutputData(templateValues, selected.Item2, selected.Item3);
             bool success = Utilities.WriteOutputData(outputDirectory, outputFilename, formattedValues);
 
-            btn_StartStop.Content = "Start Dumping";
+            btn_StartStop.Content = UIElements.StartDumping;
         }
 
         /// <summary>

From 53a2ef227b59a63230d90a1692a053cb125f23dd Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 13 Jun 2018 11:51:21 -0700
Subject: [PATCH 3/4] Try to automatically populate the drive speed

---
 Constants.cs       |  1 +
 MainWindow.xaml.cs | 57 +++++++++++++++++++++++++++++++++++++++++-----
 Utilities.cs       |  1 +
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/Constants.cs b/Constants.cs
index 57a4abf6..a96d7ab6 100644
--- a/Constants.cs
+++ b/Constants.cs
@@ -25,6 +25,7 @@
         public const string ResetCommand = "reset";
         public const string SubCommand = "sub";
         public const string MDSCommand = "mds";
+        public const string DriveSpeedCommand = "ls"; // Unlisted in help text
 
         // DIC Flags
 
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 7c796d48..c7f80c0a 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.IO;
 using WinForms = System.Windows.Forms;
-using System.Diagnostics;
-using System.Threading.Tasks;
 
 namespace DICUI
 {
@@ -34,6 +35,7 @@ namespace DICUI
 
             // Populate the list of drive speeds
             PopulateDriveSpeeds();
+            SetSupportedDriveSpeed();
         }
 
         #region Events
@@ -59,6 +61,7 @@ namespace DICUI
         private void btn_Search_Click(object sender, RoutedEventArgs e)
         {
             PopulateDrives();
+            SetSupportedDriveSpeed();
             EnsureDiscInformation();
         }
 
@@ -70,6 +73,7 @@ namespace DICUI
 
         private void cmb_DriveLetter_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
+            SetSupportedDriveSpeed();
             GetOutputNames();
             EnsureDiscInformation();
         }
@@ -194,9 +198,14 @@ namespace DICUI
             await Task.Run(
                 () =>
                 {
-                    childProcess = new Process();
-                    childProcess.StartInfo.FileName = dicPath;
-                    childProcess.StartInfo.Arguments = parameters;
+                    childProcess = new Process()
+                    {
+                        StartInfo = new ProcessStartInfo()
+                        {
+                            FileName = dicPath,
+                            Arguments = parameters,
+                        },
+                    };
                     childProcess.Start();
                     childProcess.WaitForExit();
                 });
@@ -400,6 +409,42 @@ namespace DICUI
             }
         }
 
+        /// <summary>
+        /// Get the highest supported drive speed as reported by DiscImageCreator
+        /// </summary>
+        private void SetSupportedDriveSpeed()
+        {
+            string driveLetter = cmb_DriveLetter.Text;
+            if (String.IsNullOrWhiteSpace(driveLetter))
+            {
+                return;
+            }
+
+            childProcess = new Process()
+            {
+                StartInfo = new ProcessStartInfo()
+                {
+                    FileName = dicPath,
+                    Arguments = DICCommands.DriveSpeedCommand + " " + driveLetter,
+                    CreateNoWindow = true,
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true,
+                },
+            };
+            childProcess.Start();
+            childProcess.WaitForExit();
+            string output = childProcess.StandardOutput.ReadToEnd();
+
+            int index = output.IndexOf("ReadSpeedMaximum:");
+            string readspeed = Regex.Match(output.Substring(index), @"ReadSpeedMaximum: [0-9]+KB/sec \(([0-9]*)x\)").Groups[1].Value;
+            if (!Int32.TryParse(readspeed, out int speed))
+            {
+                return;
+            }
+
+            cmb_DriveSpeed.SelectedValue = speed;
+        }
+
         #endregion
     }
 }
diff --git a/Utilities.cs b/Utilities.cs
index b2de47d0..eb2b83b2 100644
--- a/Utilities.cs
+++ b/Utilities.cs
@@ -1869,6 +1869,7 @@ namespace DICUI
                 case DICCommands.EjectCommand:
                 case DICCommands.CloseCommand:
                 case DICCommands.ResetCommand:
+                case DICCommands.DriveSpeedCommand:
                     if (!Regex.IsMatch(parts[1], @"[A-Z]:?\\?"))
                     {
                         return false;

From 285921cae3baf65a29b3d06c993e425825755736 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 13 Jun 2018 12:18:06 -0700
Subject: [PATCH 4/4] Fix getting speed on changed drive letter

---
 MainWindow.xaml.cs | 8 ++++++--
 Utilities.cs       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index c7f80c0a..27f99b8b 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -414,8 +414,12 @@ namespace DICUI
         /// </summary>
         private void SetSupportedDriveSpeed()
         {
-            string driveLetter = cmb_DriveLetter.Text;
-            if (String.IsNullOrWhiteSpace(driveLetter))
+            // Get the drive letter from the selected item
+            var selected = cmb_DriveLetter.SelectedItem as Tuple<char, string>;
+            char driveLetter = selected.Item1;
+
+            // Validate that the required program exits
+            if (!File.Exists(dicPath))
             {
                 return;
             }
diff --git a/Utilities.cs b/Utilities.cs
index eb2b83b2..5fdeb33f 100644
--- a/Utilities.cs
+++ b/Utilities.cs
@@ -1773,7 +1773,7 @@ namespace DICUI
                     {
                         return false;
                     }
-                    else if (dvdspeed < 0 || dvdspeed > 16)
+                    else if (dvdspeed < 0 || dvdspeed > 72) // Officialy, 0-16
                     {
                         return false;
                     }