Merge pull request #2525 from AnErrupTion/close-heur

Close VMware Workstation properly from debug engine

Author: quajak

source/Cosmos.Debug.Hosts/VMware.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
+using System.Threading;
 using Microsoft.Win32;
 
 //using Vestris.VMWareLib;
@@ -14,6 +16,7 @@ public class VMware : Host {
     protected string mDir;
     protected string mVmxPath;
     protected Process mProcess;
+    protected Process[] mProcessesBefore, mProcessesAfter, mProcesses;
     protected string mWorkstationPath;
     protected string mPlayerPath;
     protected string mHarddisk;
@@ -89,7 +92,27 @@ public override void Start() {
       xPSI.UseShellExecute = false;  //must be true to allow elevate the process, sometimes needed if vmware only runs with admin rights
       mProcess.EnableRaisingEvents = true;
       mProcess.Exited += ExitCallback;
+
+      mProcessesBefore = Process.GetProcessesByName("vmware-vmx");
       mProcess.Start();
+
+      Stopwatch watch = Stopwatch.StartNew();
+
+      // Wait for the process to spawn
+      mProcessesAfter = Process.GetProcessesByName("vmware-vmx");
+      while (mProcessesAfter.Length == mProcessesBefore.Length)
+      {
+        if (watch.Elapsed.Seconds == 15)
+        {
+          watch.Stop();
+          throw new TimeoutException("VMware Workstation took too long to launch!");
+        }
+
+        mProcessesAfter = Process.GetProcessesByName("vmware-vmx");
+      }
+
+      // Get the new processes
+      mProcesses = mProcessesBefore.Concat(mProcessesAfter).Distinct().ToArray();
     }
 
     private void ExitCallback(object sender, EventArgs e)
@@ -113,11 +136,11 @@ public override void Stop() {
         {
           //TODO: Close VMWare properly
 
-          //Force Kill VMWare
+          // Kill the VMware GUI
           mProcess.Kill();
 
-          //kil vmware-vmx.exe
-          foreach (var process in Process.GetProcessesByName("vmware-vmx.exe"))
+          // Kill the actual VM instance
+          foreach (var process in mProcesses)
           {
             process.Kill();
           }