Disable WIP inject by command line flag

mcoot · mcoot · commit b2136298e0c2 · 2019-08-17T17:12:41.000+10:00
diff --git 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
@@ -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
@@ -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
@@ -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" />

Original file line number	Diff line number	Diff line change
`@@ -111,20 +111,23 @@ public OnProcessStatusEventArgs(string processName, int processId)`
`111`	`111`	`private class ProcessTarget`
`112`	`112`	`{`
`113`	`113`	`private bool TargetById { get; }`
	`114`	`+ private bool MatchHostXArg { get; }`
`114`	`115`	`private string TargetName { get; }`
`115`	`116`	`private int TargetId { get; }`
`116`	`117`
`117`	`118`
`118`		`- public ProcessTarget(int processId)`
	`119`	`+ public ProcessTarget(int processId, bool matchHostXArg)`
`119`	`120`	`{`
`120`	`121`	`TargetById = true;`
	`122`	`+ MatchHostXArg = matchHostXArg;`
`121`	`123`	`TargetId = processId;`
`122`	`124`	`TargetName = null;`
`123`	`125`	`}`
`124`	`126`
`125`		`- public ProcessTarget(string processName)`
	`127`	`+ public ProcessTarget(string processName, bool matchHostXArg)`
`126`	`128`	`{`
`127`	`129`	`TargetById = false;`
	`130`	`+ MatchHostXArg = matchHostXArg;`
`128`	`131`	`TargetId = 0;`
`129`	`132`	`TargetName = processName;`
`130`	`133`	`}`
`@@ -144,9 +147,39 @@ public Process FindTargetProcess()`
`144`	`147`	`} else`
`145`	`148`	`{`
`146`	`149`	`var procs = Process.GetProcessesByName(TargetName);`
`147`		`- return procs.Length > 0 ? procs[0] : null;`
	`150`	`+ if (procs.Length == 0) return null;`
	`151`	`+`
	`152`	`+ if (MatchHostXArg)`
	`153`	`+ {`
	`154`	`+ // Find an arg matching the string "hostx"`
	`155`	`+ // i.e. a client, not a server`
	`156`	`+ return GetProcessWithMatchingCommandLine(procs, TargetName, "-hostx=");`
	`157`	`+ } else`
	`158`	`+ {`
	`159`	`+ return procs[0];`
	`160`	`+ }`
`148`	`161`	`}`
`149`	`162`	`}`
	`163`	`+`
	`164`	`+ private Process GetProcessWithMatchingCommandLine(IEnumerable<Process> processes, string procName, string needle)`
	`165`	`+ {`
	`166`	`+ string wmiQuery = $"select ProcessId, CommandLine from Win32_Process where Name='{procName}'";`
	`167`	`+ System.Management.ManagementObjectSearcher searcher = new System.Management.ManagementObjectSearcher(wmiQuery);`
	`168`	`+ System.Management.ManagementObjectCollection ret = searcher.Get();`
	`169`	`+ foreach (System.Management.ManagementObject obj in ret)`
	`170`	`+ {`
	`171`	`+ if (obj is null \|\| obj["CommandLine"] is null) continue;`
	`172`	`+ string args = obj["CommandLine"].ToString();`
	`173`	`+ if (args.IndexOf(needle) != -1)`
	`174`	`+ {`
	`175`	`+ // Find the actual process corresponding...`
	`176`	`+ int procId = (int)obj["ProcessId"];`
	`177`	`+ return processes.Where((p) => p.Id == procId).DefaultIfEmpty(null).First();`
	`178`	`+ }`
	`179`	`+ }`
	`180`	`+`
	`181`	`+ return null;`
	`182`	`+ }`
`150`	`183`	`}`
`151`	`184`
`152`	`185`	`private ProcessTarget Target { get; set; }`
`@@ -197,14 +230,14 @@ private void PollingTimer_Tick(object sender, ElapsedEventArgs e)`
`197`	`230`	`}`
`198`	`231`	`}`
`199`	`232`
`200`		`- public void SetTarget(string processName)`
	`233`	`+ public void SetTarget(string processName, bool matchHostXArg)`
`201`	`234`	`{`
`202`		`- Target = new ProcessTarget(processName);`
	`235`	`+ Target = new ProcessTarget(processName, matchHostXArg);`
`203`	`236`	`}`
`204`	`237`
`205`		`- public void SetTarget(int processId)`
	`238`	`+ public void SetTarget(int processId, bool matchHostXArg)`
