0.11.0

note: even if this raises binary size by a significant amount, it should in theory be more reliable, so it is a worthy sacrifice.

.github/workflows/release-on-tag.yml

@@ -0,0 +1,31 @@
+name: Create release for pushed tag
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  release-on-tag:
+    runs-on: windows-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v5
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Create release
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: ${{ github.ref_name }}
+        run: |
+          if gh release view "$TAG" >/dev/null 2>&1; then
+            echo "A release already exists for $TAG, skipping"
+          else
+            cargo build --release
+            prev_tag=$(gh release list --limit 100 --json tagName --jq '.[0].tagName')
+            notes="**Full Changelog**: https://github.com/${{ github.repository }}/compare/${prev_tag}...${TAG}"
+            gh release create "$TAG" target/release/gta-tools.exe \
+              --title "$TAG" \
+              --notes "$notes"
+          fi

.github/workflows/release-retroactively.yml

@@ -0,0 +1,43 @@
+name: Create releases for existing tags
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release-retroactively:
+    runs-on: windows-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Get tags and create release for each
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          mapfile -t tags < <(git tag -l)
+          echo "${#tags[@]} tags found."
+          prev_tag=""
+          for tag in "${tags[@]}"; do
+            if gh release view "$tag" >/dev/null 2>&1; then
+              echo "A release already exists for $tag, skipping"
+            else
+              echo "Proceeding with tag $tag"
+              git checkout "$tag"
+              cargo build --release
+              if [ -n "$prev_tag" ]; then
+                notes="**Full Changelog**: https://github.com/${{ github.repository }}/compare/${prev_tag}...${tag}"
+              else
+                notes="**Full Changelog**: https://github.com/${{ github.repository }}/commits/${tag}"
+              fi
+              gh release create "$tag" target/release/gta-tools.exe \
+                --title "$tag" \
+                --notes "$notes"
+            fi
+            prev_tag="$tag"
+          done

.gitignore

@@ -1,2 +1,3 @@
 /target
 .vscode
+.idea

Cargo.toml

@@ -1,39 +1,42 @@
 [package]
 name = "gta-tools"
-version = "0.5.0"
+version = "0.11.0"
 edition = "2024"
+license = "Apache-2.0"
+authors = ["futile <git@futile.eu>"]
+description = "A toolset of convenient things for GTA V Online."
 
 [dependencies]
