Fixed some edge cases involving quotes and exception logic in ProcessWrapper

Author: WombatFromHell

Changelog.md

@@ -1,7 +1,4 @@
-* c108990 (HEAD -> staging) Exclude assembly PID when validating child PIDs
-* 81355bb (origin/staging, origin/master, origin/HEAD, master) Update assembly version
-* af7eced Update changelog
-* 9e404b1 Grammar fix in README
+* 9e404b1 (HEAD -> master) Grammar fix in README
 * 138c598 Small code cleanup in WMI validator
 * b6da235 Excluded GOG Notifications from hooked windows. (#69)
 * 3582e6f (tag: v1.09h) Bump changelog for posterity

OriginSteamOverlayLauncher/LaunchLogic.cs

@@ -18,6 +18,8 @@ public class LaunchLogic
         private string MonitorPath { get; set; }
         private string MonitorName { get; set; }
         private bool LauncherPathValid { get; set; }
+        private bool PreLaunchPathValid { get; set; }
+        private bool PostGamePathValid { get; set; }
         private bool GamePathValid { get; set; }
         private bool LauncherURIMode { get; set; }
         private bool ExitRequested { get; set; }
@@ -35,6 +37,8 @@ public LaunchLogic()
             LauncherPathValid = SettingsData.ValidatePath(SetHnd.Paths.LauncherPath);
             GamePathValid = SettingsData.ValidatePath(SetHnd.Paths.GamePath);
             LauncherURIMode = SettingsData.ValidateURI(SetHnd.Paths.LauncherURI);
+            PreLaunchPathValid = SettingsData.ValidatePath(SetHnd.Paths.PreLaunchExecPath);
+            PostGamePathValid = SettingsData.ValidatePath(SetHnd.Paths.PostGameExecPath);
             TrayUtil = new TrayIconUtil();
         }
 
@@ -47,13 +51,16 @@ public async Task ProcessLauncher()
                 ProcessWrapper.KillProcTreeByName(LauncherName);
             }
 
-            // run PreLaunchExecPath/Args before the launcher
-            PreLauncherPL = new ProcessLauncher(
-                SetHnd.Paths.PreLaunchExecPath,
-                SetHnd.Paths.PreLaunchExecArgs,
-                elevate: SetHnd.Options.ElevateExternals
-            );
-            await PreLauncherPL.Launch();
+            if (PreLaunchPathValid)
+            {
+                // run PreLaunchExecPath/Args before the launcher
+                PreLauncherPL = new ProcessLauncher(
+                    SetHnd.Paths.PreLaunchExecPath,
+                    SetHnd.Paths.PreLaunchExecArgs,
+                    elevate: SetHnd.Options.ElevateExternals
+                );
+                await PreLauncherPL.Launch();
+            }
 
             if (LauncherPathValid && !SetHnd.Options.SkipLauncher)
             {
@@ -79,11 +86,13 @@ public async Task ProcessLauncher()
                 LauncherMonitor.ProcessAcquired += OnLauncherAcquired;
 
             // wait for all running threads to exit
-            while (!ExitRequested ||
+            while (
+                PreLauncherPL != null && PreLauncherPL.ProcWrapper.IsRunning() ||
                 LauncherMonitor != null && LauncherMonitor.IsRunning() ||
                 GameMonitor != null && GameMonitor.IsRunning() ||
-                PreLauncherPL != null && PreLauncherPL.ProcWrapper.IsRunning() ||
-                PostGamePL != null && PostGamePL.ProcWrapper.IsRunning())
+                PostGamePL != null && PostGamePL.ProcWrapper.IsRunning() ||
+                !ExitRequested
+            )
                 await Task.Delay(1000);
         }
 
@@ -225,14 +234,17 @@ private async void OnGameExited(object sender, ProcessEventArgs e)
             if (SetHnd.Options.MinimizeLauncher && LauncherPL.ProcWrapper.IsRunning())
                 WindowUtils.MinimizeWindow(LauncherPL.ProcWrapper.Hwnd);
 
-            // run PostGameExecPath/Args after the game exits
-            PostGamePL = new ProcessLauncher(
-                SetHnd.Paths.PostGameExecPath,
-                SetHnd.Paths.PostGameExecArgs,
-                elevate: SetHnd.Options.ElevateExternals,
-                delayTime: SetHnd.Options.PostGameWaitTime
-            );
-            await PostGamePL.Launch();
+            if (PostGamePathValid)
+            {
+                // run PostGameExecPath/Args after the game exits
+                PostGamePL = new ProcessLauncher(
+                    SetHnd.Paths.PostGameExecPath,
+                    SetHnd.Paths.PostGameExecArgs,
+                    elevate: SetHnd.Options.ElevateExternals,
+                    delayTime: SetHnd.Options.PostGameWaitTime
+                );
+                await PostGamePL.Launch();
+            }
 
             if (SetHnd.Options.PostGameWaitTime > 0)
                 ProcessUtils.Logger("OSOL", $"Game exited, moving on to clean up after {SetHnd.Options.PostGameWaitTime}s...");

OriginSteamOverlayLauncher/ProcessWrapper.cs

@@ -72,8 +72,12 @@ public List<Tuple<int, int, Process>> GetChildProcesses(int PID = 0)
         public List<Process> GetProcessesByName(string exeName)
         {
             var output = new List<Process>();
-            using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(
-                $"SELECT * FROM Win32_Process where Name LIKE '{exeName}.exe'"))
+            
+            // try to make sure single quotes are escaped
+            exeName = exeName.Replace("'", "''");
+            string query = $"SELECT * FROM Win32_Process WHERE Name LIKE '{exeName}.exe'";
+            
+            using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(query))
             using (ManagementObjectCollection processes = searcher.Get())
             {
                 foreach (var process in processes)
@@ -89,6 +93,7 @@ public List<Process> GetProcessesByName(string exeName)
                                 output.Add(curProcess);
                         }
                     }
+                    catch (ManagementException) { return output; }
                     catch (Win32Exception) { continue; }
                     catch (InvalidOperationException) { continue; }
                 }
@@ -167,7 +172,7 @@ public bool IsRunning()
             }
             catch (Exception) {
                 // rough check until the next iteration
-                return Proc == null || PID > 0 && !NativeProcessUtils.IsProcessAlive(PID);
+                return Proc != null && PID > 0 && NativeProcessUtils.IsProcessAlive(PID);
             }
         }