Improve client injection speed & cleanup settings page.

Author: Aetopia

src/Flarial.Launcher.Runtime/Client/FlarialClient.cs

@@ -6,58 +6,45 @@
 using Flarial.Launcher.Runtime.Game;
 using Flarial.Launcher.Runtime.Modding;
 using Flarial.Launcher.Runtime.Services;
-using Flarial.Launcher.Runtime.System;
 using static System.StringComparison;
 
 namespace Flarial.Launcher.Runtime.Client;
 
 sealed class FlarialClientRelease : FlarialClient
 {
-    protected override string Build => nameof(Release);
-    protected override string FileName => $"Flarial.Client.{nameof(Release)}.dll";
-    protected override string Identifer => "34F45015-6EB6-4213-ABEF-F2967818E628";
+    protected override string Build => "Release";
+    protected override string WindowClass => "Flarial Client";
+    protected override string FileName => "Flarial.Client.Release.dll";
     protected override string DownloadUri => "https://cdn.flarial.xyz/dll/latest.dll";
 }
 
 public abstract class FlarialClient
 {
     internal FlarialClient() { }
+
+    public static FlarialClient Current { get; } = new FlarialClientRelease();
     static readonly JsonService<Dictionary<string, string>> s_json = JsonService<Dictionary<string, string>>.GetJson();
 
     protected abstract string Build { get; }
     protected abstract string FileName { get; }
-    protected abstract string Identifer { get; }
     protected abstract string DownloadUri { get; }
+    protected abstract string WindowClass { get; }
 
-    public static readonly FlarialClient Release = new FlarialClientRelease();
-
-    static FlarialClient? Current
-    {
-        get
-        {
-            if (!Minecraft.Current.IsRunning) return null;
-            using NativeMutex release = new(Release.Identifer);
-            return release.Exists ? Release : null;
-        }
-    }
-
-    public bool Launch(bool? initialized)
+    public bool Launch()
     {
-        if (Current is { } client)
+        if (Minecraft.GetWindow(WindowClass) is { } client)
         {
-            if (!ReferenceEquals(this, client)) return false;
-            return Minecraft.Current.Launch(null) is { };
-        }
-
-        if (Injector.Launch(initialized, new(FileName)) is not { } processId)
+            if (Minecraft.Current.GetWindow(client._processId) is { } minecraft)
+            {
+                minecraft.SwitchWindow();
+                return true;
+            }
             return false;
-
-        using NativeMutex mutex = new(Identifer);
-        return mutex.Duplicate(processId);
+        }
+        return Injector.Launch(null, new(FileName)) is { };
     }
 
     static readonly object _lock = new();
-
     static readonly HashAlgorithm _algorithm = SHA256.Create();
 
     const string HashesUrl = "https://cdn.flarial.xyz/dll_hashes.json";

src/Flarial.Launcher.Runtime/Game/Minecraft.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.InteropServices;
 using Flarial.Launcher.Runtime.Services;
 using Flarial.Launcher.Runtime.System;
@@ -25,7 +26,9 @@ internal Minecraft() { }
     public static Minecraft Current { get; } = new MinecraftGDK();
     public static string PackageFamilyName { get; } = "Microsoft.MinecraftUWP_8wekyb3d8bbwe";
 
+    [Obsolete("", true)]
     internal bool IsRunning => GetWindow() is { };
+
     internal static Package Package => PackageService.GetPackage(PackageFamilyName)!;
     internal static string Version { get { var _ = Package.Id.Version; return $"{_.Major}.{_.Minor}.{_.Build / 100}"; } }
 
@@ -38,7 +41,7 @@ internal Minecraft() { }
     */
 
     private protected uint? GetProcessId() => GetProcessId(ProcessName);
-    private protected NativeWindow? GetWindow([Optional] uint? processId) => GetWindow(WindowClass, processId);
+    internal NativeWindow? GetWindow([Optional] uint? processId) => GetWindow(WindowClass, processId);
 
     public static bool IsInstalled => Package is { };
     public static bool IsPackaged => Package.SignatureKind is PackageSignatureKind.Store;
@@ -75,7 +78,7 @@ internal Minecraft() { }
         }
     }
 