-catppuccin-egui = { version = "5.5.0", default-features = false, features = [
-    "egui31",
+catppuccin-egui = { version = "5.6.0", default-features = false, features = [
+    "egui32",
 ] }
-chrono = "0.4.40"
-dirs = "6.0.0"
-eframe = "0.31.1"
-egui_extras = { version = "0.31.1", features = ["image", "svg"] }
-image = { version = "0.25.6", default-features = false, features = ["png"] }
+eframe = { version = "0.32.2", default-features = false, features = [
+    "glow",
+    "default_fonts",
+] }
+egui_extras = { version = "0.32.2", default-features = false, features = [
+    "image",
+    "svg",
+] }
+humantime = "2.3.0"
+image = { version = "0.25.8", default-features = false, features = ["png"] }
+log = "0.4.28"
 open = "5.3.2"
-semver = "1.0.26"
 serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.140"
-strum = { version = "0.27.1", features = ["derive"] }
-sysinfo = { git = "https://github.com/GuillaumeGomez/sysinfo", rev = "bcbb7b2b389b8800ff457773f48b130e710458fc" }
-ureq = { version = "3.0.11", features = ["json"] }
-windows = { version = "0.61.1", features = [
-    "Win32_UI_Input_KeyboardAndMouse",
+serde_json = "1.0.143"
+strum = { version = "0.27.2", features = ["derive"] }
+windows = { version = "0.62.0", features = [
+    "Win32_NetworkManagement_WindowsFirewall",
+    "Win32_Security",
+    "Win32_System_Com",
+    "Win32_System_Diagnostics_ToolHelp",
     "Win32_System_Threading",
+    "Win32_UI_Input_KeyboardAndMouse",
     "Win32_UI_Shell",
     "Win32_UI_WindowsAndMessaging",
-    "Win32_Security",
-    "Win32_NetworkManagement_WindowsFirewall",
 ] }
 winreg = "0.55.0"
 
 [build-dependencies]
 static_vcruntime = "2.0.0"
-winresource = "0.1.20"
-
-[profile.release]
-strip = true
-lto = true
-codegen-units = 1
+tauri-winres = "0.3.3"

README.md

@@ -1,4 +1,69 @@
 # GTA Tools
-A toolset of convenient things for GTA 5 Online.
 
-![](https://i.vgy.me/hbOUEa.png)
+A toolset of convenient things for GTA V Online.
+
+<picture>
+    <source srcset="https://i.vgy.me/xt8EfK.png" media="(prefers-color-scheme: dark)">
+    <img src="https://i.vgy.me/lYlZnd.png">
+</picture>
+
+## Installing
+
+**Option 1** — <ins>Download</ins>  
+Download the latest release [here](https://github.com/elituf/gta-tools/releases/latest/download/gta-tools.exe) and place it somewhere convenient for you, such as Documents. You could then make a shortcut titled "GTA Tools", and pin it to taskbar or Start.
+
+**Option 2** — <ins>Build from source</ins>  
+You will need Rust, which you can get [here](https://rustup.rs). Then, clone this repo and navigate to it. At this point, you should probably `git checkout x.x.x`, where `x.x.x` is the latest tag. You can then run `cargo build --release`. Once you do that, you can use the binary located at `.\target\release\gta-tools.exe` in the same way as **Option 1**.
+
+It is recommended to always use an up-to-date version of GTA Tools from [releases](https://github.com/elituf/gta-tools/releases). You can also easily access this repository by going to the <kbd>About</kbd> page of GTA Tools and clicking the GitHub button beside the version number.
+
+## Guide
+
+Every feature of GTA Tools is Legacy/Enhanced-agnostic. Some functionality of GTA Tools requires administrator access. If necessary, GTA Tools can either be started as admin manually, or, the user can simply use the <kbd>Elevate</kbd> button to relaunch GTA Tools as admin.
+
+#### Game
+
+This section is quite simple.
+
+There is a <kbd>Launch</kbd> feature, which will start your game on the chosen launcher and game version.
+
+There is also a <kbd>Force close game</kbd> feature, which simply kills all game processes. This button requires a second press after the first one for confirmation. This *does not* touch Rockstar Games Launcher or any other processes, only ones named `GTA5_Enhanced.exe` or `GTA5.exe`.
+
+#### Session
+
+This section also has two features.
+
+The first being <kbd>Empty current session</kbd>, which "removes everyone" from your session by suspending your game for 10 seconds, and then resuming it. This method is exceedingly similar to the Resource Monitor method, but made convenient in one button. This can be useful in numerous ways:
+* You are stuck loading into a session
+* You are stuck loading into an interior
+* You are about to get griefed while doing a freemode mission
+* You want to quickly get a "new" session
+
+The other feature is <kbd>Anti AFK</kbd>, which, when toggled, prevents you from getting kicked for idling by pressing keys on your keyboard every 60 seconds. At present, those keys are `VK_NUMPAD4` & `VK_NUMPAD6`, due to being a relatively good balance of keys that the game actually registers but don't interrupt gameplay too much if they activate while you're playing. You *must* be tabbed into GTA V for <kbd>Anti AFK</kbd> to work. While toggled, <kbd>Anti AFK</kbd> will only activate when all of the following conditions are true:
+* The `Grand Theft Auto V` window is currently focused
+* None of the designated keys are currently being pressed[^1]
+* The mouse cursor is not currently visible[^2]
+
+#### Network
+
+The last section has a single feature, <kbd>Game's network access</kbd>, with two buttons, <kbd>Block</kbd> and <kbd>Unblock</kbd>, and a coloured indicator dot. This feature requires administrator, and blocks/unblocks GTA V's entire internet access using the Windows Firewall. The coloured indicator dot has these meanings:
+* **Green** - the game is connected to the internet
+* **Yellow** - the game could not be found running, and thus was not blocked
+* **Red** - the game is blocked from the internet
+
+This feature is primarily useful for **replay glitching**, which is an exploit that allows you to complete any heist/mission finale, get the money for it, and then be able to do it again right away. Here's how you can do a replay glitch:
+1. Get to the finale of a heist/contract/mission series, such as **The Contract: Dr. Dre**
+2. Complete the finale as normal
+3. Right *after* the **HEIST/MISSION PASSED** screen you get when you complete a finale (basically, when your cut is being shown), <kbd>Block</kbd> the game's internet access
+4. After a few seconds, you will be shown an error screen and kicked to the main menu
+5. At this point, <kbd>Unblock</kbd> the game's internet access and load back into online
+6. Finally, spend any amount of money, and you should receive the finale cut, but also be able to go play the finale again immediately
+
+## Issues
+
+- It is possible that when not elevated (administrator), the <kbd>Force close game</kbd> and <kbd>Empty current session</kbd> features can fail due to being denied access to the game. This is not guaranteed to happen. If this does happen to you, I recommend always using GTA Tools in elevated mode. For convenience, you may check "Always start elevated" in the Settings tab.
+
+
+
+[^1]: Otherwise, if you are, for example, using those keys to fly a plane, <kbd>Anti AFK</kbd> activating could cancel the input.
+[^2]: Specifically, the Windows mouse cursor, not the in-game mouse cursor. This check is mostly used to prevent typing while you are in the Rockstar overlay.

TODO.md

@@ -0,0 +1,13 @@
+### <ins>todo</ins>
+
+- rewrite entire codebase
+- add global hotkeys
+
+### <ins>doing</ins>
+
+- better error reporting
+
+### <ins>done</ins>
+
+- change `is_system_theme_dark` to `is_system_theme_light`
+- fix weird changing colour on futile link in about

build.rs

@@ -1,7 +1,23 @@
 fn main() {
     static_vcruntime::metabuild();
-    winresource::WindowsResource::new()
+    tauri_winres::WindowsResource::new()
+        .set("FileDescription", "GTA Tools")
+        .set("ProductName", "GTA Tools")
+        .set("LegalCopyright", "futile <git@futile.eu>")
+        .set_language(0x0009)
         .set_icon("assets/icon.ico")
         .compile()
         .unwrap();
+    embed_latest_git_hash();
+}
+
+fn embed_latest_git_hash() {
+    let git_rev_parse = std::process::Command::new("git")
+        .args(["rev-parse", "--short=8", "HEAD"])
+        .output()
+        .unwrap();
+    let git_hash = String::from_utf8(git_rev_parse.stdout).unwrap();
+    println!("cargo::rustc-env=LATEST_GIT_COMMIT_HASH={git_hash}");
+    println!("cargo::rerun-if-changed=.git/refs/heads/main");
+    println!("cargo::rerun-if-changed=.git/HEAD");
 }

justfile

@@ -1,6 +0,0 @@
-set windows-shell := ["pwsh", "-NoLogo", "-NoProfileLoadTime", "-Command"]
-
-install:
-    cargo build --release
-    cp .\target\release\gta-tools.exe ~\.cargo\bin
-    cp .\target\release\gta-tools.exe ~\Documents

src/features/anti_afk.rs

@@ -1,8 +1,8 @@
 use crate::util::{self, consts::game::WINDOW_TITLE};
 use std::time::{Duration, Instant};
 use windows::Win32::UI::Input::KeyboardAndMouse::{
-    KEYBD_EVENT_FLAGS, MAP_VIRTUAL_KEY_TYPE, MapVirtualKeyW, VIRTUAL_KEY, VK_NUMPAD4, VK_NUMPAD6,
-    keybd_event,
+    INPUT, INPUT_KEYBOARD, KEYBD_EVENT_FLAGS, KEYBDINPUT, KEYEVENTF_KEYUP, MAPVK_VK_TO_VSC,
+    MapVirtualKeyW, SendInput, VIRTUAL_KEY, VK_NUMPAD4, VK_NUMPAD6,
 };
 
 const INTERVAL: Duration = Duration::from_secs(60);
@@ -40,26 +40,23 @@ impl AntiAfk {
 }
 
 fn send(vk_codes: &[VIRTUAL_KEY]) {
-    vk_codes.iter().for_each(|vk_code| unsafe {
-        keybd_event(
-            vk_code.0 as u8,
-            u8::try_from(MapVirtualKeyW(
-                u32::from(vk_code.0),
-                MAP_VIRTUAL_KEY_TYPE(0),
-            ))
-            .unwrap(),
-            KEYBD_EVENT_FLAGS(0),
-            0,
-        );
-        keybd_event(
-            vk_code.0 as u8,
-            u8::try_from(MapVirtualKeyW(
-                u32::from(vk_code.0),
-                MAP_VIRTUAL_KEY_TYPE(0),
-            ))
-            .unwrap(),
-            KEYBD_EVENT_FLAGS(2),
-            0,
-        );
-    });
+    let mut inputs = Vec::new();
+    for &vk_code in vk_codes {
+        let scan_code = unsafe { MapVirtualKeyW(u32::from(vk_code.0), MAPVK_VK_TO_VSC) } as u16;
+        for event in [KEYBD_EVENT_FLAGS(0), KEYEVENTF_KEYUP] {
+            let mut input = INPUT {
+                r#type: INPUT_KEYBOARD,
+                ..Default::default()
+            };
+            input.Anonymous.ki = KEYBDINPUT {
+                wVk: vk_code,
+                wScan: scan_code,
+                dwFlags: event,
+                time: 0,
+                dwExtraInfo: 0,
+            };
+            inputs.push(input);
+        }
+    }
+    unsafe { SendInput(&inputs, size_of::<INPUT>() as i32) };
 }

src/features/empty_session.rs

@@ -1,11 +1,11 @@
 use crate::util::{
     consts::game::{EXE_ENHANCED, EXE_LEGACY},
     countdown::Countdown,
+    system_info::SystemInfo,
 };
 use std::time::{Duration, Instant};
-use sysinfo::System;
 use windows::Win32::{
-    Foundation::{CloseHandle, HANDLE, NTSTATUS},
+    Foundation::{HANDLE, NTSTATUS},
     System::Threading::{OpenProcess, PROCESS_SUSPEND_RESUME},
 };
 
@@ -48,34 +48,33 @@ unsafe extern "system" {
     unsafe fn NtResumeProcess(ProcessHandle: HANDLE) -> NTSTATUS;
 }
 
-fn get_gta_pid(sysinfo: &mut System) -> u32 {
-    sysinfo.refresh_all();
-    if let Some((pid, _)) = sysinfo
+fn get_gta_pid(system_info: &mut SystemInfo) -> Option<u32> {
+    system_info.refresh();
+    system_info
         .processes()
         .iter()
-        .find(|(_, p)| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
-    {
-        return pid.as_u32();
-    }
-    u32::MAX
+        .find(|p| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
+        .map(|p| p.pid())
 }
 
-pub fn activate(game_handle: &mut HANDLE, sysinfo: &mut System) {
-    let pid = get_gta_pid(sysinfo);
-    if pid == u32::MAX {
-        return;
+pub fn activate(game_handle: &mut HANDLE, system_info: &mut SystemInfo) -> bool {
+    let Some(pid) = get_gta_pid(system_info) else {
+        return false;
+    };
+    match unsafe { OpenProcess(PROCESS_SUSPEND_RESUME, false, pid) } {
+        Ok(handle) => *game_handle = handle,
+        Err(why) => {
+            log::error!("failed to suspend game for empty session:\n{why}");
+            return false;
         }
-    unsafe {
-        *game_handle = OpenProcess(PROCESS_SUSPEND_RESUME, false, pid).unwrap();
-        let _ = NtSuspendProcess(*game_handle);
     }
+    unsafe { NtSuspendProcess(*game_handle) }.unwrap();
+    true
 }
 
 pub fn deactivate(game_handle: &mut HANDLE) {
-    unsafe {
     if !game_handle.is_invalid() {
-            let _ = NtResumeProcess(*game_handle);
-            let _ = CloseHandle(*game_handle);
-        }
+        // ignoring the return because this function behaves very weirdly
+        let _ = unsafe { NtResumeProcess(*game_handle) };
     }
 }

src/features/force_close.rs

@@ -1,14 +1,16 @@
-use crate::util::consts::game::{EXE_ENHANCED, EXE_LEGACY};
+use crate::util::{
+    consts::game::{EXE_ENHANCED, EXE_LEGACY},
+    system_info::SystemInfo,
+};
 use std::time::{Duration, Instant};
-use sysinfo::System;
 
 const INTERVAL: Duration = Duration::from_secs(3);
 
 #[derive(Debug)]
 pub struct ForceClose {
     pub button_text: String,
-    prompting: bool,
-    interval: Instant,
+    timer: Instant,
+    counting: bool,
     current_frame: bool,
 }
 
@@ -16,45 +18,51 @@ impl Default for ForceClose {
     fn default() -> Self {
         Self {
             button_text: "Force close game".to_owned(),
-            prompting: false,
-            interval: Instant::now(),
+            timer: Instant::now(),
+            counting: false,
             current_frame: false,
         }
     }
 }
 
 impl ForceClose {
-    pub fn prompt(&mut self, force_close_button_clicked: bool, sysinfo: &mut System) {
-        if force_close_button_clicked && !self.prompting {
-            *self = Self {
-                button_text: "Are you sure?".to_owned(),
-                prompting: true,
-                interval: Instant::now(),
-                current_frame: true,
+    pub fn prompt(&mut self, force_close_button_clicked: bool, system_info: &mut SystemInfo) {
+        if force_close_button_clicked && !self.counting {
+            self.button_text = "Are you sure?".to_owned();
+            self.timer = Instant::now();
+            self.counting = true;
+            self.current_frame = true;
         }
+        if self.counting && self.timer.elapsed() >= INTERVAL {
+            self.reset();
+        } else if force_close_button_clicked && !self.current_frame {
+            activate(system_info);
+            self.reset();
         }
-        if self.prompting && self.interval.elapsed() <= INTERVAL {
-            if force_close_button_clicked && !self.current_frame {
-                activate(sysinfo);
-                *self = Self::default();
+        self.finish_current_frame();
     }
-        } else {
+
+    fn reset(&mut self) {
         *self = Self::default();
     }
+
+    const fn finish_current_frame(&mut self) {
         if self.current_frame {
             self.current_frame = false;
         }
     }
 }
 
-fn activate(sysinfo: &mut System) {
-    sysinfo.refresh_all();
-    sysinfo
+fn activate(system_info: &mut SystemInfo) {
+    system_info.refresh();
+    system_info
         .processes()
         .iter()
-        .filter(|(_, p)| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
-        .for_each(|(_, p)| {
-            p.kill();
+        .filter(|p| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
+        .for_each(|p| {
+            if !p.kill() {
+                log::error!("failed to force close game, probably due to access denied");
+            }
         });
-    sysinfo.refresh_all();
+    system_info.refresh();
 }

src/features/game_networking.rs

@@ -1,128 +1,208 @@
-use crate::util::consts::game::{EXE_ENHANCED, EXE_LEGACY};
-use std::path::Path;
-use sysinfo::System;
+use crate::{
+    gui::settings::BlockMethod,
+    util::{
+        consts::game::{EXE_ENHANCED, EXE_LEGACY},
+        system_info::SystemInfo,
+    },
+};
+use std::{
+    error::Error,
+    path::{Path, PathBuf},
+    time::{Duration, Instant},
+};
+use strum::{Display, EnumIter};
 use windows::{
     Win32::{
-        Foundation::E_INVALIDARG,
         NetworkManagement::WindowsFirewall::{
             INetFwPolicy2, INetFwRule, NET_FW_ACTION_BLOCK, NET_FW_IP_PROTOCOL_ANY,
-            NET_FW_RULE_DIR_IN, NET_FW_RULE_DIR_OUT, NetFwPolicy2, NetFwRule,
+            NET_FW_RULE_DIR_OUT, NetFwPolicy2, NetFwRule,
         },
         System::Com::{
             CLSCTX_INPROC_SERVER, COINIT_MULTITHREADED, CoCreateInstance, CoInitializeEx,
             CoUninitialize,
         },
     },
-    core::{BSTR, HRESULT},
+    core::BSTR,
 };
 
-const FILTER_NAME_IN: &str = "[GTA Tools] Block all inbound traffic for GTA V";
-const FILTER_NAME_OUT: &str = "[GTA Tools] Block all outbound traffic for GTA V";
+const FILTER_NAME_EXE: &str = "[GTA Tools] Block outbound traffic for all of GTA V";
+const FILTER_NAME_SAVE_SERVER: &str = "[GTA Tools] Block outbound traffic to Rockstar save server";
+
+const INTERVAL: Duration = Duration::from_secs(3);
+
+#[derive(Clone, Copy, Debug, Display, PartialEq, Eq, EnumIter)]
+pub enum BlockedStatus {
+    Blocked,
+    Failed,
+    Unblocked,
+}
+
+impl From<bool> for BlockedStatus {
+    fn from(value: bool) -> Self {
+        if value {
+            Self::Blocked
+        } else {
+            Self::Unblocked
+        }
+    }
+}
 
 #[derive(Debug)]
 pub struct GameNetworking {
-    pub is_blocked: bool,
     com_initialized: bool,
-    policy: INetFwPolicy2,
+    pub blocked_status: BlockedStatus,
+    timer: Instant,
+    counting: bool,
 }
 
 impl Default for GameNetworking {
     fn default() -> Self {
-        let result = unsafe { CoInitializeEx(None, COINIT_MULTITHREADED) };
-        let mut gn = Self {
-            is_blocked: false,
-            com_initialized: result != HRESULT(0x80010106u32 as i32),
-            policy: unsafe { CoCreateInstance(&NetFwPolicy2, None, CLSCTX_INPROC_SERVER).unwrap() },
-        };
-        gn.is_blocked = gn.is_blocked();
-        gn
+        Self {
+            blocked_status: if Self::is_save_server_blocked().unwrap() {
+                Self::is_save_server_blocked().unwrap().into()
+            } else {
+                Self::is_exe_blocked().unwrap().into()
+            },
+            com_initialized: unsafe { CoInitializeEx(None, COINIT_MULTITHREADED) }.is_ok(),
+            timer: Instant::now(),
+            counting: false,
+        }
     }
 }
 
 impl Drop for GameNetworking {
     fn drop(&mut self) {
-        unsafe {
         if self.com_initialized {
-                CoUninitialize();
-            }
+            unsafe { CoUninitialize() };
         }
     }
 }
 
+enum Mode {
+    EntireGame(PathBuf),
+    SaveServer(String),
+}
+
 impl GameNetworking {
-    pub fn block_all(&mut self, sysinfo: &mut System) {
-        let Some(exe_path) = get_game_exe_path(sysinfo) else {
-            return;
+    fn block_generic(&self, mode: Mode) -> Result<(), Box<dyn Error>> {
+        let policy: INetFwPolicy2 =
+            unsafe { CoCreateInstance(&NetFwPolicy2, None, CLSCTX_INPROC_SERVER) }?;
+        let rules = unsafe { policy.Rules() }?;
+        let filter_name = match mode {
+            Mode::EntireGame(_) => FILTER_NAME_EXE,
+            Mode::SaveServer(_) => FILTER_NAME_SAVE_SERVER,
         };
-        let rules = unsafe { self.policy.Rules().unwrap() };
-        let filter_name_in = BSTR::from(FILTER_NAME_IN);
-        let filter_name_out = BSTR::from(FILTER_NAME_OUT);
-        unsafe {
-            let _ = rules.Remove(&filter_name_in);
-            let _ = rules.Remove(&filter_name_out);
-        }
+        unsafe { rules.Remove(&BSTR::from(filter_name)) }?;
+        let rule: INetFwRule = unsafe { CoCreateInstance(&NetFwRule, None, CLSCTX_INPROC_SERVER) }?;
+        unsafe { rule.SetName(&BSTR::from(filter_name)) }?;
+        match mode {
+            Mode::EntireGame(exe_path) => {
                 let exe_path = BSTR::from(exe_path.to_string_lossy().to_string());
-        unsafe {
-            let inbound_rule: INetFwRule =
-                CoCreateInstance(&NetFwRule, None, CLSCTX_INPROC_SERVER).unwrap();
-            inbound_rule.SetName(&filter_name_in).unwrap();
-            inbound_rule.SetApplicationName(&exe_path).unwrap();
-            inbound_rule.SetDirection(NET_FW_RULE_DIR_IN).unwrap();
-            inbound_rule.SetEnabled(true.into()).unwrap();
-            inbound_rule.SetAction(NET_FW_ACTION_BLOCK).unwrap();
-            inbound_rule.SetProtocol(NET_FW_IP_PROTOCOL_ANY.0).unwrap();
-            rules.Add(&inbound_rule).unwrap();
+                unsafe { rule.SetApplicationName(&exe_path) }?;
             }
-        unsafe {
-            let outbound_rule: INetFwRule =
-                CoCreateInstance(&NetFwRule, None, CLSCTX_INPROC_SERVER).unwrap();
-            outbound_rule.SetName(&filter_name_out).unwrap();
-            outbound_rule.SetApplicationName(&exe_path).unwrap();
-            outbound_rule.SetDirection(NET_FW_RULE_DIR_OUT).unwrap();
-            outbound_rule.SetEnabled(true.into()).unwrap();
-            outbound_rule.SetAction(NET_FW_ACTION_BLOCK).unwrap();
-            outbound_rule.SetProtocol(NET_FW_IP_PROTOCOL_ANY.0).unwrap();
-            rules.Add(&outbound_rule).unwrap();
+            Mode::SaveServer(save_server_ip) => {
+                unsafe { rule.SetRemoteAddresses(&BSTR::from(save_server_ip)) }?;
             }
-        self.is_blocked = self.is_blocked();
+        }
+        unsafe { rule.SetDirection(NET_FW_RULE_DIR_OUT) }?;
+        unsafe { rule.SetEnabled(true.into()) }?;
+        unsafe { rule.SetAction(NET_FW_ACTION_BLOCK) }?;
+        unsafe { rule.SetProtocol(NET_FW_IP_PROTOCOL_ANY.0) }?;
+        unsafe { rules.Add(&rule) }?;
+        Ok(())
     }
 
-    pub fn unblock_all(&mut self) {
-        let rules = unsafe { self.policy.Rules().unwrap() };
-        unsafe {
-            let result = rules.Remove(&BSTR::from(FILTER_NAME_IN));
-            if let Err(ref why) = result {
-                if why.code() != E_INVALIDARG {
-                    result.unwrap();
-                }
-            }
-            let result = rules.Remove(&BSTR::from(FILTER_NAME_OUT));
-            if let Err(ref why) = result {
-                if why.code() != E_INVALIDARG {
-                    result.unwrap();
-                }
-            }
-        }
-        self.is_blocked = self.is_blocked();
+    fn unblock_generic(&self, filter_name: &str) -> Result<(), Box<dyn Error>> {
+        let policy: INetFwPolicy2 =
+            unsafe { CoCreateInstance(&NetFwPolicy2, None, CLSCTX_INPROC_SERVER) }?;
+        let rules = unsafe { policy.Rules() }?;
+        unsafe { rules.Remove(&BSTR::from(filter_name)) }?;
+        Ok(())
     }
 
-    fn is_blocked(&self) -> bool {
-        let rules = unsafe { self.policy.Rules().unwrap() };
-        let in_rule_exists = unsafe { rules.Item(&BSTR::from(FILTER_NAME_IN)).is_ok() };
-        let out_rule_exists = unsafe { rules.Item(&BSTR::from(FILTER_NAME_OUT)).is_ok() };
-        in_rule_exists || out_rule_exists
+    fn is_blocked_generic(filter_name: &str) -> Result<bool, Box<dyn Error>> {
+        let policy: INetFwPolicy2 =
+            unsafe { CoCreateInstance(&NetFwPolicy2, None, CLSCTX_INPROC_SERVER) }?;
+        let rules = unsafe { policy.Rules() }?;
+        let rule_exists = unsafe { rules.Item(&BSTR::from(filter_name)) }.is_ok();
+        Ok(rule_exists)
+    }
+
+    pub fn block_exe(&mut self, system_info: &mut SystemInfo) -> Result<(), Box<dyn Error>> {
+        let Some(exe_path) = get_game_exe_path(system_info) else {
+            self.blocked_status = BlockedStatus::Failed;
+            return Ok(());
+        };
+        self.block_generic(Mode::EntireGame(exe_path.to_path_buf()))?;
+        self.blocked_status = Self::is_exe_blocked()?.into();
+        Ok(())
+    }
+
+    pub fn unblock_exe(&mut self) -> Result<(), Box<dyn Error>> {
+        self.unblock_generic(FILTER_NAME_EXE)?;
+        self.blocked_status = Self::is_exe_blocked()?.into();
+        Ok(())
+    }
+
+    fn is_exe_blocked() -> Result<bool, Box<dyn Error>> {
+        Self::is_blocked_generic(FILTER_NAME_EXE)
+    }
+
+    pub fn block_save_server(&mut self, save_server_ip: &str) -> Result<(), Box<dyn Error>> {
+        self.block_generic(Mode::SaveServer(save_server_ip.to_owned()))?;
+        self.blocked_status = Self::is_save_server_blocked()?.into();
+        Ok(())
+    }
+
+    pub fn unblock_save_server(&mut self) -> Result<(), Box<dyn Error>> {
+        self.unblock_generic(FILTER_NAME_SAVE_SERVER)?;
+        self.blocked_status = Self::is_save_server_blocked()?.into();
+        Ok(())
+    }
+
+    pub fn is_save_server_blocked() -> Result<bool, Box<dyn Error>> {
+        Self::is_blocked_generic(FILTER_NAME_SAVE_SERVER)
+    }
+
+    pub fn reset_indicator_if_failed(&mut self) {
+        if self.blocked_status == BlockedStatus::Failed && !self.counting {
+            self.counting = true;
+            self.timer = Instant::now();
+        }
+        if self.blocked_status == BlockedStatus::Failed
+            && self.counting
+            && self.timer.elapsed() >= INTERVAL
+        {
+            self.counting = false;
+            self.blocked_status = Self::is_exe_blocked().unwrap().into();
+        }
+    }
+
+    pub fn ensure_not_both_blocked_simultaneously(&mut self, block_method: BlockMethod) {
+        match block_method {
+            BlockMethod::EntireGame => {
+                if Self::is_save_server_blocked().unwrap() {
+                    // ignoring the return because if this is an error the user can just thug it out at that point
+                    let _ = self.unblock_save_server();
+                    self.blocked_status = Self::is_exe_blocked().unwrap().into();
+                }
+            }
+            BlockMethod::SaveServer => {
+                if Self::is_exe_blocked().unwrap() {
+                    // ignoring the return because if this is an error the user can just thug it out at that point
+                    let _ = self.unblock_exe();
+                    self.blocked_status = Self::is_save_server_blocked().unwrap().into();
+                }
+            }
+        }
     }
 }
 
-fn get_game_exe_path(sysinfo: &mut System) -> Option<&Path> {
-    sysinfo.refresh_all();
-    if let Some((_, process)) = sysinfo
+fn get_game_exe_path(system_info: &mut SystemInfo) -> Option<&Path> {
+    system_info.refresh();
+    system_info
         .processes()
         .iter()
-        .find(|(_, p)| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
-    {
-        process.exe()
-    } else {
-        None
-    }
+        .find(|p| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
+        .and_then(|p| p.exe())
 }

src/features/launch.rs

@@ -1,3 +1,4 @@
+use crate::gui::settings::LaunchVersion;
 use serde::{Deserialize, Serialize};
 use std::{path::PathBuf, process::Command};
 use strum::{Display, EnumIter};
@@ -18,16 +19,22 @@ pub struct Launch {
     pub selected: Platform,
 }
 
-pub fn launch(platform: &Platform) {
+pub fn launch(platform: &Platform, version: &LaunchVersion) {
     match platform {
         Platform::Steam => {
-            let _ = open::that_detached("steam://run/3240220");
+            let steam_url = match version {
+                LaunchVersion::Enhanced => "steam://run/3240220",
+                LaunchVersion::Legacy => "steam://run/271590",
+            };
+            open::that_detached(steam_url).unwrap();
         }
         Platform::Rockstar => {
             let hklm = RegKey::predef(HKEY_LOCAL_MACHINE);
-            let Ok(gta_v_enhanced) =
-                hklm.open_subkey(r"SOFTWARE\WOW6432Node\Rockstar Games\GTAV Enhanced")
-            else {
+            let rockstar_url = match version {
+                LaunchVersion::Enhanced => r"SOFTWARE\WOW6432Node\Rockstar Games\GTAV Enhanced",
+                LaunchVersion::Legacy => r"SOFTWARE\WOW6432Node\Rockstar Games\Grand Theft Auto V",
+            };
+            let Ok(gta_v_enhanced) = hklm.open_subkey(rockstar_url) else {
                 return;
             };
             let Ok(install_folder): Result<String, std::io::Error> =
@@ -37,12 +44,19 @@ pub fn launch(platform: &Platform) {
             };
             let mut play_gtav_path = PathBuf::from(install_folder);
             play_gtav_path.push("PlayGTAV.exe");
+            // ignoring the return because if it errors that means GTA isn't installed via Rockstar
             let _ = Command::new(play_gtav_path).spawn();
         }
         Platform::Epic => {
-            let _ = open::that_detached(
-                "com.epicgames.launcher://apps/331226ba7c944720baa99103cb1fe80c?action=launch&silent=true",
-            );
+            let epic_url = match version {
+                LaunchVersion::Enhanced => {
+                    "com.epicgames.launcher://apps/8769e24080ea413b8ebca3f1b8c50951?action=launch&silent=true"
+                }
+                LaunchVersion::Legacy => {
+                    "com.epicgames.launcher://apps/9d2d0eb64d5c44529cece33fe2a46482?action=launch&silent=true"
+                }
+            };
+            open::that_detached(epic_url).unwrap();
         }
     }
 }

src/gui.rs

@@ -1,5 +1,6 @@
-mod app;
+pub mod app;
 mod debug;
 pub mod run;
 pub mod settings;
 mod tools;
+mod ui_ext;

src/gui/app.rs

@@ -1,7 +1,16 @@
 use crate::{
     features,
-    gui::{settings::Settings, tools},
-    util::{consts::game::WINDOW_TITLE, meta::Meta, persistent_state::PersistentState, win},
+    gui::{
+        settings::{BlockMethod, ROCKSTAR_SAVE_SERVER, Settings},
+        tools,
+        ui_ext::UiExt,
+    },
+    util::{
+        consts::{colours, game::WINDOW_TITLE},
+        persistent_state::PersistentState,
+        system_info::SystemInfo,
+        win,
+    },
 };
 use eframe::egui;
 use std::time::{Duration, Instant};
@@ -17,25 +26,34 @@ enum Stage {
     About,
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub struct Flags {
     pub elevated: bool,
     pub debug: bool,
     closing: bool,
 }
 
+impl Default for Flags {
+    fn default() -> Self {
+        Self {
+            elevated: win::is_elevated(),
+            debug: false,
+            closing: false,
+        }
+    }
+}
+
 #[derive(Debug, Default)]
 pub struct App {
-    pub meta: Meta,
     pub settings: Settings,
     stage: Stage,
     pub flags: Flags,
-    pub sysinfo: sysinfo::System,
+    pub system_info: SystemInfo,
     game_handle: windows::Win32::Foundation::HANDLE,
     pub anti_afk: features::anti_afk::AntiAfk,
     empty_session: features::empty_session::EmptySession,
     force_close: features::force_close::ForceClose,
-    game_networking: features::game_networking::GameNetworking,
+    pub game_networking: features::game_networking::GameNetworking,
     pub launch: features::launch::Launch,
 }
 
@@ -47,7 +65,7 @@ impl eframe::App for App {
             .exact_height(25.0)
             .show(ctx, |ui| {
                 ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| {
-                    tools::build_menu::<Stage>(ui, &mut self.stage);
+                    ui.build_menu(&mut self.stage);
                     ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
                         let button = ui
                             .add_enabled(!self.flags.elevated, egui::Button::new("Elevate"))
@@ -82,34 +100,38 @@ impl eframe::App for App {
 
 impl App {
     fn show_game_section(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
-        tools::header(ui, "Game");
+        ui.header("Game");
         ui.horizontal(|ui| {
             if ui.button("Launch").clicked() {
-                features::launch::launch(&self.launch.selected);
+                features::launch::launch(&self.launch.selected, &self.settings.launch_version);
             }
             egui::ComboBox::from_id_salt("Launch")
                 .selected_text(self.launch.selected.to_string())
                 .width(120.0)
                 .show_ui(ui, |ui| {
-                    tools::build_menu(ui, &mut self.launch.selected);
+                    ui.build_menu(&mut self.launch.selected);
                 });
         });
         let force_close_button = ui.add_sized(
-            [104.0, 0.0],
+            [108.0, 0.0],
             egui::Button::new(&self.force_close.button_text),
         );
         self.force_close
-            .prompt(force_close_button.clicked(), &mut self.sysinfo);
+            .prompt(force_close_button.clicked(), &mut self.system_info);
     }
 
     fn show_session_section(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
-        tools::header(ui, "Session");
+        ui.header("Session");
         ui.add_enabled_ui(!self.empty_session.disabled, |ui| {
             ui.horizontal(|ui| {
-                if ui.button("Empty current session").clicked() {
+                if ui.button("Empty current session").clicked()
+                    && features::empty_session::activate(
+                        &mut self.game_handle,
+                        &mut self.system_info,
+                    )
+                {
                     self.empty_session.interval = Instant::now();
                     self.empty_session.disabled = true;
-                    features::empty_session::activate(&mut self.game_handle, &mut self.sysinfo);
                 }
                 ui.label(&self.empty_session.countdown.i_string);
             });
@@ -134,42 +156,59 @@ impl App {
     }
 
     fn show_network_section(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
-        tools::header(ui, "Network");
+        ui.header("Network");
         egui::Frame::new()
             .outer_margin(egui::vec2(0.0, -2.0))
             .show(ui, |ui| {
-                let response = ui.add_enabled_ui(self.flags.elevated, |ui| {
-                    let label = ui.label("Game's network access");
+                ui.add_enabled_ui(self.flags.elevated, |ui| {
+                    let label = ui.horizontal(|ui| {
+                        let label = match self.settings.block_method {
+                            BlockMethod::EntireGame => ui.label("Game's network access"),
+                            BlockMethod::SaveServer => ui.label("Rockstar save server access"),
+                        };
+                        ui.add_space(1.0);
+                        ui.create_indicator_dot(self.game_networking.blocked_status);
+                        self.game_networking.reset_indicator_if_failed();
+                        label
+                    });
                     ui.horizontal(|ui| {
-                        let available_width = label.rect.width();
+                        let available_width = label.inner.rect.width();
                         let spacing = ui.spacing().item_spacing.x;
                         let button_width = (available_width - spacing) / 2.0;
                         if ui
                             .add_sized([button_width, 18.0], egui::Button::new("Block"))
                             .clicked()
                         {
-                            self.game_networking.block_all(&mut self.sysinfo);
+                            match self.settings.block_method {
+                                BlockMethod::EntireGame => {
+                                    self.game_networking
+                                        .block_exe(&mut self.system_info)
+                                        .unwrap();
+                                }
+                                BlockMethod::SaveServer => {
+                                    self.game_networking
+                                        .block_save_server(&self.settings.save_server_ip)
+                                        .unwrap();
+                                }
+                            }
                         }
                         if ui
                             .add_sized([button_width, 18.0], egui::Button::new("Unblock"))
                             .clicked()
                         {
-                            self.game_networking.unblock_all();
+                            match self.settings.block_method {
+                                BlockMethod::EntireGame => {
+                                    self.game_networking.unblock_exe().unwrap();
+                                }
+                                BlockMethod::SaveServer => {
+                                    self.game_networking.unblock_save_server().unwrap();
+                                }
+                            }
                         }
-                        let tint = match self.game_networking.is_blocked {
-                            true => egui::Color32::from_hex("#f96554").unwrap(),
-                            false => egui::Color32::from_hex("#68f954").unwrap(),
-                        };
-                        ui.add(
-                            egui::Image::new(egui::include_image!("../../assets/circle.svg"))
-                                .max_size([4.0, 4.0].into())
-                                .tint(tint),
-                        );
                     });
-                });
-                response.response.on_disabled_hover_text(
-                    "This requires administrator.\nUse the Elevate button.",
-                );
+                })
+                .response
+                .on_disabled_hover_text("This requires administrator.\nUse the Elevate button.");
             });
     }
 
@@ -180,19 +219,63 @@ impl App {
     }
 
     fn show_settings_stage(&mut self, ctx: &egui::Context, ui: &mut egui::Ui) {
+        ui.collapsing("General", |ui| {
+            ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
             ui.horizontal(|ui| {
                 let selection = self.settings.theme;
-            ui.label("Theme");
                 egui::ComboBox::from_id_salt("Theme")
                     .selected_text(self.settings.theme.to_string())
                     .show_ui(ui, |ui| {
-                    tools::build_menu(ui, &mut self.settings.theme);
+                        ui.build_menu(&mut self.settings.theme);
                     });
                 if selection != self.settings.theme {
                     catppuccin_egui::set_theme(ctx, self.settings.theme.into());
                 }
+                ui.label("Theme");
+            });
+        });
+        ui.collapsing("Game", |ui| {
+            ui.horizontal(|ui| {
+                egui::ComboBox::from_id_salt("Launch version")
+                    .selected_text(self.settings.launch_version.to_string())
+                    .show_ui(ui, |ui| {
+                        ui.build_menu(&mut self.settings.launch_version);
+                    });
+                ui.label("Launch version");
+            });
+        });
+        ui.collapsing("Network", |ui| {
+            ui.add_enabled_ui(self.flags.elevated, |ui| {
+                ui.horizontal(|ui| {
+                    egui::ComboBox::from_id_salt("Block method")
+                        .selected_text(self.settings.block_method.to_string())
+                        .show_ui(ui, |ui| {
+                            ui.build_menu(&mut self.settings.block_method);
+                        });
+                    ui.label("Block method");
+                    self.game_networking
+                        .ensure_not_both_blocked_simultaneously(self.settings.block_method);
+                });
+                ui.horizontal(|ui| {
+                    ui.add_enabled_ui(
+                        self.settings.block_method == BlockMethod::SaveServer,
+                        |ui| {
+                            ui.add(
+                                egui::TextEdit::singleline(&mut self.settings.save_server_ip)
+                                    .char_limit(15)
+                                    .desired_width(92.0),
+                            );
+                            ui.label("Save server IP");
+                            if ui.button("↺").clicked() {
+                                self.settings.save_server_ip = String::from(ROCKSTAR_SAVE_SERVER);
+                            }
+                        },
+                    );
+                });
+            })
+            .response
+            .on_disabled_hover_text("This requires administrator.\nUse the Elevate button.");
         });
-        ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
     }
 
     fn show_about_stage(&self, _ctx: &egui::Context, ui: &mut egui::Ui) {
@@ -201,28 +284,29 @@ impl App {
                 ui.horizontal(|ui| {
                     ui.spacing_mut().item_spacing.x = 0.0;
                     ui.label("with ");
-                    ui.hyperlink_to("❤", "https://codeberg.org/futile/gta-tools");
+                    ui.scope(|ui| {
+                        ui.style_mut().visuals.override_text_color = Some(colours::RED);
+                        ui.label("❤");
+                    });
                     ui.label(" from ");
-                    ui.hyperlink_to("futile", "http://futile.eu");
+                    ui.scope(|ui| {
+                        ui.style_mut().visuals.hyperlink_color =
+                            catppuccin_egui::Theme::from(self.settings.theme).text;
+                        ui.hyperlink_to("futile", "https://futile.eu");
+                    });
                 });
                 ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                    ui.label(format!(
-                        "v{} {}",
-                        self.meta.current_version,
-                        if cfg!(debug_assertions) { "(dev)" } else { "" }
-                    ));
-                    let button = ui.add_enabled_ui(self.meta.newer_version_available, |ui| {
-                        ui.style_mut().spacing.button_padding = egui::Vec2::new(3.0, 0.0);
-                        ui.button("⬇")
-                            .on_disabled_hover_text("Already up to date.")
-                            .on_hover_text(format!(
-                                "New version available! ({})",
-                                self.meta.latest_release.version
-                            ))
-                    });
-                    if button.inner.clicked() {
-                        open::that(&self.meta.latest_release.download_url).unwrap();
+                    ui.style_mut().spacing.button_padding = egui::Vec2::new(4.0, 0.0);
+                    if ui.button("").on_hover_text("View source code").clicked() {
+                        open::that("https://github.com/elituf/gta-tools").unwrap();
                     }
+                    if cfg!(debug_assertions) {
+                        ui.label("(dev)");
+                    }
+                    ui.label(format!("v{}", env!("CARGO_PKG_VERSION")))
+                        .on_hover_text(
+                            egui::RichText::new(env!("LATEST_GIT_COMMIT_HASH")).monospace(),
+                        );
                 });
             });
             ui.add(egui::Image::new(egui::include_image!(
@@ -237,6 +321,7 @@ impl Drop for App {
         // save any persistent state to config file
         PersistentState {
             launcher: self.launch.selected,
+            anti_afk_enabled: self.anti_afk.enabled,
             settings: self.settings.clone(),
         }
         .set();

src/gui/debug.rs

@@ -2,15 +2,67 @@ use crate::{
     gui::{
         app::{App, WINDOW_SIZE},
         tools,
+        ui_ext::UiExt,
     },
     util::consts::{
-        APP_STORAGE_PATH,
         game::{EXE_ENHANCED, EXE_LEGACY},
+        path,
     },
 };
 use eframe::egui;
 
 impl App {
+    fn add_debug_viewport_contents(&mut self, ui: &mut egui::Ui) {
+        ui.collapsing("misc", |ui| {
+            if ui.button("open storage path").clicked() {
+                open::that_detached(path::APP_STORAGE.as_path()).unwrap();
+            }
+            ui.scope(|ui| {
+                use windows::Win32::UI::WindowsAndMessaging::{
+                    GetForegroundWindow, GetWindowTextW,
+                };
+                let current_title = {
+                    let mut buffer = [0; 512];
+                    let hwnd = unsafe { GetForegroundWindow() };
+                    let length = unsafe { GetWindowTextW(hwnd, &mut buffer) };
+                    String::from_utf16_lossy(&buffer[..length as usize])
+                };
+                ui.label(format!("focused: \"{current_title}\""));
+            });
+            ui.horizontal(|ui| {
+                ui.label("blocked_status");
+                egui::ComboBox::from_id_salt("blocked_status")
+                    .selected_text(self.game_networking.blocked_status.to_string())
+                    .show_ui(ui, |ui| {
+                        ui.build_menu(&mut self.game_networking.blocked_status);
+                    });
+            });
+            if ui.add(egui::Button::new("force refresh theme")).clicked() {
+                catppuccin_egui::set_theme(ui.ctx(), self.settings.theme.into());
+            }
+        });
+        ui.collapsing("anti afk", |ui| {
+            ui.label(format!(
+                "timer: {}",
+                self.anti_afk.interval.elapsed().as_secs()
+            ));
+            ui.label(format!("can activate: {}", self.anti_afk.can_activate()));
+        });
+        ui.collapsing("system info", |ui| {
+            if ui.button("refresh").clicked() {
+                self.system_info.refresh();
+            }
+            let pid = self
+                .system_info
+                .processes()
+                .iter()
+                .find(|p| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
+                .map_or_else(|| "no pid found!".to_owned(), |p| p.pid().to_string());
+            ui.label(format!("gta pid: {pid}"));
+        });
+        ui.collapsing("app state", |ui| ui.label(format!("{self:#?}")));
+    }
+
     pub fn show_debug_viewport(&mut self, ctx: &egui::Context) {
         let main = ctx.input(|i| i.viewport().outer_rect.unwrap_or(egui::Rect::EVERYTHING));
         let builder = egui::ViewportBuilder::default()
@@ -30,54 +82,7 @@ impl App {
                 egui::CentralPanel::default().show(ctx, |ui| {
                     egui::ScrollArea::both()
                         .auto_shrink([false, true])
-                        .show(ui, |ui| {
-                            ui.collapsing("misc", |ui| {
-                                if ui.button("open storage path").clicked() {
-                                    open::that_detached(APP_STORAGE_PATH.as_path()).unwrap();
-                                }
-                                ui.checkbox(
-                                    &mut self.meta.newer_version_available,
-                                    "spoof new version available",
-                                )
-                                .on_hover_text("(this could already be checked if\nthere actually IS a new version)");
-                                ui.scope(|ui| {
-                                    use windows::Win32::UI::WindowsAndMessaging::{GetForegroundWindow, GetWindowTextW};
-                                    let mut buffer = [0; 512];
-                                    let current_title = unsafe {
-                                        let hwnd = GetForegroundWindow();
-                                        let length = GetWindowTextW(hwnd, &mut buffer);
-                                        String::from_utf16_lossy(&buffer[..length as usize])
-                                    };
-                                    ui.label(format!("focused: \"{current_title}\""));
-                                });
-                            });
-                            ui.collapsing("anti afk", |ui| {
-                                ui.label(format!(
-                                    "timer: {}",
-                                    self.anti_afk.interval.elapsed().as_secs()
-                                ));
-                                ui.label(format!(
-                                    "can activate: {}",
-                                    self.anti_afk.can_activate()
-                                ));
-                            });
-                            ui.collapsing("sysinfo", |ui| {
-                                if ui.button("refresh all").clicked() {
-                                    self.sysinfo.refresh_all();
-                                }
-                                let pid = self
-                                    .sysinfo
-                                    .processes()
-                                    .iter()
-                                    .find(|(_, p)| p.name() == EXE_ENHANCED || p.name() == EXE_LEGACY)
-                                    .map_or_else(
-                                        || "no pid found!".to_owned(),
-                                        |(pid, _)| pid.as_u32().to_string(),
-                                    );
-                                ui.label(format!("gta pid: {pid}"));
-                            });
-                            ui.collapsing("app state", |ui| ui.label(format!("{self:#?}")));
-                        });
+                        .show(ui, |ui| self.add_debug_viewport_contents(ui));
                 });
             },
         );

src/gui/run.rs

@@ -3,62 +3,55 @@ use crate::{
         app::{App, WINDOW_SIZE},
         tools,
     },
-    util::{self, consts::APP_STORAGE_PATH, persistent_state::PersistentState},
+    util::{persistent_state::PersistentState, win},
 };
 use eframe::egui;
-use std::{fs::File, io::Write};
-
-fn panic_hook(panic_info: &std::panic::PanicHookInfo<'_>) {
-    let log_path = APP_STORAGE_PATH.join("panic.log");
-    let mut file = File::options()
-        .create(true)
-        .append(true)
-        .open(log_path)
-        .unwrap();
-    let timestamp = chrono::Local::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, false);
-    let backtrace = std::backtrace::Backtrace::force_capture();
-    let message = format!("[{timestamp}]\n{panic_info}\nstack backtrace:\n{backtrace}\n");
-    file.write_all(message.as_bytes()).unwrap();
-}
 
 fn app_creator(
     cc: &eframe::CreationContext<'_>,
 ) -> Result<Box<dyn eframe::App>, Box<dyn std::error::Error + Send + Sync>> {
-    // use our own panic hook which logs all panics to a file
-    std::panic::set_hook(Box::new(panic_hook));
     // initialize App early to modify some things before returning it
-    let mut app = Box::<App>::default();
+    let mut app = Box::new(App::default());
     // load previously selected launch platform & settings from persistent state
     if let Some(persistent_state) = PersistentState::get() {
-        app.launch.selected = persistent_state.launcher;
-        app.settings = persistent_state.settings;
+        persistent_state.apply_to(&mut app);
     }
     // check if we're elevated. if not, and the user wants an elevated launch - relaunch elevated
-    let elevated = util::win::is_elevated();
-    if app.settings.start_elevated && !elevated {
-        util::win::elevate(util::win::ElevationExitMethod::Forced);
+    if !app.flags.elevated && app.settings.start_elevated {
+        win::elevate(win::ElevationExitMethod::Forced);
     }
-    app.flags.elevated = elevated;
-    // refresh sysinfo because it initializes with nothing
-    app.sysinfo.refresh_all();
+    // refresh system info because it initializes with nothing
+    app.system_info.refresh();
     // enable image loading support in egui
     egui_extras::install_image_loaders(&cc.egui_ctx);
-    // set our initial theme, from earlier loaded settings
+    // set our initial theme, from earlier loaded settings. we set the egui theme
+    // to dark here to work around system theme based switching of the egui style
+    cc.egui_ctx.set_theme(egui::Theme::Dark);
     catppuccin_egui::set_theme(&cc.egui_ctx, app.settings.theme.into());
     // apply some global styling that we like
-    cc.egui_ctx.style_mut(|style| {
+    cc.egui_ctx.all_styles_mut(|style| {
         style.spacing.item_spacing = egui::vec2(4.0, 4.0);
         style.interaction.selectable_labels = false;
+        style.visuals.hyperlink_color = catppuccin_egui::Theme::from(app.settings.theme).text;
     });
     // load any extra fonts that we need
     let mut fonts = egui::FontDefinitions::default();
     fonts.font_data.insert(
-        "Ubuntu-Regular".to_owned(),
-        egui::FontData::from_static(include_bytes!("../../assets/Ubuntu-Regular.ttf")).into(),
+        "Inter 18pt Light".to_owned(),
+        egui::FontData::from_static(include_bytes!("../../assets/Inter_18pt-Light.ttf")).into(),
+    );
+    fonts
+        .families
+        .get_mut(&egui::FontFamily::Proportional)
+        .unwrap()
+        .insert(0, "Inter 18pt Light".to_owned());
+    fonts.font_data.insert(
+        "Inter 18pt Regular".to_owned(),
+        egui::FontData::from_static(include_bytes!("../../assets/Inter_18pt-Regular.ttf")).into(),
     );
     fonts.families.insert(
-        egui::FontFamily::Name("Ubuntu-Regular".into()),
-        vec!["Ubuntu-Regular".to_owned()],
+        egui::FontFamily::Name("Inter 18pt Regular".into()),
+        vec!["Inter 18pt Regular".to_owned()],
     );
     cc.egui_ctx.set_fonts(fonts);
     // finally return the App

src/gui/settings.rs

@@ -1,40 +1,75 @@
+use crate::util::win;
 use serde::{Deserialize, Serialize};
 use strum::{Display, EnumIter};
 
-#[derive(Clone, Copy, Debug, Display, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
+pub const ROCKSTAR_SAVE_SERVER: &str = "192.81.241.171";
+
+#[derive(Clone, Copy, Debug, Default, Display, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
 pub enum Theme {
-    #[strum(to_string = "Catppuccin Latte")]
-    CatppuccinLatte,
-    #[strum(to_string = "Catppuccin Frappe")]
-    CatppuccinFrappe,
-    #[strum(to_string = "Catppuccin Macchiato")]
-    CatppuccinMacchiato,
-    #[strum(to_string = "Catppuccin Mocha")]
-    CatppuccinMocha,
+    #[default]
+    #[strum(to_string = "Auto")]
+    Auto,
+    #[strum(to_string = "Latte")]
+    Latte,
+    #[strum(to_string = "Frappe")]
+    Frappe,
+    #[strum(to_string = "Macchiato")]
+    Macchiato,
+    #[strum(to_string = "Mocha")]
+    Mocha,
 }
 
 impl From<Theme> for catppuccin_egui::Theme {
     fn from(val: Theme) -> Self {
         match val {
-            Theme::CatppuccinLatte => catppuccin_egui::LATTE,
-            Theme::CatppuccinFrappe => catppuccin_egui::FRAPPE,
-            Theme::CatppuccinMacchiato => catppuccin_egui::MACCHIATO,
-            Theme::CatppuccinMocha => catppuccin_egui::MOCHA,
+            Theme::Auto => {
+                if win::is_system_theme_light() {
+                    catppuccin_egui::LATTE
+                } else {
+                    catppuccin_egui::MOCHA
+                }
+            }
+            Theme::Latte => catppuccin_egui::LATTE,
+            Theme::Frappe => catppuccin_egui::FRAPPE,
+            Theme::Macchiato => catppuccin_egui::MACCHIATO,
+            Theme::Mocha => catppuccin_egui::MOCHA,
         }
     }
 }
 
+#[derive(Clone, Copy, Debug, Default, Display, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
+pub enum LaunchVersion {
+    #[default]
+    Enhanced,
+    Legacy,
+}
+
+#[derive(Clone, Copy, Debug, Default, Display, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
+pub enum BlockMethod {
+    #[default]
+    #[strum(to_string = "Entire game")]
+    EntireGame,
+    #[strum(to_string = "Save server")]
+    SaveServer,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Settings {
-    pub theme: Theme,
     pub start_elevated: bool,
+    pub theme: Theme,
+    pub launch_version: LaunchVersion,
+    pub save_server_ip: String,
+    pub block_method: BlockMethod,
 }
 
 impl Default for Settings {
     fn default() -> Self {
         Self {
-            theme: Theme::CatppuccinMocha,
             start_elevated: false,
+            theme: Theme::default(),
+            launch_version: LaunchVersion::default(),
+            block_method: BlockMethod::default(),
+            save_server_ip: String::from(ROCKSTAR_SAVE_SERVER),
         }
     }
 }

src/gui/tools.rs

@@ -11,25 +11,6 @@ pub fn load_icon() -> egui::IconData {
     }
 }
 
-pub fn header(ui: &mut egui::Ui, text: &str) {
-    ui.horizontal(|ui| {
-        ui.label(egui::RichText::new(text).font(egui::FontId::new(
-            12.5,
-            egui::FontFamily::Name("Ubuntu-Regular".into()),
-        )));
-        ui.add(egui::Separator::default().horizontal());
-    });
-}
-
-pub fn build_menu<E>(ui: &mut egui::Ui, current_value: &mut E)
-where
-    E: strum::IntoEnumIterator + std::fmt::Display + std::cmp::PartialEq + Copy,
-{
-    E::iter().for_each(|variant| {
-        ui.selectable_value(current_value, variant, variant.to_string());
-    });
-}
-
 pub fn debug_keycombo_pressed(ctx: &egui::Context) -> bool {
     ctx.input(|i| i.modifiers.all() && i.key_pressed(egui::Key::D))
 }

src/gui/ui_ext.rs

@@ -0,0 +1,38 @@
+use eframe::egui;
+
+pub trait UiExt {
+    fn header(&mut self, text: &str);
+    fn build_menu<E>(&mut self, current_value: &mut E)
+    where
+        E: strum::IntoEnumIterator + std::fmt::Display + std::cmp::PartialEq + Copy;
+    fn create_indicator_dot(&mut self, colour: impl Into<egui::Color32>) -> egui::Response;
+}
+
+impl UiExt for egui::Ui {
+    fn header(&mut self, text: &str) {
+        self.horizontal(|ui| {
+            ui.label(egui::RichText::new(text).font(egui::FontId::new(
+                12.5,
+                egui::FontFamily::Name("Inter 18pt Regular".into()),
+            )));
+            ui.add(egui::Separator::default().horizontal());
+        });
+    }
+
+    fn build_menu<E>(&mut self, current_value: &mut E)
+    where
+        E: strum::IntoEnumIterator + std::fmt::Display + std::cmp::PartialEq + Copy,
+    {
+        E::iter().for_each(|variant| {
+            self.selectable_value(current_value, variant, variant.to_string());
+        });
+    }
+
+    fn create_indicator_dot(&mut self, colour: impl Into<egui::Color32>) -> egui::Response {
+        self.add(
+            egui::Image::new(egui::include_image!("../../assets/circle.svg"))
+                .max_size([4.0, 4.0].into())
+                .tint(colour),
+        )
+    }
+}

src/main.rs

@@ -4,6 +4,26 @@ mod features;
 mod gui;
 mod util;
 
+use std::fmt::Write;
+
+fn init_storage() {
+    if !util::consts::path::APP_STORAGE.exists() {
+        std::fs::create_dir_all(util::consts::path::APP_STORAGE.as_path()).unwrap();
+    }
+}
+
+fn panic_hook(panic_info: &std::panic::PanicHookInfo<'_>) {
+    let backtrace = std::backtrace::Backtrace::capture();
+    let mut message = format!("{panic_info}");
+    if backtrace.status() == std::backtrace::BacktraceStatus::Captured {
+        write!(message, "\nstack backtrace:\n{backtrace}").unwrap();
+    }
+    log::error!("{message}");
+}
+
 fn main() {
+    init_storage();
+    util::logging::Logger::init(log::LevelFilter::Info);
+    std::panic::set_hook(Box::new(panic_hook));
     gui::run::run();
 }

src/util.rs

@@ -1,6 +1,6 @@
-mod codeberg;
 pub mod consts;
 pub mod countdown;
-pub mod meta;
+pub mod logging;
 pub mod persistent_state;
+pub mod system_info;
 pub mod win;

src/util/codeberg.rs

@@ -1,35 +0,0 @@
-use semver::Version;
-
-const APP_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
-const CODEBERG_ENDPOINT_ROOT: &str = "https://codeberg.org/api/v1";
-
-#[derive(Debug)]
-pub struct Release {
-    pub version: Version,
-    pub download_url: String,
-}
-
-impl Default for Release {
-    fn default() -> Self {
-        Self {
-            version: Version::parse(env!("CARGO_PKG_VERSION")).unwrap(),
-            download_url: String::new(),
-        }
-    }
-}
-
-pub fn get_latest_release() -> Option<Release> {
-    let request_url = format!("{CODEBERG_ENDPOINT_ROOT}/repos/futile/gta-tools/releases/latest");
-    let ureq: ureq::Agent = ureq::Agent::config_builder()
-        .user_agent(APP_USER_AGENT)
-        .build()
-        .into();
-    let mut response = ureq.get(request_url).call().ok()?;
-    let json = response.body_mut().read_json::<serde_json::Value>().ok()?;
-    let tag_name = json["tag_name"].as_str()?;
-    let browser_download_url = json["assets"][0]["browser_download_url"].as_str()?;
-    Some(Release {
-        version: Version::parse(tag_name).expect("expected a valid semver pattern"),
-        download_url: String::from(browser_download_url),
-    })
-}

src/util/consts.rs

@@ -1,10 +1,34 @@
-use std::{path::PathBuf, sync::LazyLock};
-
-pub static APP_STORAGE_PATH: LazyLock<PathBuf> =
-    LazyLock::new(|| dirs::config_local_dir().unwrap().join("GTA Tools"));
+pub mod path {
+    use std::{env, path::PathBuf, sync::LazyLock};
+    pub static APP_STORAGE: LazyLock<PathBuf> = LazyLock::new(|| {
+        PathBuf::from(env::var("LOCALAPPDATA").unwrap_or_else(|_| String::from(".")))
+            .join("GTA Tools")
+    });
+    pub static APP_CONFIG: LazyLock<PathBuf> = LazyLock::new(|| APP_STORAGE.join("config.json"));
+    pub static APP_LOG: LazyLock<PathBuf> = LazyLock::new(|| APP_STORAGE.join("gta-tools.log"));
+}
 
 pub mod game {
     pub const EXE_ENHANCED: &str = "GTA5_Enhanced.exe";
     pub const EXE_LEGACY: &str = "GTA5.exe";
     pub const WINDOW_TITLE: &str = "Grand Theft Auto V";
 }
+
+pub mod colours {
+    use crate::features::game_networking::BlockedStatus;
+    use eframe::egui;
+
+    pub const RED: egui::Color32 = egui::Color32::from_rgb(255, 96, 96);
+    pub const YELLOW: egui::Color32 = egui::Color32::from_rgb(255, 255, 96);
+    pub const GREEN: egui::Color32 = egui::Color32::from_rgb(96, 255, 96);
+
+    impl From<BlockedStatus> for egui::Color32 {
+        fn from(value: BlockedStatus) -> Self {
+            match value {
+                BlockedStatus::Blocked => RED,
+                BlockedStatus::Failed => YELLOW,
+                BlockedStatus::Unblocked => GREEN,
+            }
+        }
+    }
+}

src/util/logging.rs

@@ -0,0 +1,64 @@
+use std::{
+    fs::File,
+    io::Write,
+    sync::{LazyLock, Mutex},
+    time::SystemTime,
+};
+
+pub struct Logger {
+    file: Mutex<File>,
+}
+
+static LOGGER: LazyLock<Logger> = LazyLock::new(|| Logger {
+    file: File::options()
+        .create(true)
+        .append(true)
+        .open(crate::util::consts::path::APP_LOG.as_path())
+        .unwrap()
+        .into(),
+});
+
+impl log::Log for Logger {
+    fn enabled(&self, metadata: &log::Metadata) -> bool {
+        metadata.level() <= log::Level::Info
+    }
+
+    fn flush(&self) {}
+
+    fn log(&self, record: &log::Record) {
+        if self.enabled(record.metadata()) {
+            self.log_to_stderr(record);
+            self.log_to_file(record);
+        }
+    }
+}
+
+impl Logger {
+    pub fn init(level: log::LevelFilter) {
+        log::set_logger(&*LOGGER)
+            .map(|()| log::set_max_level(level))
+            .unwrap();
+    }
+
+    fn log_to_file(&self, record: &log::Record) {
+        let mut file = self.file.lock().unwrap();
+        write!(
+            file,
+            "[{}][{}]\n{}\n\n",
+            humantime::format_rfc3339_seconds(SystemTime::now()),
+            record.level(),
+            record.args()
+        )
+        .unwrap();
+        file.flush().unwrap();
+    }
+
+    fn log_to_stderr(&self, record: &log::Record) {
+        eprintln!(
+            "[{}][{}]\n{}",
+            humantime::format_rfc3339_seconds(SystemTime::now()),
+            record.level(),
+            record.args()
+        );
+    }
+}

src/util/meta.rs

@@ -1,25 +0,0 @@
-use crate::util::codeberg;
-use semver::Version;
-
-#[derive(Debug)]
-pub struct Meta {
-    pub current_version: Version,
-    pub latest_release: codeberg::Release,
-    pub newer_version_available: bool,
-}
-
-impl Default for Meta {
-    fn default() -> Self {
-        let current_version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
-        let latest_release = codeberg::get_latest_release().unwrap_or_default();
-        let newer_version_available = matches!(
-            &current_version.cmp_precedence(&latest_release.version),
-            std::cmp::Ordering::Less
-        );
-        Self {
-            current_version,
-            latest_release,
-            newer_version_available,
-        }
-    }
-}

src/util/persistent_state.rs

@@ -1,35 +1,42 @@
-use crate::{features::launch::Platform, gui::settings::Settings, util::consts::APP_STORAGE_PATH};
+use crate::{
+    features::launch::Platform,
+    gui::{app, settings::Settings},
+    util::consts::path,
+};
 use serde::{Deserialize, Serialize};
 use std::{
     fs::{self, File},
     io::Write,
-    path::PathBuf,
-    sync::LazyLock,
 };
 
-static CONFIG_PATH: LazyLock<PathBuf> = LazyLock::new(|| APP_STORAGE_PATH.join("config.json"));
-
 #[derive(Serialize, Deserialize)]
 pub struct PersistentState {
     pub launcher: Platform,
+    pub anti_afk_enabled: bool,
     pub settings: Settings,
 }
 
 impl PersistentState {
     pub fn get() -> Option<Self> {
-        fs::read_to_string(CONFIG_PATH.as_path())
+        fs::read_to_string(path::APP_CONFIG.as_path())
             .ok()
             .and_then(|config| serde_json::from_str::<Self>(&config).ok())
     }
 
     pub fn set(&self) {
-        let config_path = CONFIG_PATH.as_path();
-        let config_path_parent = config_path.parent().unwrap();
-        if !config_path_parent.exists() {
-            fs::create_dir(config_path_parent).unwrap();
-        }
-        let mut config_file = File::create(config_path).unwrap();
+        let mut config_file = File::create(path::APP_CONFIG.as_path()).unwrap();
         let json = serde_json::to_string_pretty(&self).unwrap();
         config_file.write_all(json.as_bytes()).unwrap();
     }
+
+    pub fn apply_to(self, app: &mut app::App) {
+        let Self {
+            launcher,
+            anti_afk_enabled,
+            settings,
+        } = self;
+        app.launch.selected = launcher;
+        app.anti_afk.enabled = anti_afk_enabled;
+        app.settings = settings;
+    }
 }

src/util/system_info.rs

@@ -0,0 +1,117 @@
+use std::{
+    ffi::{OsStr, OsString},
+    os::windows::{ffi::OsStringExt, process::CommandExt},
+    path::{Path, PathBuf},
+    process::Command,
+};
+use windows::{
+    Win32::System::{
+        Diagnostics::ToolHelp::{
+            CreateToolhelp32Snapshot, PROCESSENTRY32W, Process32FirstW, Process32NextW,
+            TH32CS_SNAPPROCESS,
+        },
+        Threading::{
+            CREATE_NO_WINDOW, OpenProcess, PROCESS_NAME_WIN32, PROCESS_QUERY_LIMITED_INFORMATION,
+            QueryFullProcessImageNameW,
+        },
+    },
+    core::PWSTR,
+};
+
+#[derive(Clone, Debug)]
+pub struct Process {
+    pid: u32,
+    name: OsString,
+    exe: Option<PathBuf>,
+}
+
+impl Process {
+    pub const fn pid(&self) -> u32 {
+        self.pid
+    }
+
+    pub fn name(&self) -> &OsStr {
+        &self.name
+    }
+
+    pub fn exe(&self) -> Option<&Path> {
+        self.exe.as_deref()
+    }
+
+    pub fn kill(&self) -> bool {
+        let mut taskkill = Command::new("taskkill.exe");
+        taskkill.creation_flags(CREATE_NO_WINDOW.0);
+        taskkill.arg("/F").arg("/PID").arg(self.pid.to_string());
+        match taskkill.output() {
+            Ok(output) => output.status.success(),
+            Err(_) => false,
+        }
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct SystemInfo {
+    processes: Vec<Process>,
+}
+
+impl SystemInfo {
+    pub fn refresh(&mut self) {
+        let mut processes = Vec::new();
+        let snapshot_handle = unsafe { CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0) }.unwrap();
+        let mut process_entry = PROCESSENTRY32W {
+            dwSize: size_of::<PROCESSENTRY32W>() as u32,
+            ..Default::default()
+        };
+        unsafe { Process32FirstW(snapshot_handle, &raw mut process_entry) }.unwrap();
+        let exe_full_path = get_exe_full_path(&process_entry);
+        processes.push(Process {
+            pid: process_entry.th32ProcessID,
+            name: wide_array_to_os_string(&process_entry.szExeFile),
+            exe: exe_full_path,
+        });
+        while unsafe { Process32NextW(snapshot_handle, &raw mut process_entry) }.is_ok() {
+            let exe_full_path = get_exe_full_path(&process_entry);
+            processes.push(Process {
+                pid: process_entry.th32ProcessID,
+                name: wide_array_to_os_string(&process_entry.szExeFile),
+                exe: exe_full_path,
+            });
+        }
+        self.processes = processes;
+    }
+
+    pub fn processes(&self) -> &[Process] {
+        &self.processes
+    }
+}
+
+fn get_exe_full_path(process_entry: &PROCESSENTRY32W) -> Option<PathBuf> {
+    let process_handle_result = unsafe {
+        OpenProcess(
+            PROCESS_QUERY_LIMITED_INFORMATION,
+            false,
+            process_entry.th32ProcessID,
+        )
+    };
+    process_handle_result.map_or(None, |process_handle| {
+        let mut exe_name = [0u16; 260];
+        let mut dw_size = exe_name.len() as u32;
+        let image_name_result = unsafe {
+            QueryFullProcessImageNameW(
+                process_handle,
+                PROCESS_NAME_WIN32,
+                PWSTR(exe_name.as_mut_ptr()),
+                &raw mut dw_size,
+            )
+        };
+        match image_name_result {
+            Ok(()) => Some(PathBuf::from(wide_array_to_os_string(&exe_name))),
+            Err(_) => None,
+        }
+    })
+}
+
+fn wide_array_to_os_string(wide: &[u16]) -> OsString {
+    let null_pos = wide.iter().position(|&x| x == 0).unwrap_or(wide.len());
+    OsString::from_wide(&wide[..null_pos])
+}

src/util/win.rs

@@ -25,25 +25,21 @@ pub fn is_cursor_visible() -> bool {
         cbSize: u32::try_from(std::mem::size_of::<CURSORINFO>()).unwrap(),
         ..Default::default()
     };
-    unsafe {
-        GetCursorInfo(&mut ci).unwrap();
-    }
+    unsafe { GetCursorInfo(&raw mut ci) }.unwrap();
     ci.flags == CURSOR_SHOWING
 }
 
 pub fn is_window_focused(target_title: &str) -> bool {
     let mut buffer = [0; 512];
-    unsafe {
-        let hwnd = GetForegroundWindow();
-        let length = GetWindowTextW(hwnd, &mut buffer);
+    let hwnd = unsafe { GetForegroundWindow() };
+    let length = unsafe { GetWindowTextW(hwnd, &mut buffer) };
     let current_title = String::from_utf16_lossy(&buffer[..length as usize]);
     current_title == target_title
-    }
 }
 
 pub fn is_any_key_pressed(keys: &[VIRTUAL_KEY]) -> bool {
     keys.iter()
-        .any(|&key| unsafe { (GetAsyncKeyState(i32::from(key.0)) & i16::MIN) != 0 })
+        .any(|&key| unsafe { GetAsyncKeyState(i32::from(key.0)) } & i16::MIN != 0)
 }
 
 pub fn elevate(closing: ElevationExitMethod) {
@@ -66,20 +62,36 @@ pub fn elevate(closing: ElevationExitMethod) {
 
 pub fn is_elevated() -> bool {
     let mut token: HANDLE = HANDLE::default();
-    unsafe {
-        if OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut token).is_err() {
+    if unsafe { OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &raw mut token) }.is_err() {
         return false;
     }
     let mut elevation = TOKEN_ELEVATION::default();
     let mut size = u32::try_from(std::mem::size_of::<TOKEN_ELEVATION>()).unwrap();
-        let result = GetTokenInformation(
+    let result = unsafe {
+        GetTokenInformation(
             token,
             TokenElevation,
             Some((&raw mut elevation).cast()),
             size,
-            &mut size,
-        );
-        CloseHandle(token).unwrap();
+            &raw mut size,
+        )
+    };
+    unsafe { CloseHandle(token) }.unwrap();
     result.is_ok() && elevation.TokenIsElevated != 0
-    }
+}
+
+pub fn is_system_theme_light() -> bool {
+    use winreg::RegKey;
+    let hkcu = RegKey::predef(winreg::enums::HKEY_CURRENT_USER);
+    let Ok(subkey) =
+        hkcu.open_subkey("Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize")
+    else {
+        return true;
+    };
+    let Ok(apps_use_light_theme): Result<u32, std::io::Error> =
+        subkey.get_value("AppsUseLightTheme")
+    else {
+        return true;
+    };
+    apps_use_light_theme == 1
 }