Added preliminary logging support

-L parameter for 86Box.exe is now implemented, still needs to include a logfile path as well.
Minor code fixes and enhancements.

Author: daviunic

86BoxManager/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.4.3.0")]
-[assembly: AssemblyFileVersion("1.4.3.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]

86BoxManager/dlgSettings.Designer.cs

@@ -130,6 +130,7 @@ private void SaveSettings()
                 regkey.SetValue("MinimizeToTray", cbxMinimizeTray.Checked, RegistryValueKind.DWord);
                 regkey.SetValue("CloseToTray", cbxCloseTray.Checked, RegistryValueKind.DWord);
                 regkey.SetValue("LaunchTimeout", int.Parse(txtLaunchTimeout.Text), RegistryValueKind.DWord);
+                regkey.SetValue("EnableLogging", cbxLogging.Checked, RegistryValueKind.DWord);
                 regkey.Close();
 
                 settingsChanged = CheckForChanges();
@@ -170,6 +171,7 @@ private void LoadSettings()
                     cbxShowConsole.Checked = true;
                     cbxMinimizeTray.Checked = false;
                     cbxCloseTray.Checked = false;
+                    cbxLogging.Checked = false;
                     txtLaunchTimeout.Text = "5000";
 
                     SaveSettings(); //This will write the default values to the registry
@@ -182,6 +184,7 @@ private void LoadSettings()
                     cbxShowConsole.Checked = Convert.ToBoolean(regkey.GetValue("ShowConsole"));
                     cbxMinimizeTray.Checked = Convert.ToBoolean(regkey.GetValue("MinimizeToTray"));
                     cbxCloseTray.Checked = Convert.ToBoolean(regkey.GetValue("CloseToTray"));
+                    cbxLogging.Checked = Convert.ToBoolean(regkey.GetValue("EnableLogging"));
                     txtLaunchTimeout.Text = Convert.ToString(regkey.GetValue("LaunchTimeout"));
                 }
 
@@ -195,6 +198,7 @@ private void LoadSettings()
                 cbxShowConsole.Checked = true;
                 cbxMinimizeTray.Checked = false;
                 cbxCloseTray.Checked = false;
+                cbxLogging.Checked = false;
                 txtLaunchTimeout.Text = "5000";
             }
         }
@@ -235,16 +239,6 @@ private void btnBrowse2_Click(object sender, EventArgs e)
             }
         }
 
-        private void cbxMinimize_CheckedChanged(object sender, EventArgs e)
-        {
-            settingsChanged = CheckForChanges();
-        }
-
-        private void cbxShowConsole_CheckedChanged(object sender, EventArgs e)
-        {
-            settingsChanged = CheckForChanges();
-        }
-
         private void btnDefaults_Click(object sender, EventArgs e)
         {
             DialogResult result = MessageBox.Show("All settings will be reset to their default values. Do you wish to continue?", "Settings will be reset", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
@@ -272,22 +266,13 @@ private void ResetSettings()
             cbxShowConsole.Checked = true;
             cbxMinimizeTray.Checked = false;
             cbxCloseTray.Checked = false;
+            cbxLogging.Checked = false;
             txtLaunchTimeout.Text = "5000";
 
             SaveSettings();
             regkey.Close();
         }
 
-        private void cbxCloseTray_CheckedChanged(object sender, EventArgs e)
-        {
-            settingsChanged = CheckForChanges();
-        }
-
-        private void cbxMinimizeTray_CheckedChanged(object sender, EventArgs e)
-        {
-            settingsChanged = CheckForChanges();
-        }
-
         //Checks if all controls match the currently saved settings to determine if any changes were made
         private bool CheckForChanges()
         {
@@ -301,7 +286,8 @@ private bool CheckForChanges()
                 cbxShowConsole.Checked != Convert.ToBoolean(regkey.GetValue("ShowConsole")) ||
                 cbxMinimizeTray.Checked != Convert.ToBoolean(regkey.GetValue("MinimizeToTray")) ||
                 cbxCloseTray.Checked != Convert.ToBoolean(regkey.GetValue("CloseToTray")) || 
-                txtLaunchTimeout.Text != Convert.ToString(regkey.GetValue("LaunchTimeout")));
+                txtLaunchTimeout.Text != Convert.ToString(regkey.GetValue("LaunchTimeout")) ||
+                cbxLogging.Checked != Convert.ToBoolean(regkey.GetValue("EnableLogging")));
 
                 return btnApply.Enabled;
             }