`206`	`239`	`{`
`207`		`- Target = new ProcessTarget(processId);`
	`240`	`+ Target = new ProcessTarget(processId, matchHostXArg);`
`208`	`241`	`}`
`209`	`242`
`210`	`243`	`public void UnsetTarget()`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ private void LaunchGame()`
`156`	`156`	`// Set up polling for process start if we're doing it by ID`
`157`	`157`	`if (config.Injection.ProcessDetectionMode == ProcessDetectionMode.ProcessId)`
`158`	`158`	`{`
`159`		`- TALauncher.SetTarget(lastLaunchedProcessId);`
	`159`	`+ TALauncher.SetTarget(lastLaunchedProcessId, false);`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`@@ -355,14 +355,16 @@ private void MainAppWindow_Loaded(object sender, RoutedEventArgs e)`
`355`	`355`	`MessageBox.Show("Failed to read launcher configuration: " + ex.Message, "Configuration Error", MessageBoxButton.OK, MessageBoxImage.Error);`
`356`	`356`	`}`
`357`	`357`	`}`
`358`		`- if (((Config)DataContext).Injection.Mode == InjectMode.Automatic)`
	`358`	`+ Config config = (Config)DataContext;`
	`359`	`+`
	`360`	`+ if (config.Injection.Mode == InjectMode.Automatic)`
`359`	`361`	`{`
`360`	`362`	`InjectionModeAutoRadio.IsChecked = true;`
`361`	`363`	`} else`
`362`	`364`	`{`
`363`	`365`	`InjectionModeManualRadio.IsChecked = true;`
`364`	`366`	`}`
`365`		`- switch (((Config)DataContext).Injection.ProcessDetectionMode)`
	`367`	`+ switch (config.Injection.ProcessDetectionMode)`
`366`	`368`	`{`
`367`	`369`	`case ProcessDetectionMode.ProcessName:`
`368`	`370`	`ProcessDetectionModeProcessNameRadio.IsChecked = true;`
`@@ -381,16 +383,17 @@ private void MainAppWindow_Loaded(object sender, RoutedEventArgs e)`
`381`	`383`	`// Download news`
`382`	`384`	`try`
`383`	`385`	`{`
`384`		`- TAModsNews.DownloadNews($"{((Config)DataContext).UpdateUrl}/news.json");`
	`386`	`+ TAModsNews.DownloadNews($"{config.UpdateUrl}/news.json");`
`385`	`387`	`} catch (Exception ex)`
`386`	`388`	`{`
`387`	`389`	`MessageBox.Show("Failed to download server information: " + ex.Message, "News Download Error", MessageBoxButton.OK, MessageBoxImage.Error);`
`388`	`390`	`}`
`389`	`391`
`390`	`392`	`// Set up polling for game process if we're doing it by name`
`391`		`- if (((Config)DataContext).Injection.ProcessDetectionMode != ProcessDetectionMode.ProcessId)`
	`393`	`+ if (config.Injection.ProcessDetectionMode != ProcessDetectionMode.ProcessId)`
`392`	`394`	`{`
`393`		`- TALauncher.SetTarget(((Config)DataContext).Injection.RunningProcessName);`
	`395`	`+ MessageBox.Show($"aaa = {config.Injection.ProcessDetectionMode == ProcessDetectionMode.CommandLineString}");`
	`396`	`+ TALauncher.SetTarget(config.Injection.RunningProcessName, config.Injection.ProcessDetectionMode == ProcessDetectionMode.CommandLineString);`
`394`	`397`	`}`
`395`	`398`
`396`	`399`	`// Prompt to update if need be`
`@@ -420,7 +423,7 @@ private void MainAppWindow_Loaded(object sender, RoutedEventArgs e)`
`420`	`423`	`}`
`421`	`424`
`422`	`425`	`// Prompt to set up Ubermenu if need be`
`423`		`- if (((Config)DataContext).PromptForUbermenu && !TAModsUpdater.ConfigUsesUbermenu())`
	`426`	`+ if (config.PromptForUbermenu && !TAModsUpdater.ConfigUsesUbermenu())`
`424`	`427`	`{`
`425`	`428`	`var doSetUp = MessageBox.Show(`
`426`	`429`	`"You have not configured Ubermenu, which allows you to configure TAMods in-game by pressing F1. Do you want to set it up now?",`