-    static NativeWindow? GetWindow(string windowClass, [Optional] uint? processId)
+    internal static NativeWindow? GetWindow(string windowClass, [Optional] uint? processId)
     {
         fixed (char* wc = windowClass)
         fixed (char* pfn = PackageFamilyName)
@@ -86,10 +89,10 @@ internal Minecraft() { }
 
             while ((window = FindWindowEx(HWND.Null, window, wc, null)) != HWND.Null)
             {
-                if (processId is { } && processId != window.ProcessId)
+                if (processId is { } && processId != window._processId)
                     continue;
 
-                if (Open(PROCESS_QUERY_LIMITED_INFORMATION, window.ProcessId) is not { } process)
+                if (Open(PROCESS_QUERY_LIMITED_INFORMATION, window._processId) is not { } process)
                     continue;
 
                 using (process)

src/Flarial.Launcher.Runtime/Game/MinecraftGDK.cs

@@ -5,6 +5,7 @@
 using System.Management.Automation.Runspaces;
 using System.Threading;
 using Flarial.Launcher.Runtime.Services;
+using Flarial.Launcher.Runtime.System;
 using Windows.ApplicationModel;
 using Windows.Win32.Foundation;
 using static System.Environment;
@@ -69,10 +70,10 @@ static MinecraftGDK()
         if (!IsGamingServicesInstalled)
             throw new Win32Exception((int)ERROR_INSTALL_PREREQUISITE_FAILED);
 
-        if (GetWindow() is { } @_ && _.IsVisible)
+        if (GetWindow() is { } foundWindow && foundWindow.IsVisible)
         {
-            _.Switch();
-            return _.ProcessId;
+            foundWindow.SwitchWindow();
+            return foundWindow._processId;
         }
 
         if (Activate() is not { } processId)
@@ -91,14 +92,16 @@ static MinecraftGDK()
 
             if (initialized is null || !IsPackaged)
             {
+                NativeWindow? processWindow = null;
+
                 while (process.Wait(1))
-                {
-                    if (GetWindow(processId) is not { } window)
-                        continue;
+                    if ((processWindow = GetWindow()) is { })
+                        break;
 
-                    if (window.IsVisible)
+                while (process.Wait(1))
+                    if (processWindow?.IsVisible ?? false)
                         return processId;
-                }
+
                 return null;
             }
 

src/Flarial.Launcher.Runtime/System/NativeMutex.cs

@@ -1,17 +1,26 @@
+using System;
 using System.Runtime.InteropServices;
 using Windows.Win32.Foundation;
 using static Windows.Win32.PInvoke;
 
 namespace Flarial.Launcher.Runtime.System;
 
-unsafe readonly struct NativeWindow(HWND handle)
+unsafe readonly struct NativeWindow
 {
-    readonly HWND _handle = handle;
+    readonly HWND _handle;
+    internal readonly uint _processId;
 
-    internal void Switch() => SwitchToThisWindow(_handle, true);
+    internal NativeWindow(HWND handle)
+    {
+        uint processId = 0;
+        GetWindowThreadProcessId(handle, &processId);
+
+        _handle = handle;
+        _processId = processId;
+    }
 
     internal bool IsVisible => IsWindowVisible(_handle);
-    internal uint ProcessId { get { uint _; GetWindowThreadProcessId(_handle, &_); return _; } }
+    internal void SwitchWindow() => SwitchToThisWindow(_handle, true);
 
     public static implicit operator NativeWindow(in HWND hwnd) => new(hwnd);
     public static implicit operator HWND(in NativeWindow window) => window._handle;

src/Flarial.Launcher.Runtime/System/NativeWindow.cs

@@ -7,73 +7,49 @@ namespace Flarial.Launcher.Controls;
 
 sealed class DllSelectionBox : Grid
 {
+    readonly CustomDllButton _button;
     readonly ApplicationSettings _settings;
 
-    readonly ListBox _listBox = new()
+    readonly ToggleSwitch _toggleSwitch = new()
     {
+        Header = "Should the launcher use a custom DLL?",
         VerticalAlignment = VerticalAlignment.Stretch,
-        HorizontalAlignment = HorizontalAlignment.Stretch
+        HorizontalAlignment = HorizontalAlignment.Stretch,
+        OnContent = "Yes, use a custom DLL.",
+        OffContent = "No, use the client's DLL."
     };
 
-    readonly CustomDllButton _button;
-
-    void OnListBoxSelectionChanged(object sender, RoutedEventArgs args)
+    void OnToggleSwitchToggled(object sender, RoutedEventArgs args)
     {
-        var listBox = (ListBox)sender;
+        var value = ((ToggleSwitch)sender).IsOn;
 
-        var item = (ContentItem<DllSelection>)listBox.SelectedItem;
-        _settings.DllSelection = item.Value;
+        _button._button.IsEnabled = value;
+        _button._textBox.IsEnabled = value;
 
-        var enabled = item.Value is DllSelection.Custom;
-        _button._button.IsEnabled = enabled;
-        _button._textBox.IsEnabled = enabled;
+        _settings.UseCustomDll = value;
     }
 
     internal DllSelectionBox(ApplicationSettings settings)
     {
         _settings = settings;
-        _button = new(_settings);
+        _button = new(settings);
+
+        RowSpacing = 12;
+        ColumnSpacing = 12;
 
         RowDefinitions.Add(new());
         RowDefinitions.Add(new() { Height = GridLength.Auto });
 
-        SetRow(_listBox, 0);
-        SetColumn(_listBox, 0);
+        SetRow(_toggleSwitch, 0);
+        SetColumn(_toggleSwitch, 0);
 
         SetRow(_button, 1);
         SetColumn(_button, 0);
 
-        Children.Add(_listBox);
+        Children.Add(_toggleSwitch);
         Children.Add(_button);
 
-        _listBox.Items.Add(new ClientDll());
-        _listBox.Items.Add(new CustomDll());
-
-        _listBox.SelectionChanged += OnListBoxSelectionChanged;
-
-        _listBox.SetValue(VirtualizingStackPanel.IsVirtualizingProperty, true);
-        VirtualizingStackPanel.SetVirtualizationMode(_listBox, VirtualizationMode.Recycling);
-
-        _listBox.SelectedIndex = (int)_settings.DllSelection;
-    }
-
-    [Obsolete("", true)]
-    abstract class DllItem
-    {
-        protected abstract string String { get; }
-        public override string ToString() => String;
-        internal abstract DllSelection Value { get; }
-    }
-
-    sealed class ClientDll : ContentItem<DllSelection>
-    {
-        protected override string String => "Use the client's DLL with the game.";
-        internal override DllSelection Value => DllSelection.Client;
-    }
-
-    sealed class CustomDll : ContentItem<DllSelection>
-    {
-        protected override string String => "Use a specified custom DLL with the game.";
-        internal override DllSelection Value => DllSelection.Custom;
+        _toggleSwitch.Toggled += OnToggleSwitchToggled;
+        _toggleSwitch.IsOn = _settings.UseCustomDll;
     }
 }