Merge branch 'master' into vNext

Author: daviunic

86BoxManager/Program.cs

@@ -45,12 +45,18 @@ public struct COPYDATASTRUCT
         [DllImport("shell32.dll", SetLastError = true)]
         static extern void SetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] string AppID);
 
+        [DllImport("user32.dll")]
+        private static extern bool SetProcessDPIAware();
+
         private static readonly string AppID = "86Box.86Box"; //For grouping windows together in Win7+ taskbar
         private static Mutex mutex = null;
 
         [STAThread]
         static void Main()
         {
+            if (Environment.OSVersion.Version.Major >= 6)
+                SetProcessDPIAware();
+
             SetCurrentProcessExplicitAppUserModelID(AppID);
             const string name = "86Box Manager";
 

86BoxManager/dlgSettings.cs

@@ -158,8 +158,6 @@ private bool SaveSettings()
                 regkey.Close();
 
                 settingsChanged = CheckForChanges();
-
-                MessageBox.Show("Settings were successfully saved.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
             catch (Exception ex)
             {

86BoxManager/frmMain.cs

@@ -509,10 +509,11 @@ private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
                             lvi.Focused = true;
                             lvi.Selected = true;
                             VMForceStop(); //Tell the VM to shut down without asking for user confirmation
+                            Process p = Process.GetProcessById(vm.Pid);
+                            p.WaitForExit(500); //Wait 500 milliseconds for each VM to close
                         }
                     }
 
-                    Thread.Sleep(vmCount * 500); //Wait just a bit to make sure everything goes as planned
                 }
                 else if (DialogResult == DialogResult.Cancel)
                 {
@@ -603,9 +604,12 @@ private void VMStart()
 
                     p.Start();
                     vm.Pid = p.Id;
+
                     bool initSuccess = p.WaitForInputIdle(launchTimeout); //Wait for the specified amount of time so hWnd can be obtained
 
-                    if (!p.MainWindowHandle.Equals(IntPtr.Zero) && initSuccess)
+                    //initSuccess is ignored for now because WaitForInputIdle() likes to return false more often now that
+                    //86Box is compiled with GCC 9.3.0...
+                    if (!p.MainWindowHandle.Equals(IntPtr.Zero) /*&& initSuccess*/)
                     {
                         vm.hWnd = p.MainWindowHandle; //Get the window handle of the newly created process
                         vm.Status = VM.STATUS_RUNNING;

README.md

@@ -1,7 +1,7 @@
 # 86Box Manager
-**86Box Manager** is the official (though optional) configuration manager for the [86Box emulator](https://github.com/86Box/86Box). It's released under the MIT license, so it can be freely distributed with 86Box. See the `LICENSE` file for license information and `AUTHORS` for a complete list of contributors and authors.
+**86Box Manager** is the official but optional configuration manager for the [86Box emulator](https://github.com/86Box/86Box). It's released under the MIT license, so it can be freely distributed with 86Box. See the `LICENSE` file for license information and `AUTHORS` for a complete list of contributors and authors.
 
-It's written in C# with Windows Forms using Visual Studio 2017. Please see the [wiki](https://github.com/86Box/86BoxManager/wiki) for additional information.
+It's written in C# with Windows Forms. Please see the [wiki](https://github.com/86Box/86BoxManager/wiki) for additional information.
 
 ## Features
 * Powerful, lightweight and completely optional
@@ -28,7 +28,7 @@ If you have any issues, questions, suggestions, etc., please follow the [trouble
 
 ## How to build
 1. Clone the repo
-2. Open `86BoxManager.sln` solution file in Visual Studio 2017
+2. Open `86BoxManager.sln` solution file in Visual Studio
 3. Make your changes
 4. Choose the `Release` configuration and `x86` platform/CPU
 5. Build the solution