StartProcessCreateBreakawayFromJob: dispose the process on failure here instead of the caller

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

@@ -657,13 +657,6 @@ private void ActivateMode(TemplateElement templateElement, ErrorDelegate errorDe
                                 LogExceptionToLauncher(ex);
                                 // popup message box and blow up
                                 errorDelegate(Properties.Resources.JobObjectNotCreated);
-
-                                if (softwareProcess != null) {
-                                    softwareProcess.Kill();
-                                    softwareProcess.Dispose();
-                                    softwareProcess = null;
-                                }
-
                                 Environment.Exit(-1);
                                 throw new InvalidModeException("The Mode failed to create a Job Object.");
                             }

FlashpointSecurePlayer/RegistryStates.cs

@@ -762,7 +762,7 @@ public async Task StartImportAsync(string templateName, BINARY_TYPE binaryType)
             }
 
             if (resumeEventWaitHandle == null) {
-                throw new InvalidOperationException("resumeEventWaitHandle must not be NULL.");
+                throw new InvalidOperationException("resumeEventWaitHandle is null.");
             }
 
             try {
@@ -863,7 +863,7 @@ private async Task StopImportAsync(bool sync) {
                 base.StopImport();
 
                 if (resumeEventWaitHandle == null) {
-                    throw new InvalidOperationException("resumeEventWaitHandle must not be NULL.");
+                    throw new InvalidOperationException("resumeEventWaitHandle is null.");
                 }
 
                 resumeEventWaitHandle.Set();
@@ -1532,7 +1532,7 @@ private void GotValue(RegistryTraceData registryTraceData) {
                     // with reassurance the control has installed already
                     // therefore, key names will be redirected properly
                     if (resumeEventWaitHandle == null) {
-                        throw new InvalidOperationException("resumeEventWaitHandle must not be NULL.");
+                        throw new InvalidOperationException("resumeEventWaitHandle is null.");
                     }
 
                     resumeEventWaitHandle.WaitOne();

FlashpointSecurePlayer/Shared.cs

@@ -2679,11 +2679,23 @@ public static void StartProcessCreateBreakawayFromJob(ProcessStartInfo processSt
 
             try {
                 process = Process.GetProcessById((int)processInformation.dwProcessId);
-                ProcessSync.Start(process);
 
-                if (ResumeThread(processInformation.hThread) == -1) {
-                    Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
-                    return;
+                if (process == null) {
+                    throw new InvalidOperationException("process is null.");
+                }
+
+                try {
+                    ProcessSync.Start(process);
+
+                    if (ResumeThread(processInformation.hThread) == -1) {
+                        Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
+                        return;
+                    }
+                } catch {
+                    process.Kill();
+                    process.Dispose();
+                    process = null;
+                    throw;
                 }
             } finally {
                 if (!CloseHandle(processInformation.hProcess)) {

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -60,7 +60,7 @@ private IntPtr LowLevelMouseProc(int nCode, IntPtr wParam, IntPtr lParam) {
         public WINDOWPLACEMENT WindowPlacement {
             get {
                 if (!IsHandleCreated || Handle == IntPtr.Zero) {
-                    throw new InvalidOperationException("Handle must not be NULL.");
+                    throw new InvalidOperationException("Handle is null.");
                 }
 
                 WINDOWPLACEMENT value = new WINDOWPLACEMENT();
@@ -74,7 +74,7 @@ public WINDOWPLACEMENT WindowPlacement {
 
             set {
                 if (!IsHandleCreated || Handle == IntPtr.Zero) {
-                    throw new InvalidOperationException("Handle must not be NULL.");
+                    throw new InvalidOperationException("Handle is null.");
                 }
 
                 value.length = Marshal.SizeOf(value);