weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

privacy_mode_win_magnifier: remove unused win event hook

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2022-06-02 10:45:27 +08:00
parent fc1af7b0d9
commit 376c042666
2 changed files with 11 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/ui/win_privacy.rs
View File

@@ -314,6 +314,13 @@ fn wait_find_privacy_hwnd(msecs: u128) -> ResultType<HWND> {
}
}
pub fn is_process_consent_running() -> ResultType<bool> {
let output = std::process::Command::new("cmd")
.args(&["/C", "tasklist | findstr consent.exe"])
.output()?;
Ok(output.status.success() && !output.stdout.is_empty())
}
#[tokio::main(flavor = "current_thread")]
async fn set_privacy_mode_state(
conn_id: i32,
@@ -552,95 +559,6 @@ pub(super) mod privacy_hook {
}
}
pub mod win_event_hook {
use hbb_common::{bail, lazy_static, ResultType};
use std::sync::Mutex;
use winapi::{
shared::{
minwindef::DWORD,
ntdef::{LONG, NULL},
windef::{HWINEVENTHOOK, HWND},
winerror::RPC_E_CHANGED_MODE,
},
um::{
combaseapi::{CoInitializeEx, CoUninitialize},
objbase::COINIT_MULTITHREADED,
winuser::{
SetWinEventHook, UnhookWinEvent, EVENT_SYSTEM_DESKTOPSWITCH, WINEVENT_OUTOFCONTEXT,
WINEVENT_SKIPOWNPROCESS,
},
},
};
lazy_static::lazy_static! {
static ref DESKTOP_SWITCH: Mutex<bool> = Mutex::new(false);
}
pub fn is_desktop_switched() -> bool {
*DESKTOP_SWITCH.lock().unwrap()
}
pub fn reset_desktop_switch() {
*DESKTOP_SWITCH.lock().unwrap() = false;
}
pub struct WinEventHook {
hook: HWINEVENTHOOK,
}
impl WinEventHook {
fn create() -> ResultType<Self> {
unsafe {
if RPC_E_CHANGED_MODE == CoInitializeEx(NULL, COINIT_MULTITHREADED) {
bail!("Failed CoInitializeEx with RPC_E_CHANGED_MODE");
}
let hook = SetWinEventHook(
EVENT_SYSTEM_DESKTOPSWITCH,
EVENT_SYSTEM_DESKTOPSWITCH,
NULL as _,
Some(hook_win_event),
0,
0,
WINEVENT_OUTOFCONTEXT | WINEVENT_SKIPOWNPROCESS,
);
Ok(Self { hook })
}
}
}
impl Drop for WinEventHook {
fn drop(&mut self) {
unsafe {
UnhookWinEvent(self.hook);
CoUninitialize();
}
}
}
#[no_mangle]
pub extern "system" fn hook_win_event(
_hook: HWINEVENTHOOK,
event: DWORD,
_hwnd: HWND,
_id_object: LONG,
_id_child: LONG,
_dw_event_thread: DWORD,
_dwms_event_time: DWORD,
) {
if event == EVENT_SYSTEM_DESKTOPSWITCH {
*DESKTOP_SWITCH.lock().unwrap() = true;
}
}
pub fn is_process_consent_running() -> ResultType<bool> {
let output = std::process::Command::new("cmd")
.args(&["/C", "tasklist | findstr consent.exe"])
.output()?;
Ok(output.status.success() && !output.stdout.is_empty())
}
}
mod test {
#[test]
fn privacy_hook() {