Gta install location improvements

- Propagate rust errors to JVM
- Use steam paths

Author: DRSchlaubi

client/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     alias(libs.plugins.buildconfig)
 }
 
-version = "1.6.4"
+version = "1.6.5"
 
 repositories {
     mavenCentral()

client/src/main/kotlin/core/ProcessHandler.kt

@@ -34,17 +34,19 @@ suspend fun killGta() {
 
         delay(2.seconds)
 
-        if (settings.autostartGta) {
-            LOG.info { "Restarting GTA5.exe" }
-            try {
-                val gtaPath = WindowsAPI.readGtaLocation(version) / version.startBinary
-                Runtime.getRuntime().exec(arrayOf(gtaPath.absolutePathString()))
-            } catch (e: Exception) {
-                _events.emit(Event.RestartError(e))
-            }
-        }
     } else {
         LOG.error { "GTA5.exe not found" }
         _events.emit(Event.GtaProcessNotFound(version.process))
     }
+
+    if (settings.autostartGta) {
+        LOG.info { "Restarting GTA5.exe" }
+        try {
+            val gtaPath = WindowsAPI.readGtaLocation(version) / version.startBinary
+            Runtime.getRuntime().exec(arrayOf(gtaPath.absolutePathString()))
+        } catch (e: Exception) {
+            LOG.error(e) { "Could not restart GTA5.exe" }
+            _events.emit(Event.RestartError(e))
+        }
+    }
 }

windows_helper/Cargo.lock

@@ -13,6 +13,7 @@ windows-registry = "0.5.0"
 mki = "0.2.3"
 once_cell = "1.20.3"
 runas = "1.2.0"
+log = "0.4.29"
 
 [[bin]]
 name = "generate-headers"

windows_helper/Cargo.toml

@@ -80,6 +80,7 @@ tasks {
             "--include-struct", "Vec_uint8",
             "--include-struct", "Vec_uint8_t",
             "--include-struct", "slice_ref_Vec_uint8",
+            "--include-struct", "GtaInstallLocationResult",
             header,
         )
     }

windows_helper/build.gradle.kts

@@ -1,26 +1,55 @@
+use std::fmt::Display;
 use enum_ordinalize::Ordinalize;
-use safer_ffi::ffi_export;
 use safer_ffi::ඞ::repr_c;
+use safer_ffi::{derive_ReprC, ffi_export};
 use windows_registry::LOCAL_MACHINE;
+use log::debug;
 
 #[derive(Ordinalize)]
 enum GTAVersion {
     Legacy,
     Enhanced,
 }
 
+impl Display for GTAVersion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let version = match self {
+            GTAVersion::Legacy => "Legacy",
+            GTAVersion::Enhanced => "Enhanced"
+        };
+
+        write!(f, "{:?}", version)
+    }
+}
+
+#[derive_ReprC]
+#[repr(C)]
+struct GtaInstallLocationResult {
+    is_error: bool,
+    content: repr_c::String,
+}
+
 #[ffi_export]
-fn read_gta_location(gta_version: i8) -> repr_c::String {
+fn read_gta_location(gta_version: i8) -> GtaInstallLocationResult {
     let version = GTAVersion::from_ordinal(gta_version).unwrap();
-    let location = _read_gta_location(version).unwrap();
-    location.into()
+
+    match _read_gta_location(version) {
+        Ok(location) => GtaInstallLocationResult {
+            is_error: false,
+            content: location.into(),
+        },
+        Err(error) => GtaInstallLocationResult {
+            is_error: true,
+            content: error.to_string().into(),
+        },
+    }
 }
 
 #[ffi_export]
 fn detect_version() -> i8 {
     match _detect_version() {
         None => -1,
-        Some(version) => version.ordinal()
+        Some(version) => version.ordinal(),
     }
 }
 
@@ -37,17 +66,22 @@ fn _detect_version() -> Option<GTAVersion> {
     }
 }
 
-fn _read_gta_location(gta_version: GTAVersion) -> windows_registry::Result<String> {
-    let key = LOCAL_MACHINE.open(gta_version.registry_location())?;
+fn _read_gta_location(gta_version: GTAVersion, ) -> windows_registry::Result<String> {
+    let steam_key = LOCAL_MACHINE.open("SOFTWARE\\WOW6432Node\\Rockstar Games\\Steam");
+    let is_steam = steam_key.is_ok();
+    debug!("Reading GTA V install location, version: {}, is_steam: {}", gta_version, is_steam);
+
+    let key = LOCAL_MACHINE.open(gta_version.registry_location(is_steam))?;
 
     key.get_string("InstallFolder")
 }
 
 impl GTAVersion {
-    fn registry_location(&self) -> &str {
+    fn registry_location(&self, is_steam: bool) -> &str {
         match self {
+            GTAVersion::Enhanced if !is_steam => "SOFTWARE\\WOW6432Node\\Rockstar Games\\GTAV Enhanced",
+            GTAVersion::Enhanced => "SOFTWARE\\WOW6432Node\\Rockstar Games\\GTA V Enhanced",
             GTAVersion::Legacy => "SOFTWARE\\WOW6432Node\\Rockstar Games\\Grand Theft Auto V",
-            GTAVersion::Enhanced => "SOFTWARE\\WOW6432Node\\Rockstar Games\\GTAV Enhanced"
         }
     }
 }

windows_helper/src/install_location.rs

@@ -50,7 +50,12 @@ private fun SegmentAllocator.allocateCStrings(vararg values: String) = slice_ref
 
 object WindowsAPI {
     fun readGtaLocation(version: GTAVersion) = Arena.ofConfined().use {
-        Path(readString { WindowsHelper.read_gta_location(it, version.ordinal.toByte())})
+        val result = WindowsHelper.read_gta_location(it, version.ordinal.toByte())
+        val string = readString { GtaInstallLocationResult.content(result) }
+        val isError = GtaInstallLocationResult.is_error(result)
+
+        if (isError) throw RuntimeException(string)
+        Path(string)
     }
 
     fun registerKeyboardHook() = WindowsHelper.register_keyboard_hook()