@@ -314,5 +300,10 @@ private bool CheckForChanges()
                 regkey.Close();
             }
         }
+
+        private void cbx_CheckedChanged(object sender, EventArgs e)
+        {
+            settingsChanged = CheckForChanges();
+        }
     }
 }

86BoxManager/dlgSettings.cs

@@ -1,14 +1,13 @@
-using System;
-using System.Windows.Forms;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
+using IWshRuntimeLibrary;
 using Microsoft.Win32;
+using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Runtime.Serialization.Formatters.Binary;
-using IWshRuntimeLibrary;
-using System.Collections.Generic;
 using System.Threading;
+using System.Windows.Forms;
 
 namespace _86boxManager
 {
@@ -41,6 +40,7 @@ public struct COPYDATASTRUCT
         private const string ZEROID = "0000000000000000"; //Used for the id parameter of 86Box -H
         private int sortColumn = -1; //For column sorting's asc/desc capability
         private int launchTimeout = 5000; //Timeout for waiting for 86Box.exe to initialize
+        private bool logging = false; //Logging enabled for 86Box.exe (-L parameter)?
 
         public frmMain()
         {
@@ -126,7 +126,6 @@ private void lstVMs_SelectedIndexChanged(object sender, EventArgs e)
                 VM vm = (VM)lstVMs.SelectedItems[0].Tag;
                 if (vm.Status == VM.STATUS_RUNNING)
                 {
-                    //btnConfigure.Enabled = false;
                     btnStart.Enabled = true;
                     btnStart.Text = "Stop";
                     toolTip.SetToolTip(btnStart, "Stop this virtual machine");
@@ -415,7 +414,6 @@ private void cmsVM_Opening(object sender, CancelEventArgs e)
         //Closing 86Box Manager before closing all the VMs can lead to weirdness if 86Box Manager is then restarted. So let's warn the user just in case and request confirmation.
         private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
         {
-            //List<ListViewItem> vms = new List<ListViewItem>();
             int vmCount = 0;
             if (e.CloseReason == CloseReason.UserClosing && closeTray)
             {
@@ -478,7 +476,6 @@ private void VMPause()
         {
             VM vm = (VM)lstVMs.SelectedItems[0].Tag;
             PostMessage(vm.hWnd, 0x8890, IntPtr.Zero, IntPtr.Zero);
-            vm.Status = VM.STATUS_PAUSED;
             lstVMs.SelectedItems[0].SubItems[1].Text = vm.GetStatusString();
             lstVMs.SelectedItems[0].ImageIndex = 2;
             pauseToolStripMenuItem.Text = "Resume";
@@ -514,6 +511,10 @@ private void VMStart()
                     Process p = new Process();
                     p.StartInfo.FileName = exepath + "86Box.exe";
                     p.StartInfo.Arguments = "-P \"" + lstVMs.SelectedItems[0].SubItems[2].Text + "\" -H " + ZEROID + "," + hWndHex;
+                    if (logging)
+                    {
+                        p.StartInfo.Arguments += " -L";
+                    }
                     if (!showConsole)
                     {
                         p.StartInfo.RedirectStandardOutput = true;
@@ -522,12 +523,11 @@ private void VMStart()
 
                     p.Start();
                     vm.Pid = p.Id;
-                    bool initSuccess = p.WaitForInputIdle(launchTimeout); //Wait 5 seconds so hWnd can be obtained
+                    bool initSuccess = p.WaitForInputIdle(launchTimeout); //Wait for the specified amount of time so hWnd can be obtained
 
                     if (!p.MainWindowHandle.Equals(IntPtr.Zero) && initSuccess)
                     {
                         vm.hWnd = p.MainWindowHandle; //Get the window handle of the newly created process
-                       //vm.Pid = p.Id; //Assign the pid to the VM
                         vm.Status = VM.STATUS_RUNNING;
                         lstVMs.SelectedItems[0].SubItems[1].Text = vm.GetStatusString();
                         lstVMs.SelectedItems[0].ImageIndex = 1;