From e892552460fc2dfe2899723de31fb215e36ab88a Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 6 Jun 2024 13:01:40 +0800 Subject: [PATCH] Change command to program --- README.md | 2 +- crates/nsis-process/src/lib.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3be5277..7538248 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A collection of NSIS plugins written in rust. | Plugin | Description | | -------------------------------------------------- | ------------------------------------------------------------------------ | -| [nsis-process](./crates/nsis-process/) | Find and Kill processes, and run command as unelevated user | +| [nsis-process](./crates/nsis-process/) | Find and Kill processes, and run program as unelevated user | | [nsis-semvercompare](./crates/nsis-semvercompare/) | Compare two semantic versions | | [nsis-tauri-utils](./crates/nsis-tauri-utils/) | A collection of all the above plugins into a single DLL for smaller size | diff --git a/crates/nsis-process/src/lib.rs b/crates/nsis-process/src/lib.rs index 4a77ba9..51e9ba2 100644 --- a/crates/nsis-process/src/lib.rs +++ b/crates/nsis-process/src/lib.rs @@ -122,16 +122,16 @@ fn KillProcessCurrentUser() -> Result<(), Error> { } } -/// Run command as unelevated user +/// Run program as unelevated user /// /// Needs 2 strings on the stack -/// $1: command +/// $1: program /// $2: arguments #[nsis_fn] fn RunAsUser() -> Result<(), Error> { - let command = popstr()?; + let program = popstr()?; let arguments = popstr()?; - if run_as_user(&command, &arguments) { + if run_as_user(&program, &arguments) { push(ZERO) } else { push(ONE) @@ -224,7 +224,7 @@ fn get_processes(name: &str) -> Vec { /// Return true if success /// /// Ported from https://devblogs.microsoft.com/oldnewthing/20190425-00/?p=102443 -unsafe fn run_as_user(command: &str, arguments: &str) -> bool { +unsafe fn run_as_user(program: &str, arguments: &str) -> bool { let hwnd = GetShellWindow(); if hwnd == 0 { return false; @@ -274,14 +274,14 @@ unsafe fn run_as_user(command: &str, arguments: &str) -> bool { lpAttributeList: attribute_list, }; let mut process_info: PROCESS_INFORMATION = mem::zeroed(); - let mut command_line = command.to_owned(); + let mut command_line = program.to_owned(); if !arguments.is_empty() { command_line.push(' '); command_line.push_str(arguments); } if CreateProcessW( - encode_utf16(command).as_ptr(), + encode_utf16(program).as_ptr(), encode_utf16(&command_line).as_mut_ptr(), ptr::null(), ptr::null(),