hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wallpaper get sid (#9058)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2024-08-14 18:09:47 +08:00 committed by GitHub
parent f6ab5cdcb2
commit 07cf1b4db5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/platform/windows.rs
View File

@ -2370,34 +2370,6 @@ fn get_license() -> Option<CustomServer> {
Some(lic) Some(lic)
} }
fn get_sid_of_user(username: &str) -> ResultType<String> {
let mut output = Command::new("wmic")
.args(&[
"useraccount",
"where",
&format!("name='{}'", username),
"get",
"sid",
"/value",
])
.creation_flags(CREATE_NO_WINDOW)
.stdout(Stdio::piped())
.spawn()?
.stdout
.ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Failed to open stdout"))?;
let mut result = String::new();
output.read_to_string(&mut result)?;
let sid_start_index = result
.find('=')
.map(|i| i + 1)
.ok_or(anyhow!("bad output format"))?;
if sid_start_index > 0 && sid_start_index < result.len() + 1 {
Ok(result[sid_start_index..].trim().to_string())
} else {
bail!("bad output format");
}
}
pub struct WallPaperRemover { pub struct WallPaperRemover {
old_path: String, old_path: String,
} }
@ -2433,12 +2405,7 @@ impl WallPaperRemover {
// https://www.makeuseof.com/find-desktop-wallpapers-file-location-windows-11/ // https://www.makeuseof.com/find-desktop-wallpapers-file-location-windows-11/
// https://superuser.com/questions/1218413/write-to-current-users-registry-through-a-different-admin-account // https://superuser.com/questions/1218413/write-to-current-users-registry-through-a-different-admin-account
let (hkcu, sid) = if is_root() { let (hkcu, sid) = if is_root() {
let username = get_active_username(); let sid = get_current_process_session_id().ok_or(anyhow!("failed to get sid"))?;
if username.is_empty() {
bail!("failed to get username");
}
let sid = get_sid_of_user(&username)?;
log::info!("username: {username}, sid: {sid}");
(RegKey::predef(HKEY_USERS), format!("{}\\", sid)) (RegKey::predef(HKEY_USERS), format!("{}\\", sid))
} else { } else {
(RegKey::predef(HKEY_CURRENT_USER), "".to_string()) (RegKey::predef(HKEY_CURRENT_USER), "".to_string())
@ -2612,8 +2579,7 @@ pub mod reg_display_settings {
new: (Vec<u8>, isize), new: (Vec<u8>, isize),
} }
pub fn read_reg_connectivity() -> ResultType<HashMap<String, HashMap<String, RegValue>>> pub fn read_reg_connectivity() -> ResultType<HashMap<String, HashMap<String, RegValue>>> {
{
let hklm = winreg::RegKey::predef(HKEY_LOCAL_MACHINE); let hklm = winreg::RegKey::predef(HKEY_LOCAL_MACHINE);
let reg_connectivity = hklm.open_subkey_with_flags( let reg_connectivity = hklm.open_subkey_with_flags(
format!("{}\\{}", REG_GRAPHICS_DRIVERS_PATH, REG_CONNECTIVITY_PATH), format!("{}\\{}", REG_GRAPHICS_DRIVERS_PATH, REG_CONNECTIVITY_PATH),