Version 1.3 (minor feature update)

Added the Kill VM option from issue #26
Added additional tooltips to controls from issue #27
Added the option to close all running VM before quiting from issue #28
Improved the code for detecting running instances of Manager from issue #32
Various minor UI and code adjustments

Author: daviunic

86BoxManager/Program.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Threading;
 using System.Windows.Forms;
 
 namespace _86boxManager
@@ -8,20 +10,118 @@ static class Program
     {
         public const bool PRERELEASE = false; //Is this a pre-release version?
         public static string[] args = Environment.GetCommandLineArgs(); //Get command line arguments
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
+
+        private enum ShowWindowEnum
+        {
+            Hide = 0,
+            ShowNormal = 1, ShowMinimized = 2, ShowMaximized = 3,
+            Maximize = 3, ShowNormalNoActivate = 4, Show = 5,
+            Minimize = 6, ShowMinNoActivate = 7, ShowNoActivate = 8,
+            Restore = 9, ShowDefault = 10, ForceMinimized = 11
+        };
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct COPYDATASTRUCT
+        {
+            public IntPtr dwData;
+            public int cbData;
+            public IntPtr lpData;
+        }
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        static extern bool ShowWindow(IntPtr hWnd, ShowWindowEnum flags);
+
+        [DllImport("user32.dll")]
+        private static extern int SetForegroundWindow(IntPtr hwnd);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr FindWindow(string className, string windowTitle);
+
+        public const int WM_COPYDATA = 0x004A;
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern int SendMessage(IntPtr hwnd, int wMsg, IntPtr wParam, ref COPYDATASTRUCT lParam);
+
+        private static Mutex mutex = null;
+
         [STAThread]
         static void Main()
         {
+            const string name = "86Box Manager";
+            bool firstInstance;
+
+            //Use a mutex to check if this is the first instance of Manager
+            mutex = new Mutex(true, name, out firstInstance);
+
+            //If it's not, we need to restore and focus the existing window, as well as pass on any potential command line arguments
+            if (!firstInstance)
+            {
+                //Finds the existing window, unhides it, restores it and sets focus to it
+                IntPtr hWnd = FindWindow(null, "86Box Manager");
+                ShowWindow(hWnd, ShowWindowEnum.Show);
+                ShowWindow(hWnd, ShowWindowEnum.Restore);
+                SetForegroundWindow(hWnd);
+
+                //If this second instance comes from a VM shortcut, we need to pass on the command line arguments so the VM will start
+                //in the existing instance.
+                //NOTE: This code will have to be modified in case more command line arguments are added in the future.
+                if (args.Length == 3 && args[1] == "-S" && args[2] != null)
+                {
+                    string message = args[2];
+                    COPYDATASTRUCT cds;
+                    cds.dwData = IntPtr.Zero;
+                    cds.lpData = Marshal.StringToHGlobalAnsi(message);
+                    cds.cbData = message.Length;
+                    SendMessage(hWnd, WM_COPYDATA, IntPtr.Zero, ref cds);
+                }
+
+                return;
+            }
+            else
+            {
+                //Then check if any instances of 86Box are already running and warn the user
+                Process[] pname = Process.GetProcessesByName("86box");
+                if (pname.Length > 0)
+                {
+                    DialogResult result = MessageBox.Show("At least one instance of 86box is already running. It's not recommended that you run 86Box.exe directly outside of Manager. Do you want to continue at your own risk?", "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+                    if (result == DialogResult.No)
+                    {
+                        return;
+                    }
+                }
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                Application.Run(new frmMain());
+            }
+
+            /*
             //Check if Manager is already running
             Process[] pname = Process.GetProcessesByName("86manager");
             if (pname.Length > 1)
             {
-                MessageBox.Show("86Box Manager is already running. You can only run one instance at a time.\n\nIf you tried to run a virtual machine from a shortcut, you may use the open Manager window instead.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                //Find the window of the first instance and restore it
+                IntPtr hWnd = FindWindow(null, "86Box Manager");
+                ShowWindow(hWnd, ShowWindowEnum.Show);
+                ShowWindow(hWnd, ShowWindowEnum.Restore);
+                SetForegroundWindow(hWnd);
+
+                //If the second instance was started with the -S command line argument for starting a VM, we must send
+                //the arguments to the first instance 
+                if (args.Length == 3 && args[1] == "-S" && args[2] != null)
+                {
+                    CopyDataStruct DataStruct = new CopyDataStruct();
+                    DataStruct.ID = "1";
+                    DataStruct.Data = args[2];
+                    DataStruct.Length = DataStruct.Data.Length;
+                    if (!hWnd.Equals(IntPtr.Zero))
+                    {
+                        SendMessage(hWnd, WM_COPYDATA, 0, ref DataStruct);
+                    }
+                }
             }
             else
-            { //Then check if any instances of 86box are already running and warn the user
+            { //Then check if any instances of 86Box are already running and warn the user
                 pname = Process.GetProcessesByName("86box");
                 if (pname.Length > 0)
                 {
@@ -34,7 +134,7 @@ static void Main()
                 Application.EnableVisualStyles();
                 Application.SetCompatibleTextRenderingDefault(false);
                 Application.Run(new frmMain());
-            }
+            }*/
         }
     }
 }

