From b2136298e0c29ac6146adfaf56427147ecec2eab Mon Sep 17 00:00:00 2001
From: JosephSpearritt <joe.spearritt@live.com>
Date: Sat, 17 Aug 2019 17:12:41 +1000
Subject: [PATCH] Disable WIP inject by command line flag

---
 InjectorLauncher.cs        | 47 ++++++++++++++++++++++++++++++++------
 MainWindow.xaml            |  8 +++----
 MainWindow.xaml.cs         | 17 ++++++++------
 TribesLauncherSharp.csproj |  1 +
 4 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/InjectorLauncher.cs b/InjectorLauncher.cs
index 4744e9c..52e2275 100644
--- a/InjectorLauncher.cs
+++ b/InjectorLauncher.cs
@@ -111,20 +111,23 @@ public OnProcessStatusEventArgs(string processName, int processId)
         private class ProcessTarget
         {
             private bool TargetById { get; }
+            private bool MatchHostXArg { get; }
             private string TargetName { get; }
             private int TargetId { get; }
 
 
-            public ProcessTarget(int processId)
+            public ProcessTarget(int processId, bool matchHostXArg)
             {
                 TargetById = true;
+                MatchHostXArg = matchHostXArg;
                 TargetId = processId;
                 TargetName = null;
             }
 
-            public ProcessTarget(string processName)
+            public ProcessTarget(string processName, bool matchHostXArg)
             {
                 TargetById = false;
+                MatchHostXArg = matchHostXArg;
                 TargetId = 0;
                 TargetName = processName;
             }
@@ -144,9 +147,39 @@ public Process FindTargetProcess()
                 } else
                 {
                     var procs = Process.GetProcessesByName(TargetName);
-                    return procs.Length > 0 ? procs[0] : null;
+                    if (procs.Length == 0) return null;
+                    
+                    if (MatchHostXArg)
+                    {
+                        // Find an arg matching the string "hostx"
+                        // i.e. a client, not a server
+                        return GetProcessWithMatchingCommandLine(procs, TargetName, "-hostx=");
+                    } else
+                    {
+                        return procs[0];
+                    }
                 }
             }
+
+            private Process GetProcessWithMatchingCommandLine(IEnumerable<Process> processes, string procName, string needle)
+            {
+                string wmiQuery = $"select ProcessId, CommandLine from Win32_Process where Name='{procName}'";
+                System.Management.ManagementObjectSearcher searcher = new System.Management.ManagementObjectSearcher(wmiQuery);
+                System.Management.ManagementObjectCollection ret = searcher.Get();
+                foreach (System.Management.ManagementObject obj in ret)
+                {
+                    if (obj is null || obj["CommandLine"] is null) continue;
+                    string args = obj["CommandLine"].ToString();
+                    if (args.IndexOf(needle) != -1)
+                    {
+                        // Find the actual process corresponding...
+                        int procId = (int)obj["ProcessId"];
+                        return processes.Where((p) => p.Id == procId).DefaultIfEmpty(null).First();
+                    }
+                }
+
+                return null;
+            }
         }
 
         private ProcessTarget Target { get; set; }
@@ -197,14 +230,14 @@ private void PollingTimer_Tick(object sender, ElapsedEventArgs e)
             }
         }
 
-        public void SetTarget(string processName)
+        public void SetTarget(string processName, bool matchHostXArg)
         {
-            Target = new ProcessTarget(processName);
+            Target = new ProcessTarget(processName, matchHostXArg);
         }
 
-        public void SetTarget(int processId)
+        public void SetTarget(int processId, bool matchHostXArg)
         {
-            Target = new ProcessTarget(processId);
+            Target = new ProcessTarget(processId, matchHostXArg);
         }
 
         public void UnsetTarget()
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 4fd446a..968d7f5 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:System="clr-namespace:System;assembly=mscorlib"
         xmlns:local="clr-namespace:TribesLauncherSharp"
         mc:Ignorable="d"
-        Title="TribesLauncher" Height="352.533" Width="464.666" ResizeMode="CanMinimize" Loaded="MainAppWindow_Loaded" Closing="MainAppWindow_Closing" Icon="Resources/icon.ico">
+        Title="TribesLauncher" Height="358.933" Width="464.666" ResizeMode="CanMinimize" Loaded="MainAppWindow_Loaded" Closing="MainAppWindow_Closing" Icon="Resources/icon.ico">
     <Window.Resources>
         <ObjectDataProvider x:Key="enumLoginServerMode" MethodName="GetValues" ObjectType="{x:Type System:Enum}">
             <ObjectDataProvider.MethodParameters>
@@ -89,7 +89,7 @@
                         <StackPanel Margin="0,5,0,0">
                             <RadioButton x:Name="ProcessDetectionModeProcessNameRadio" Content="By Process Name" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="ProcessDetectionModeRadio" Checked="ProcessDetectionModeProcessNameRadio_Checked" />
                             <RadioButton x:Name="ProcessDetectionModeProcessIdRadio" Content="By Process ID" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="ProcessDetectionModeRadio" Checked="ProcessDetectionModeProcessIdRadio_Checked" Margin="0,3,0,0" />
