bump version, add no-omp cli arg

Author: AmyrAhmady

.github/workflows/build.yml

@@ -53,5 +53,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.vars.outputs.setup_artifact_name }}
-          path: src-tauri/target/i686-pc-windows-msvc/release/bundle/nsis/omp-launcher_1.6.1_x86-setup.exe
+          path: src-tauri/target/i686-pc-windows-msvc/release/bundle/nsis/omp-launcher_1.6.3_x86-setup.exe
           if-no-files-found: error

package.json

@@ -1,7 +1,7 @@
 {
   "name": "omp-launcher",
   "private": true,
-  "version": "1.6.1",
+  "version": "1.6.3",
   "type": "module",
   "homepage": "https://github.com/openmultiplayer/launcher",
   "author": "Amyr (iAmir) Ahmady (https://github.com/AmyrAhmady)",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "omp-launcher"
-version = "1.6.1"
+version = "1.6.3"
 description = "Open Multiplayer Launcher"
 authors = ["Amyr Ahmady (iAmir)"]
 license = ""
@@ -48,6 +48,7 @@ windows-sys = { version = "0.52.0", features = [
     "Win32_UI_Input_KeyboardAndMouse",
     "Win32_UI_Shell",
     "Win32_UI_WindowsAndMessaging",
+    "Win32_System_JobObjects"
 ] }
 winreg = "0.52.0"
 dll-syringe = "0.15.2"

src-tauri/Cargo.toml

@@ -18,8 +18,8 @@ ${StrLoc}
 
 !define MANUFACTURER "open"
 !define PRODUCTNAME "Open Multiplayer Launcher"
-!define VERSION "1.6.1"
-!define VERSIONWITHBUILD "1.6.1.0"
+!define VERSION "1.6.3"
+!define VERSIONWITHBUILD "1.6.3.0"
 !define SHORTDESCRIPTION "Open Multiplayer Launcher"
 !define INSTALLMODE "perMachine"
 !define LICENSE ""

src-tauri/nsis/installer.nsi

@@ -18,8 +18,8 @@ ${StrLoc}
 
 !define MANUFACTURER "open"
 !define PRODUCTNAME "Open Multiplayer Launcher"
-!define VERSION "1.6.1"
-!define VERSIONWITHBUILD "1.6.1.0"
+!define VERSION "1.6.3"
+!define VERSIONWITHBUILD "1.6.3.0"
 !define SHORTDESCRIPTION "Open Multiplayer Launcher"
 !define INSTALLMODE "perMachine"
 !define LICENSE ""

src-tauri/nsis/installer_manual.nsi

@@ -21,6 +21,9 @@ pub struct CliArgs {
 
     #[options(help = "game path to use for both game executable and samp.dll")]
     pub gamepath: Option<String>,
+
+    #[options(help = "disable omp-client injection")]
+    pub no_omp: bool,
 }
 
 impl CliArgs {
@@ -66,6 +69,7 @@ Options:
   -P, --password <PASSWORD>  Server password
   -n, --name <NAME>          Nickname
   -g, --gamepath <GAMEPATH>  Game path
+      --no-omp               Disable omp-client injection
             ",
             program_name
         );

src-tauri/src/cli.rs

@@ -16,13 +16,19 @@ pub async fn inject(
     password: &str,
     custom_game_exe: &str,
 ) -> std::result::Result<(), String> {
+    let actual_omp_file = if *crate::NO_OMP_FLAG.lock().unwrap() {
+        ""
+    } else {
+        omp_file
+    };
+
     match injector::run_samp(
         name,
         ip,
         port,
         exe,
         dll,
-        omp_file,
+        actual_omp_file,
         password,
         custom_game_exe,
     )

src-tauri/src/commands.rs

@@ -3,7 +3,9 @@ use dll_syringe::{process::OwnedProcess, Syringe};
 #[cfg(target_os = "windows")]
 use log::info;
 #[cfg(target_os = "windows")]
-use std::process::Command;
+use std::path::PathBuf;
+#[cfg(target_os = "windows")]
+use std::process::{Command, Stdio};
 
 #[cfg(target_os = "windows")]
 use crate::{constants::*, errors::*};
@@ -34,13 +36,25 @@ pub async fn run_samp(
     custom_game_exe: &str,
 ) -> Result<()> {
     // Prepare the command to spawn the executable
-    let mut target_game_exe = GTA_SA_EXECUTABLE.to_string();
-    if custom_game_exe.len() > 0 {
-        target_game_exe = custom_game_exe.to_string();
-    }
-    let mut cmd = Command::new(format!("{}/{}", executable_dir, target_game_exe));
+    let target_game_exe = if custom_game_exe.len() > 0 {
+        custom_game_exe.to_string()
+    } else {
+        GTA_SA_EXECUTABLE.to_string()
+    };
+
+    let exe_path = PathBuf::from(executable_dir).join(&target_game_exe);
+
+    let exe_path = exe_path.canonicalize().map_err(|e| {
+        LauncherError::Process(format!("Invalid executable path {:?}: {}", exe_path, e))
+    })?;
+
+    let mut cmd = Command::new(&exe_path);
 
     let mut ready_for_exec = cmd
+        .stdin(Stdio::null())
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .current_dir(executable_dir)
         .arg("-c")
         .arg("-n")
         .arg(name)
@@ -58,7 +72,12 @@ pub async fn run_samp(
     match process {
         Ok(p) => {
             inject_dll(p.id(), dll_path, 0, false)?;
-            inject_dll(p.id(), omp_file, 0, false)
+            info!("[run_samp] omp_file.is_empty(): {}", omp_file.is_empty());
+            if !omp_file.is_empty() {
+                inject_dll(p.id(), omp_file, 0, false)
+            } else {
+                Ok(())
+            }
         }
         Err(e) => {
             info!("[injector.rs] Process creation failed: {}", e);

src-tauri/src/injector.rs

@@ -32,6 +32,7 @@ use tauri::Manager;
 use tauri::PhysicalSize;
 
 static URI_SCHEME_VALUE: Mutex<String> = Mutex::new(String::new());
+static NO_OMP_FLAG: Mutex<bool> = Mutex::new(false);
 
 #[tauri::command]
 async fn get_uri_scheme_value() -> String {
@@ -95,6 +96,12 @@ async fn handle_cli_args() -> Result<()> {
         Ok(args) => {
             args.validate()?;
 
+            if args.no_omp {
+                if let Ok(mut flag) = NO_OMP_FLAG.lock() {
+                    *flag = true;
+                }
+            }
+
             if args.help {
                 CliArgs::print_help_and_exit(&raw_args[0]);
             }
@@ -117,13 +124,19 @@ async fn handle_cli_args() -> Result<()> {
                     OMP_CLIENT_DLL
                 );
 
+                let omp_path = if args.no_omp {
+                    ""
+                } else {
+                    &omp_client_path
+                };
+
                 run_samp(
                     args.name.as_ref().unwrap(),
                     args.host.as_ref().unwrap(),
                     args.port.unwrap(),
                     gamepath,
                     &format!("{}/{}", gamepath, SAMP_DLL),
-                    &omp_client_path,
+                    omp_path,
                     &password,
                     "",
                 )