86BoxManager/Properties/AssemblyInfo.cs

@@ -31,6 +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.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]

86BoxManager/dlgSettings.Designer.cs

@@ -44,7 +44,6 @@ private void btnCancel_Click(object sender, EventArgs e)
         private void btnApply_Click(object sender, EventArgs e)
         {
             SaveSettings();
-            btnApply.Enabled = false;
         }
 
         private void btnOK_Click(object sender, EventArgs e)
@@ -57,12 +56,11 @@ private void txt_TextChanged(object sender, EventArgs e)
         {
             if (string.IsNullOrWhiteSpace(txtCFGdir.Text) || string.IsNullOrWhiteSpace(txtEXEdir.Text))
             {
-                btnApply.Enabled = false;
                 btnOK.Enabled = false;
             }
             else
             {
-                btnApply.Enabled = true;
+                //btnApply.Enabled = true;
                 settingsChanged = true;
                 btnOK.Enabled = true;
             }
@@ -90,7 +88,7 @@ private void SaveSettings()
                 regkey.Close();
                 settingsChanged = false;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show("An error has occurred. Please provide the following information to the developer:\n" + ex.Message + "\n" + ex.StackTrace, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
@@ -121,14 +119,13 @@ private void LoadSettings()
                     cbxMinimizeTray.Checked = Convert.ToBoolean(regkey.GetValue("MinimizeToTray"));
                     cbxCloseTray.Checked = Convert.ToBoolean(regkey.GetValue("CloseToTray"));
 
-                    //These two lines are needed because storing the values into the textboxes (above code) triggers textchanged event
+                    //This line is needed because storing the values into the textboxes (above code) triggers textchanged event
                     settingsChanged = false;
-                    btnApply.Enabled = false;
 
                     regkey.Close();
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 txtCFGdir.Text = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\86Box Virtual Machines";
                 txtEXEdir.Text = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + @"\86Box";
@@ -172,13 +169,11 @@ private void btnBrowse2_Click(object sender, EventArgs e)
         private void cbxMinimize_CheckedChanged(object sender, EventArgs e)
         {
             settingsChanged = true;
-            btnApply.Enabled = true;
         }
 
         private void cbxShowConsole_CheckedChanged(object sender, EventArgs e)
         {
             settingsChanged = true;
-            btnApply.Enabled = true;
         }
 
         private void btnDefaults_Click(object sender, EventArgs e)
@@ -194,7 +189,7 @@ private void ResetSettings()
                 RegistryKey regkey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE", true); //Open the key as read only
                 Registry.CurrentUser.DeleteSubKeyTree(@"86Box");
             }
-            catch(Exception ex){/*Do nothing, key doesn't exist anyway*/}
+            catch (Exception ex) {/*Do nothing, key doesn't exist anyway*/}
 
             txtCFGdir.Text = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\86Box VMs";
             txtEXEdir.Text = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + @"\86Box";
@@ -207,13 +202,11 @@ private void ResetSettings()
         private void cbxCloseTray_CheckedChanged(object sender, EventArgs e)
         {
             settingsChanged = true;
-            btnApply.Enabled = true;
         }
 
         private void cbxMinimizeTray_CheckedChanged(object sender, EventArgs e)
         {
             settingsChanged = true;
-            btnApply.Enabled = true;
         }
     }
 }