Update Machina for Oodle handling

Author: karashiiro

.gitignore

@@ -351,4 +351,6 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
-/SDK/
+/SDK/
+
+.idea/

UniversalisCommon/UniversalisCommon.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
-		<Version>1.3.0.0</Version>
+		<Version>1.3.1.0</Version>
 		<LangVersion>8.0</LangVersion>
 		<Company>Universalis</Company>
 		<Authors>Universalis</Authors>

UniversalisPlugin/UniversalisPlugin.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
-		<Version>1.3.0.0</Version>
+		<Version>1.3.1.0</Version>
 		<ApplicationIcon>dalamud_icon.ico</ApplicationIcon>
 		<Company>goatsoft</Company>
 		<Authors>Universalis</Authors>
@@ -23,8 +23,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Costura.Fody" Version="4.1.0" />
-		<PackageReference Include="Machina" Version="2.3.0.7" />
-		<PackageReference Include="Machina.FFXIV" Version="2.3.2.4" />
+		<PackageReference Include="Machina.FFXIV" Version="2.3.3.9" />
 	</ItemGroup>
 
 	<ItemGroup>

UniversalisStandaloneUploader/UniversalisStandaloneUploader.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net48</TargetFramework>
-		<Version>1.3.0.0</Version>
+		<Version>1.3.1.0</Version>
 		<LangVersion>9.0</LangVersion>
 		<ApplicationIcon>dalamud_icon.ico</ApplicationIcon>
 		<StartupObject>UniversalisStandaloneUploader.Program</StartupObject>
@@ -19,8 +19,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Costura.Fody" Version="4.1.0" />
-		<PackageReference Include="Machina" Version="2.3.0.7" />
-		<PackageReference Include="Machina.FFXIV" Version="2.3.2.4" />
+		<PackageReference Include="Machina.FFXIV" Version="2.3.3.9" />
 	</ItemGroup>
 
 	<ItemGroup>

UniversalisStandaloneUploader/UploaderForm.cs

@@ -1,6 +1,8 @@
 using Machina.FFXIV;
 using Machina.Infrastructure;
 using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using UniversalisCommon;
 using UniversalisStandaloneUploader.Properties;
@@ -146,6 +148,12 @@ private void InitializeNetworkMonitor()
 
             if (winPCapCheckBox.Checked)
                 _ffxivNetworkMonitor.MonitorType = NetworkMonitorType.WinPCap;
+            
+            var window = FindWindow("FFXIVGAME", null);
+            GetWindowThreadProcessId(window, out var pid);
+            var proc = Process.GetProcessById(Convert.ToInt32(pid));
+            var gamePath = proc.MainModule?.FileName;
+            _ffxivNetworkMonitor.FFXIVDX11ExecutablePath = gamePath;
 
             _ffxivNetworkMonitor.Start();
         }
@@ -186,5 +194,11 @@ private void WinPCapCheckBox_CheckedChanged(object sender, EventArgs e)
                 Log($"[ERROR] Could not re-initialize network monitor:\n{ex}");
             }
         }
+        
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+        
+        [DllImport("user32.dll", SetLastError=true)]
+        private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
     }
 }