Merge pull request #87 from novemberdobby/master

fixed process tracking for "advanced install" games, which are launched via an instance of GameLaunchHelper.exe

UWPHook/AppManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Management;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -14,7 +15,8 @@ namespace UWPHook
     /// </summary>
     static class AppManager
     {
-        private static int id;
+        private static int runningProcessId;
+        private static bool isLauncherProcess;
 
         /// <summary>
         /// Launch a UWP App using a ApplicationActivationManager and sets a internal id to launched proccess id
@@ -37,10 +39,16 @@ namespace UWPHook
             try
             {
                 mgr.ActivateApplication(aumid, extra_args, ActivateOptions.None, out processId);
-                
+                runningProcessId = (int)processId;
-                //Bring the launched app to the foreground, this fixes in-home streaming
+
-                id = (int)processId;
+                //if this is a launch aided by GameLaunchHelper, deal with child launch later
+                var possibleLauncher = Process.GetProcessById(runningProcessId);
+                if (possibleLauncher.ProcessName.Equals("gamelaunchhelper", StringComparison.OrdinalIgnoreCase))
+                {
+                    isLauncherProcess = true;
+                }
 
+                //Bring the launched app to the foreground, this fixes in-home streaming
                 BringProcess();
             }
             catch (Exception e)
@@ -56,20 +64,64 @@ namespace UWPHook
         public static Boolean IsRunning()
         {
             //If 0, no app was launched most probably
-            if (id == 0)
+            if (runningProcessId != 0)
-            {
-                return false;
-            }
-            try
             {
-                Process.GetProcessById(id);
+                try
+                {
+                    Process.GetProcessById(runningProcessId);
+                    return true;
+                }
+                catch
+                {
+                    //the process we launched is no longer running. did it spawn any others?
+                    if (isLauncherProcess)
+                    {
+                        var tree = GetProcessChildren();
+                        if (tree.TryGetValue(runningProcessId, out var children))
+                        {
+                            //retarget to the first child we find
+                            isLauncherProcess = false;
+
+                            var newId = children.First();
+                            Debug.WriteLine($"Launcher opened child process ({runningProcessId}->{newId}), using new process as target");
+                            runningProcessId = newId;
+
+                            //bring the "real" launched process
+                            BringProcess();
+                            return true;
+                        }
+                    }
+                }
             }
-            catch (Exception)
+
+            return false;
+        }
+
+        /// <summary>
+        /// Find pid<->parent_pid relationships
+        /// </summary>
+        /// <returns>Map of processes to their child IDs. Any process in this object may have already terminated</returns>
+        private static Dictionary<int, List<int>> GetProcessChildren()
+        {
+            var result = new Dictionary<int, List<int>>();
+
+            using (var searcher = new ManagementObjectSearcher("select processid,parentprocessid from win32_process"))
             {
-                return false;
+                foreach (var process in searcher.Get())
+                {
+                    int processId = Convert.ToInt32(process.Properties["processid"].Value);
+                    int parentId = Convert.ToInt32(process.Properties["parentprocessid"].Value);
+
+                    if (!result.ContainsKey(parentId))
+                    {
+                        result.Add(parentId, new List<int>());
+                    }
+
+                    result[parentId].Add(processId);
+                }
             }
 
-            return true;
+            return result;
         }
 
         /// <summary>
@@ -147,8 +199,7 @@ namespace UWPHook
             const int SW_SHOWDEFAULT = 10;
             */
 
-            var me = Process.GetCurrentProcess();
+            var arrProcesses = Process.GetProcessById(runningProcessId);
-            var arrProcesses = Process.GetProcessById(id);
 
             // get the window handle
             IntPtr hWnd = arrProcesses.MainWindowHandle;

UWPHook/UWPHook.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -83,6 +83,7 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.PowerShell.5.ReferenceAssemblies.1.1.0\lib\net4\System.Management.Automation.dll</HintPath>
       <Private>True</Private>