Improved process detection for hidden windows

Author: WombatFromHell

Changelog.md

@@ -1,4 +1,5 @@
-* e32b5b5 (HEAD -> staging, origin/staging, origin/master, origin/HEAD, master) Unit tests for BitmaskExtensions and bug fixes
+* 413eef6 (HEAD -> staging, origin/staging) Implemented SkipLauncher option and GameArgs for URI mode
+* e32b5b5 (origin/master, origin/HEAD, master) Unit tests for BitmaskExtensions and bug fixes
 * 928f8de Some more unit tests for Program class
 * 2df305e Just list our options to be validated cleanly for readability
 * 67f72bd Remove a typo in validated INI options

OriginSteamOverlayLauncher/ProcessTracking.cs

@@ -123,13 +123,15 @@ public static int ValidateProcTree(Process[] procTree, int timeout)
             if (procChildren == 1 && !procTree[0].HasExited 
                 && procTree[0].MainWindowHandle != IntPtr.Zero && procTree[0].MainWindowTitle.Length > 0)
             {
+                procTree[0].Refresh();
                 return procTree[0].Id; // just return the PID of the parent
             }
             else if (procChildren > 1)
             {// our parent is likely a caller or proxy
                 for (int i = 0; i < procChildren; i++)
                 {// iterate through each process in the tree and determine which process we should bind to
                     var proc = procTree[i];
+                    proc.Refresh();
 
                     if (proc.Id > 0 && !proc.HasExited)
                     {
@@ -143,6 +145,13 @@ public static int ValidateProcTree(Process[] procTree, int timeout)
                         }
                     }
                 }
+
+                for (int j = 0; j < procChildren; j++)
+                {// fall back to finding the ModuleHandle (breaks window messages)
+                    var proc = procTree[j];
+                    if (proc.Id > 0 && proc.MainWindowHandle == IntPtr.Zero && proc.MainModule != null && (long)proc.Handle > 0)
+                        return proc.Id;
+                }
             }
 
             return 0;
@@ -190,6 +199,10 @@ public static Process GetProcessTreeHandle(Settings setHnd, String procName, ref
                     _retProc = Program.RebindProcessByID(_result);
                     processType = DetectWindowType(_retProc); // pass our process type out by ref
                     Program.Logger("OSOL", String.Format("Bound to a valid process at PID: {0} [{1}] in {2} seconds", _result, String.Format("{0}.exe", procName), sanity_counter));
+
+                    if (processType == -1)
+                        Program.Logger("WARNING", String.Format("Could not find MainWindowHandle of PID [{0}], fell back to ModuleHandle instead...", _retProc.Id));
+
                     break;
                 }
             }
@@ -288,16 +301,19 @@ public void ProcessLauncher(Settings setHnd, IniFile iniHnd)
                 launcherProc = GetProcessTreeHandle(setHnd, launcherName, ref launcherType);
                 launcherPID = launcherProc != null ? launcherProc.Id : 0;
 
-                if (launcherPID > 0 && launcherType > -1)
+                if (launcherPID > 0)
                 {
                     // do some waiting based on user tuneables to avoid BPM weirdness
                     Program.Logger("OSOL", String.Format("Waiting {0}s for launcher process to load...", setHnd.PreGameLauncherWaitTime));
                     Thread.Sleep(setHnd.PreGameLauncherWaitTime * 1000);
-                    Program.BringToFront(launcherProc.MainWindowHandle);
 
-                    // if the user requests it minimize our launcher after detecting it
-                    if (setHnd.MinimizeLauncher)
-                        Program.MinimizeWindow(launcherProc.MainWindowHandle);
+                    if (launcherType > -1)
+                    {// we can only send window messages if we have a window handle
+                        Program.BringToFront(launcherProc.MainWindowHandle);
+                        if (setHnd.MinimizeLauncher)
+                            Program.MinimizeWindow(launcherProc.MainWindowHandle);
+                    }
+                    
                 }
             }
             #endregion
@@ -355,16 +371,18 @@ public void ProcessLauncher(Settings setHnd, IniFile iniHnd)
                         launcherProc = GetProcessTreeHandle(setHnd, launcherName, ref launcherType);
                         launcherPID = launcherProc != null ? launcherProc.Id : 0;
 
-                        if (launcherPID > 0 && launcherType > -1)
+                        if (launcherPID > 0)
                         {
                             // do some waiting based on user tuneables to avoid BPM weirdness
                             Program.Logger("OSOL", String.Format("Waiting {0}s for launcher process to load...", setHnd.PreGameLauncherWaitTime));
                             Thread.Sleep(setHnd.PreGameLauncherWaitTime * 1000);
-                            Program.BringToFront(launcherProc.MainWindowHandle);
 
-                            // if the user requests it minimize our launcher after detecting it
-                            if (setHnd.MinimizeLauncher)
-                                Program.MinimizeWindow(launcherProc.MainWindowHandle);
+                            if (launcherType > -1)
+                            {// we can only send window messages if we have a window handle
+                                Program.BringToFront(launcherProc.MainWindowHandle);
+                                if (setHnd.MinimizeLauncher)
+                                    Program.MinimizeWindow(launcherProc.MainWindowHandle);
+                            }
                         }
                     }
                 }