-                            <RadioButton x:Name="ProcessDetectionModeCommandLineRadio" Content="By Command Line String" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="ProcessDetectionModeRadio" Checked="ProcessDetectionModeCommandLineRadio_Checked" Margin="0,3,0,0" />
+                            <RadioButton x:Name="ProcessDetectionModeCommandLineRadio" Content="By Command Line String" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="ProcessDetectionModeRadio" Checked="ProcessDetectionModeCommandLineRadio_Checked" Margin="0,3,0,0" Visibility="Hidden" />
                         </StackPanel>
                     </GroupBox>
                     <GroupBox Header="Extra Command Line Arguments" Height="57" Margin="10,185,10,0" VerticalAlignment="Top">
@@ -111,8 +111,8 @@
                 </Grid>
             </TabItem>
         </TabControl>
-        <Button x:Name="LauncherButton" Content="Launch" Margin="346,0,10.4,10" Click="LauncherButton_Click" Height="27" VerticalAlignment="Bottom"/>
-        <ProgressBar x:Name="UpdateProgressBar" HorizontalAlignment="Left" Margin="10,0,0,10" Width="331" Height="27" VerticalAlignment="Bottom"/>
+        <Button x:Name="LauncherButton" Content="Launch" Margin="346,0,10.4,9.6" Click="LauncherButton_Click" Height="27" VerticalAlignment="Bottom"/>
+        <ProgressBar x:Name="UpdateProgressBar" HorizontalAlignment="Left" Margin="10,0,0,9.6" Width="331" Height="27" VerticalAlignment="Bottom"/>
 
     </Grid>
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index e5ad836..650fc25 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -156,7 +156,7 @@ private void LaunchGame()
             // Set up polling for process start if we're doing it by ID
             if (config.Injection.ProcessDetectionMode == ProcessDetectionMode.ProcessId)
             {
-                TALauncher.SetTarget(lastLaunchedProcessId);
+                TALauncher.SetTarget(lastLaunchedProcessId, false);
             }
         }
 
@@ -355,14 +355,16 @@ private void MainAppWindow_Loaded(object sender, RoutedEventArgs e)
                     MessageBox.Show("Failed to read launcher configuration: " + ex.Message, "Configuration Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
-            if (((Config)DataContext).Injection.Mode == InjectMode.Automatic)
+            Config config = (Config)DataContext;
+
+            if (config.Injection.Mode == InjectMode.Automatic)
             {
                 InjectionModeAutoRadio.IsChecked = true;
             } else
             {
                 InjectionModeManualRadio.IsChecked = true;
             }
-            switch (((Config)DataContext).Injection.ProcessDetectionMode)
+            switch (config.Injection.ProcessDetectionMode)
             {
                 case ProcessDetectionMode.ProcessName:
                     ProcessDetectionModeProcessNameRadio.IsChecked = true;
@@ -381,16 +383,17 @@ private void MainAppWindow_Loaded(object sender, RoutedEventArgs e)
             // Download news
             try
             {
-                TAModsNews.DownloadNews($"{((Config)DataContext).UpdateUrl}/news.json");
+                TAModsNews.DownloadNews($"{config.UpdateUrl}/news.json");
             } catch (Exception ex)
             {
                 MessageBox.Show("Failed to download server information: " + ex.Message, "News Download Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
 
             // Set up polling for game process if we're doing it by name
-            if (((Config)DataContext).Injection.ProcessDetectionMode != ProcessDetectionMode.ProcessId)
+            if (config.Injection.ProcessDetectionMode != ProcessDetectionMode.ProcessId)
             {
-                TALauncher.SetTarget(((Config)DataContext).Injection.RunningProcessName);
+                MessageBox.Show($"aaa = {config.Injection.ProcessDetectionMode == ProcessDetectionMode.CommandLineString}");
+                TALauncher.SetTarget(config.Injection.RunningProcessName, config.Injection.ProcessDetectionMode == ProcessDetectionMode.CommandLineString);
             }
 
             // Prompt to update if need be
@@ -420,7 +423,7 @@ private void MainAppWindow_Loaded(object sender, RoutedEventArgs e)
             }
 
             // Prompt to set up Ubermenu if need be
-            if (((Config)DataContext).PromptForUbermenu && !TAModsUpdater.ConfigUsesUbermenu())
+            if (config.PromptForUbermenu && !TAModsUpdater.ConfigUsesUbermenu())
             {
                 var doSetUp = MessageBox.Show(
                     "You have not configured Ubermenu, which allows you to configure TAMods in-game by pressing F1. Do you want to set it up now?", 
diff --git a/TribesLauncherSharp.csproj b/TribesLauncherSharp.csproj
index 68f68b5..f1526e7 100644
--- a/TribesLauncherSharp.csproj
+++ b/TribesLauncherSharp.csproj
@@ -63,6 +63,7 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />