Merge pull request #4082 from fufesou/refact/virtual_display_win
Refact/virtual display win
This commit is contained in:
commit
5cb22fb2dc
3
Cargo.lock
generated
3
Cargo.lock
generated
@ -2776,6 +2776,7 @@ dependencies = [
|
|||||||
"confy",
|
"confy",
|
||||||
"directories-next",
|
"directories-next",
|
||||||
"dirs-next",
|
"dirs-next",
|
||||||
|
"dlopen",
|
||||||
"env_logger 0.10.0",
|
"env_logger 0.10.0",
|
||||||
"filetime",
|
"filetime",
|
||||||
"flexi_logger",
|
"flexi_logger",
|
||||||
@ -5118,7 +5119,6 @@ dependencies = [
|
|||||||
"dbus-crossroads",
|
"dbus-crossroads",
|
||||||
"default-net",
|
"default-net",
|
||||||
"dispatch",
|
"dispatch",
|
||||||
"dlopen",
|
|
||||||
"enigo",
|
"enigo",
|
||||||
"errno",
|
"errno",
|
||||||
"evdev",
|
"evdev",
|
||||||
@ -6451,7 +6451,6 @@ version = "0.1.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"hbb_common",
|
"hbb_common",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"libloading",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
@ -31,6 +31,7 @@ default = ["use_dasp"]
|
|||||||
hwcodec = ["scrap/hwcodec"]
|
hwcodec = ["scrap/hwcodec"]
|
||||||
mediacodec = ["scrap/mediacodec"]
|
mediacodec = ["scrap/mediacodec"]
|
||||||
linux_headless = ["pam", "users"]
|
linux_headless = ["pam", "users"]
|
||||||
|
virtual_display_driver = ["virtual_display"]
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
@ -64,7 +65,6 @@ flutter_rust_bridge = { version = "1.61.1", optional = true }
|
|||||||
errno = "0.3"
|
errno = "0.3"
|
||||||
rdev = { git = "https://github.com/fufesou/rdev" }
|
rdev = { git = "https://github.com/fufesou/rdev" }
|
||||||
url = { version = "2.1", features = ["serde"] }
|
url = { version = "2.1", features = ["serde"] }
|
||||||
dlopen = "0.1"
|
|
||||||
crossbeam-queue = "0.3"
|
crossbeam-queue = "0.3"
|
||||||
hex = "0.4"
|
hex = "0.4"
|
||||||
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false }
|
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false }
|
||||||
@ -94,7 +94,7 @@ winit = "0.26"
|
|||||||
winapi = { version = "0.3", features = ["winuser", "wincrypt"] }
|
winapi = { version = "0.3", features = ["winuser", "wincrypt"] }
|
||||||
winreg = "0.10"
|
winreg = "0.10"
|
||||||
windows-service = "0.4"
|
windows-service = "0.4"
|
||||||
virtual_display = { path = "libs/virtual_display" }
|
virtual_display = { path = "libs/virtual_display", optional = true }
|
||||||
impersonate_system = { git = "https://github.com/21pages/impersonate-system" }
|
impersonate_system = { git = "https://github.com/21pages/impersonate-system" }
|
||||||
shared_memory = "0.12"
|
shared_memory = "0.12"
|
||||||
shutdown_hooks = "0.1"
|
shutdown_hooks = "0.1"
|
||||||
|
5
build.py
5
build.py
@ -41,8 +41,8 @@ def get_version():
|
|||||||
def parse_rc_features(feature):
|
def parse_rc_features(feature):
|
||||||
available_features = {
|
available_features = {
|
||||||
'IddDriver': {
|
'IddDriver': {
|
||||||
'zip_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.1/RustDeskIddDriver_x64.zip',
|
'zip_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.3/RustDeskIddDriver_x64.zip',
|
||||||
'checksum_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.1/checksum_md5',
|
'checksum_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.3/checksum_md5',
|
||||||
'exclude': ['README.md', 'certmgr.exe', 'install_cert_runas_admin.bat'],
|
'exclude': ['README.md', 'certmgr.exe', 'install_cert_runas_admin.bat'],
|
||||||
},
|
},
|
||||||
'PrivacyMode': {
|
'PrivacyMode': {
|
||||||
@ -242,6 +242,7 @@ def get_features(args):
|
|||||||
features = ['inline'] if not args.flutter else []
|
features = ['inline'] if not args.flutter else []
|
||||||
if windows:
|
if windows:
|
||||||
features.extend(get_rc_features(args))
|
features.extend(get_rc_features(args))
|
||||||
|
features.append('virtual_display_driver')
|
||||||
if args.hwcodec:
|
if args.hwcodec:
|
||||||
features.append('hwcodec')
|
features.append('hwcodec')
|
||||||
if args.flutter:
|
if args.flutter:
|
||||||
|
@ -34,6 +34,7 @@ tokio-socks = { git = "https://github.com/open-trade/tokio-socks" }
|
|||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
backtrace = "0.3"
|
backtrace = "0.3"
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
|
dlopen = "0.1"
|
||||||
|
|
||||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
||||||
mac_address = "1.1"
|
mac_address = "1.1"
|
||||||
|
@ -44,6 +44,8 @@ pub use libc;
|
|||||||
pub mod keyboard;
|
pub mod keyboard;
|
||||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||||
pub use sysinfo;
|
pub use sysinfo;
|
||||||
|
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||||
|
pub use dlopen;
|
||||||
|
|
||||||
#[cfg(feature = "quic")]
|
#[cfg(feature = "quic")]
|
||||||
pub type Stream = quic::Connection;
|
pub type Stream = quic::Connection;
|
||||||
|
@ -7,5 +7,4 @@ edition = "2021"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
lazy_static = "1.4"
|
lazy_static = "1.4"
|
||||||
libloading = "0.7"
|
|
||||||
hbb_common = { path = "../hbb_common" }
|
hbb_common = { path = "../hbb_common" }
|
@ -2,18 +2,21 @@
|
|||||||
pub mod win10;
|
pub mod win10;
|
||||||
|
|
||||||
use hbb_common::{bail, lazy_static, ResultType};
|
use hbb_common::{bail, lazy_static, ResultType};
|
||||||
use std::{path::Path, sync::Mutex};
|
use std::path::Path;
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
use std::sync::Mutex;
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
lazy_static::lazy_static! {
|
lazy_static::lazy_static! {
|
||||||
// If device is uninstalled though "Device Manager" Window.
|
// If device is uninstalled though "Device Manager" Window.
|
||||||
// Rustdesk is unable to handle device any more...
|
// Rustdesk is unable to handle device any more...
|
||||||
static ref H_SW_DEVICE: Mutex<u64> = Mutex::new(0);
|
static ref H_SW_DEVICE: Mutex<u64> = Mutex::new(0);
|
||||||
static ref MONITOR_PLUGIN: Mutex<Vec<u32>> = Mutex::new(Vec::new());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
pub fn get_dirver_install_path() -> &'static str {
|
pub fn get_driver_install_path() -> &'static str {
|
||||||
win10::DRIVER_INSTALL_PATH
|
win10::DRIVER_INSTALL_PATH
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,68 +140,48 @@ pub fn close_device() {
|
|||||||
unsafe {
|
unsafe {
|
||||||
win10::idd::DeviceClose(*H_SW_DEVICE.lock().unwrap() as win10::idd::HSWDEVICE);
|
win10::idd::DeviceClose(*H_SW_DEVICE.lock().unwrap() as win10::idd::HSWDEVICE);
|
||||||
*H_SW_DEVICE.lock().unwrap() = 0;
|
*H_SW_DEVICE.lock().unwrap() = 0;
|
||||||
MONITOR_PLUGIN.lock().unwrap().clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub fn plug_in_monitor() -> ResultType<()> {
|
pub fn plug_in_monitor(_monitor_index: u32, _edid: u32, _retries: u32) -> ResultType<()> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
unsafe {
|
unsafe {
|
||||||
let monitor_index = 0 as u32;
|
if win10::idd::MonitorPlugIn(_monitor_index as _, _edid as _, _retries as _)
|
||||||
let mut plug_in_monitors = MONITOR_PLUGIN.lock().unwrap();
|
== win10::idd::FALSE
|
||||||
for i in 0..plug_in_monitors.len() {
|
{
|
||||||
if let Some(d) = plug_in_monitors.get(i) {
|
bail!("{}", win10::get_last_msg()?);
|
||||||
if *d == monitor_index {
|
}
|
||||||
return Ok(());
|
}
|
||||||
}
|
Ok(())
|
||||||
};
|
}
|
||||||
}
|
|
||||||
if win10::idd::MonitorPlugIn(monitor_index, 0, 30) == win10::idd::FALSE {
|
#[no_mangle]
|
||||||
bail!("{}", win10::get_last_msg()?);
|
pub fn plug_out_monitor(_monitor_index: u32) -> ResultType<()> {
|
||||||
}
|
#[cfg(windows)]
|
||||||
(*plug_in_monitors).push(monitor_index);
|
unsafe {
|
||||||
}
|
if win10::idd::MonitorPlugOut(_monitor_index) == win10::idd::FALSE {
|
||||||
Ok(())
|
bail!("{}", win10::get_last_msg()?);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#[no_mangle]
|
Ok(())
|
||||||
pub fn plug_out_monitor() -> ResultType<()> {
|
}
|
||||||
#[cfg(windows)]
|
|
||||||
unsafe {
|
#[cfg(windows)]
|
||||||
let monitor_index = 0 as u32;
|
type PMonitorMode = win10::idd::PMonitorMode;
|
||||||
if win10::idd::MonitorPlugOut(monitor_index) == win10::idd::FALSE {
|
#[cfg(not(windows))]
|
||||||
bail!("{}", win10::get_last_msg()?);
|
type PMonitorMode = *mut std::ffi::c_void;
|
||||||
}
|
|
||||||
let mut plug_in_monitors = MONITOR_PLUGIN.lock().unwrap();
|
#[no_mangle]
|
||||||
for i in 0..plug_in_monitors.len() {
|
pub fn update_monitor_modes(
|
||||||
if let Some(d) = plug_in_monitors.get(i) {
|
_monitor_index: u32,
|
||||||
if *d == monitor_index {
|
_mode_count: u32,
|
||||||
plug_in_monitors.remove(i);
|
_modes: PMonitorMode,
|
||||||
break;
|
) -> ResultType<()> {
|
||||||
}
|
#[cfg(windows)]
|
||||||
};
|
unsafe {
|
||||||
}
|
if win10::idd::FALSE
|
||||||
}
|
== win10::idd::MonitorModesUpdate(_monitor_index as _, _mode_count as _, _modes)
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[no_mangle]
|
|
||||||
pub fn update_monitor_modes() -> ResultType<()> {
|
|
||||||
#[cfg(windows)]
|
|
||||||
unsafe {
|
|
||||||
let monitor_index = 0 as u32;
|
|
||||||
let mut modes = vec![win10::idd::MonitorMode {
|
|
||||||
width: 1920,
|
|
||||||
height: 1080,
|
|
||||||
sync: 60,
|
|
||||||
}];
|
|
||||||
if win10::idd::FALSE
|
|
||||||
== win10::idd::MonitorModesUpdate(
|
|
||||||
monitor_index as win10::idd::UINT,
|
|
||||||
modes.len() as win10::idd::UINT,
|
|
||||||
modes.as_mut_ptr(),
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
bail!("{}", win10::get_last_msg()?);
|
bail!("{}", win10::get_last_msg()?);
|
||||||
}
|
}
|
||||||
|
@ -196,7 +196,7 @@ BOOL DeviceCreate(PHSWDEVICE hSwDevice)
|
|||||||
}
|
}
|
||||||
if (created == TRUE)
|
if (created == TRUE)
|
||||||
{
|
{
|
||||||
SetLastMsg("Device is created before, please uninstall it first\n");
|
SetLastMsg("Device is already created, please destroy it first\n");
|
||||||
if (g_printMsg)
|
if (g_printMsg)
|
||||||
{
|
{
|
||||||
printf(g_lastMsg);
|
printf(g_lastMsg);
|
||||||
@ -288,7 +288,7 @@ BOOL MonitorPlugIn(UINT index, UINT edid, INT retries)
|
|||||||
|
|
||||||
if (retries < 0)
|
if (retries < 0)
|
||||||
{
|
{
|
||||||
SetLastMsg("invalid tries %d\n", retries);
|
SetLastMsg("Invalid tries %d\n", retries);
|
||||||
if (g_printMsg)
|
if (g_printMsg)
|
||||||
{
|
{
|
||||||
printf(g_lastMsg);
|
printf(g_lastMsg);
|
||||||
|
@ -3,7 +3,7 @@ use virtual_display;
|
|||||||
|
|
||||||
fn prompt_input() -> u8 {
|
fn prompt_input() -> u8 {
|
||||||
println!("Press key execute:");
|
println!("Press key execute:");
|
||||||
println!(" 1. 'x' 1. exit");
|
println!(" 1. 'q' 1. quit");
|
||||||
println!(" 2. 'i' 2. install or update driver");
|
println!(" 2. 'i' 2. install or update driver");
|
||||||
println!(" 3. 'u' 3. uninstall driver");
|
println!(" 3. 'u' 3. uninstall driver");
|
||||||
println!(" 4. 'c' 4. create device");
|
println!(" 4. 'c' 4. create device");
|
||||||
@ -18,18 +18,18 @@ fn prompt_input() -> u8 {
|
|||||||
.unwrap_or(0)
|
.unwrap_or(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn plug_in() {
|
fn plug_in(monitor_index: u32) {
|
||||||
println!("Plug in monitor begin");
|
println!("Plug in monitor begin");
|
||||||
if let Err(e) = virtual_display::plug_in_monitor() {
|
if let Err(e) = virtual_display::plug_in_monitor(monitor_index as _) {
|
||||||
println!("{}", e);
|
println!("{}", e);
|
||||||
} else {
|
} else {
|
||||||
println!("Plug in monitor done");
|
println!("Plug in monitor done");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn plug_out() {
|
fn plug_out(monitor_index: u32) {
|
||||||
println!("Plug out monitor begin");
|
println!("Plug out monitor begin");
|
||||||
if let Err(e) = virtual_display::plug_out_monitor() {
|
if let Err(e) = virtual_display::plug_out_monitor(monitor_index as _) {
|
||||||
println!("{}", e);
|
println!("{}", e);
|
||||||
} else {
|
} else {
|
||||||
println!("Plug out monitor done");
|
println!("Plug out monitor done");
|
||||||
@ -38,8 +38,9 @@ fn plug_out() {
|
|||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
loop {
|
loop {
|
||||||
match prompt_input() as char {
|
let chr = prompt_input();
|
||||||
'x' => break,
|
match chr as char {
|
||||||
|
'q' => break,
|
||||||
'i' => {
|
'i' => {
|
||||||
println!("Install or update driver begin");
|
println!("Install or update driver begin");
|
||||||
let mut reboot_required = false;
|
let mut reboot_required = false;
|
||||||
@ -81,8 +82,12 @@ fn main() {
|
|||||||
virtual_display::close_device();
|
virtual_display::close_device();
|
||||||
println!("Close device done");
|
println!("Close device done");
|
||||||
}
|
}
|
||||||
'1' => plug_in(),
|
'1' => plug_in(0),
|
||||||
'4' => plug_out(),
|
'2' => plug_in(1),
|
||||||
|
'3' => plug_in(2),
|
||||||
|
'4' => plug_out(0),
|
||||||
|
'5' => plug_out(1),
|
||||||
|
'6' => plug_out(2),
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,96 @@
|
|||||||
use hbb_common::{bail, ResultType};
|
use hbb_common::{anyhow, dlopen::symbor::Library, log, ResultType};
|
||||||
use std::sync::{Arc, Mutex};
|
use std::{
|
||||||
|
collections::HashSet,
|
||||||
|
sync::{Arc, Mutex},
|
||||||
|
};
|
||||||
|
|
||||||
const LIB_NAME_VIRTUAL_DISPLAY: &str = "dylib_virtual_display";
|
const LIB_NAME_VIRTUAL_DISPLAY: &str = "dylib_virtual_display";
|
||||||
|
|
||||||
lazy_static::lazy_static! {
|
pub type DWORD = ::std::os::raw::c_ulong;
|
||||||
static ref LIB_VIRTUAL_DISPLAY: Arc<Mutex<Result<libloading::Library, libloading::Error>>> = {
|
#[repr(C)]
|
||||||
Arc::new(Mutex::new(unsafe { libloading::Library::new(get_lib_name()) }))
|
#[derive(Debug, Copy, Clone)]
|
||||||
|
pub struct _MonitorMode {
|
||||||
|
pub width: DWORD,
|
||||||
|
pub height: DWORD,
|
||||||
|
pub sync: DWORD,
|
||||||
|
}
|
||||||
|
pub type MonitorMode = _MonitorMode;
|
||||||
|
pub type PMonitorMode = *mut MonitorMode;
|
||||||
|
|
||||||
|
pub type GetDriverInstallPath = fn() -> &'static str;
|
||||||
|
pub type IsDeviceCreated = fn() -> bool;
|
||||||
|
pub type CloseDevice = fn();
|
||||||
|
pub type DownLoadDriver = fn() -> ResultType<()>;
|
||||||
|
pub type CreateDevice = fn() -> ResultType<()>;
|
||||||
|
pub type InstallUpdateDriver = fn(&mut bool) -> ResultType<()>;
|
||||||
|
pub type UninstallDriver = fn(&mut bool) -> ResultType<()>;
|
||||||
|
pub type PlugInMonitor = fn(u32) -> ResultType<()>;
|
||||||
|
pub type PlugOutMonitor = fn(u32) -> ResultType<()>;
|
||||||
|
pub type UpdateMonitorModes = fn(u32, u32, PMonitorMode) -> ResultType<()>;
|
||||||
|
|
||||||
|
macro_rules! make_lib_wrapper {
|
||||||
|
($($field:ident : $tp:ty),+) => {
|
||||||
|
struct LibWrapper {
|
||||||
|
_lib: Option<Library>,
|
||||||
|
$($field: Option<$tp>),+
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LibWrapper {
|
||||||
|
fn new() -> Self {
|
||||||
|
let lib = match Library::open(get_lib_name()) {
|
||||||
|
Ok(lib) => Some(lib),
|
||||||
|
Err(e) => {
|
||||||
|
log::warn!("Failed to load library {}, {}", LIB_NAME_VIRTUAL_DISPLAY, e);
|
||||||
|
None
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$(let $field = if let Some(lib) = &lib {
|
||||||
|
match unsafe { lib.symbol::<$tp>(stringify!($field)) } {
|
||||||
|
Ok(m) => {
|
||||||
|
log::info!("method found {}", stringify!($field));
|
||||||
|
Some(*m)
|
||||||
|
},
|
||||||
|
Err(e) => {
|
||||||
|
log::warn!("Failed to load func {}, {}", stringify!($field), e);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};)+
|
||||||
|
|
||||||
|
Self {
|
||||||
|
_lib: lib,
|
||||||
|
$( $field ),+
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for LibWrapper {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
make_lib_wrapper!(
|
||||||
|
get_driver_install_path: GetDriverInstallPath,
|
||||||
|
is_device_created: IsDeviceCreated,
|
||||||
|
close_device: CloseDevice,
|
||||||
|
download_driver: DownLoadDriver,
|
||||||
|
create_device: CreateDevice,
|
||||||
|
install_update_driver: InstallUpdateDriver,
|
||||||
|
uninstall_driver: UninstallDriver,
|
||||||
|
plug_in_monitor: PlugInMonitor,
|
||||||
|
plug_out_monitor: PlugOutMonitor,
|
||||||
|
update_monitor_modes: UpdateMonitorModes
|
||||||
|
);
|
||||||
|
|
||||||
|
lazy_static::lazy_static! {
|
||||||
|
static ref LIB_WRAPPER: Arc<Mutex<LibWrapper>> = Default::default();
|
||||||
|
static ref MONITOR_INDICES: Mutex<HashSet<u32>> = Mutex::new(HashSet::new());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
@ -24,102 +108,90 @@ fn get_lib_name() -> String {
|
|||||||
format!("lib{}.dylib", LIB_NAME_VIRTUAL_DISPLAY)
|
format!("lib{}.dylib", LIB_NAME_VIRTUAL_DISPLAY)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn try_reload_lib() {
|
|
||||||
let mut lock = LIB_VIRTUAL_DISPLAY.lock().unwrap();
|
|
||||||
if lock.is_err() {
|
|
||||||
*lock = unsafe { libloading::Library::new(get_lib_name()) };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
pub fn get_dirver_install_path() -> ResultType<&'static str> {
|
pub fn get_driver_install_path() -> Option<&'static str> {
|
||||||
try_reload_lib();
|
Some(LIB_WRAPPER.lock().unwrap().get_driver_install_path?())
|
||||||
match &*LIB_VIRTUAL_DISPLAY.lock().unwrap() {
|
|
||||||
Ok(lib) => unsafe {
|
|
||||||
match lib.get::<libloading::Symbol<fn() -> &'static str>>(b"get_dirver_install_path") {
|
|
||||||
Ok(func) => Ok(func()),
|
|
||||||
Err(e) => bail!("Failed to load func get_dirver_install_path, {}", e),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(e) => bail!("Failed to load library {}, {}", LIB_NAME_VIRTUAL_DISPLAY, e),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_device_created() -> bool {
|
pub fn is_device_created() -> bool {
|
||||||
try_reload_lib();
|
LIB_WRAPPER
|
||||||
match &*LIB_VIRTUAL_DISPLAY.lock().unwrap() {
|
.lock()
|
||||||
Ok(lib) => unsafe {
|
.unwrap()
|
||||||
match lib.get::<libloading::Symbol<fn() -> bool>>(b"is_device_created") {
|
.is_device_created
|
||||||
Ok(func) => func(),
|
.map(|f| f())
|
||||||
Err(..) => false,
|
.unwrap_or(false)
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(..) => false,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn close_device() {
|
pub fn close_device() {
|
||||||
try_reload_lib();
|
let _r = LIB_WRAPPER.lock().unwrap().close_device.map(|f| f());
|
||||||
match &*LIB_VIRTUAL_DISPLAY.lock().unwrap() {
|
|
||||||
Ok(lib) => unsafe {
|
|
||||||
match lib.get::<libloading::Symbol<fn()>>(b"close_device") {
|
|
||||||
Ok(func) => func(),
|
|
||||||
Err(..) => {}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(..) => {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! def_func_result {
|
pub fn download_driver() -> ResultType<()> {
|
||||||
($func:ident, $name: tt) => {
|
LIB_WRAPPER
|
||||||
pub fn $func() -> ResultType<()> {
|
.lock()
|
||||||
try_reload_lib();
|
.unwrap()
|
||||||
match &*LIB_VIRTUAL_DISPLAY.lock().unwrap() {
|
.download_driver
|
||||||
Ok(lib) => unsafe {
|
.ok_or(anyhow::Error::msg("download_driver method not found"))?()
|
||||||
match lib.get::<libloading::Symbol<fn() -> ResultType<()>>>($name.as_bytes()) {
|
|
||||||
Ok(func) => func(),
|
|
||||||
Err(e) => bail!("Failed to load func {}, {}", $name, e),
|
|
||||||
}
|
}
|
||||||
},
|
|
||||||
Err(e) => bail!("Failed to load library {}, {}", LIB_NAME_VIRTUAL_DISPLAY, e),
|
pub fn create_device() -> ResultType<()> {
|
||||||
}
|
LIB_WRAPPER
|
||||||
}
|
.lock()
|
||||||
};
|
.unwrap()
|
||||||
|
.create_device
|
||||||
|
.ok_or(anyhow::Error::msg("create_device method not found"))?()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn install_update_driver(reboot_required: &mut bool) -> ResultType<()> {
|
pub fn install_update_driver(reboot_required: &mut bool) -> ResultType<()> {
|
||||||
try_reload_lib();
|
LIB_WRAPPER
|
||||||
match &*LIB_VIRTUAL_DISPLAY.lock().unwrap() {
|
.lock()
|
||||||
Ok(lib) => unsafe {
|
.unwrap()
|
||||||
match lib.get::<libloading::Symbol<fn(&mut bool) -> ResultType<()>>>(
|
.install_update_driver
|
||||||
b"install_update_driver",
|
.ok_or(anyhow::Error::msg("install_update_driver method not found"))?(reboot_required)
|
||||||
) {
|
|
||||||
Ok(func) => func(reboot_required),
|
|
||||||
Err(e) => bail!("Failed to load func install_update_driver, {}", e),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(e) => bail!("Failed to load library {}, {}", LIB_NAME_VIRTUAL_DISPLAY, e),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn uninstall_driver(reboot_required: &mut bool) -> ResultType<()> {
|
pub fn uninstall_driver(reboot_required: &mut bool) -> ResultType<()> {
|
||||||
try_reload_lib();
|
LIB_WRAPPER
|
||||||
match &*LIB_VIRTUAL_DISPLAY.lock().unwrap() {
|
.lock()
|
||||||
Ok(lib) => unsafe {
|
.unwrap()
|
||||||
match lib
|
.uninstall_driver
|
||||||
.get::<libloading::Symbol<fn(&mut bool) -> ResultType<()>>>(b"uninstall_driver")
|
.ok_or(anyhow::Error::msg("uninstall_driver method not found"))?(reboot_required)
|
||||||
{
|
|
||||||
Ok(func) => func(reboot_required),
|
|
||||||
Err(e) => bail!("Failed to load func uninstall_driver, {}", e),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(e) => bail!("Failed to load library {}, {}", LIB_NAME_VIRTUAL_DISPLAY, e),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def_func_result!(download_driver, "download_driver");
|
#[cfg(windows)]
|
||||||
def_func_result!(create_device, "create_device");
|
pub fn plug_in_monitor(monitor_index: u32) -> ResultType<()> {
|
||||||
def_func_result!(plug_in_monitor, "plug_in_monitor");
|
let mut lock = MONITOR_INDICES.lock().unwrap();
|
||||||
def_func_result!(plug_out_monitor, "plug_out_monitor");
|
if lock.contains(&monitor_index) {
|
||||||
def_func_result!(update_monitor_modes, "update_monitor_modes");
|
return Ok(());
|
||||||
|
}
|
||||||
|
let f = LIB_WRAPPER
|
||||||
|
.lock()
|
||||||
|
.unwrap()
|
||||||
|
.plug_in_monitor
|
||||||
|
.ok_or(anyhow::Error::msg("plug_in_monitor method not found"))?;
|
||||||
|
f(monitor_index)?;
|
||||||
|
lock.insert(monitor_index);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn plug_out_monitor(monitor_index: u32) -> ResultType<()> {
|
||||||
|
let f = LIB_WRAPPER
|
||||||
|
.lock()
|
||||||
|
.unwrap()
|
||||||
|
.plug_out_monitor
|
||||||
|
.ok_or(anyhow::Error::msg("plug_out_monitor method not found"))?;
|
||||||
|
f(monitor_index)?;
|
||||||
|
MONITOR_INDICES.lock().unwrap().remove(&monitor_index);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn update_monitor_modes(monitor_index: u32, modes: &[MonitorMode]) -> ResultType<()> {
|
||||||
|
let f = LIB_WRAPPER
|
||||||
|
.lock()
|
||||||
|
.unwrap()
|
||||||
|
.update_monitor_modes
|
||||||
|
.ok_or(anyhow::Error::msg("update_monitor_modes method not found"))?;
|
||||||
|
f(monitor_index, modes.len() as _, modes.as_ptr() as _)
|
||||||
|
}
|
||||||
|
@ -3,18 +3,19 @@ use crate::{
|
|||||||
flutter_ffi::EventToUI,
|
flutter_ffi::EventToUI,
|
||||||
ui_session_interface::{io_loop, InvokeUiSession, Session},
|
ui_session_interface::{io_loop, InvokeUiSession, Session},
|
||||||
};
|
};
|
||||||
#[cfg(feature = "flutter_texture_render")]
|
|
||||||
use dlopen::{
|
|
||||||
symbor::{Library, Symbol},
|
|
||||||
Error as LibError,
|
|
||||||
};
|
|
||||||
use flutter_rust_bridge::StreamSink;
|
use flutter_rust_bridge::StreamSink;
|
||||||
#[cfg(feature = "flutter_texture_render")]
|
|
||||||
use hbb_common::libc::c_void;
|
|
||||||
use hbb_common::{
|
use hbb_common::{
|
||||||
bail, config::LocalConfig, get_version_number, log, message_proto::*,
|
bail, config::LocalConfig, get_version_number, log, message_proto::*,
|
||||||
rendezvous_proto::ConnType, ResultType,
|
rendezvous_proto::ConnType, ResultType,
|
||||||
};
|
};
|
||||||
|
#[cfg(feature = "flutter_texture_render")]
|
||||||
|
use hbb_common::{
|
||||||
|
dlopen::{
|
||||||
|
symbor::{Library, Symbol},
|
||||||
|
Error as LibError,
|
||||||
|
},
|
||||||
|
libc::c_void,
|
||||||
|
};
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
|
|
||||||
#[cfg(not(feature = "flutter_texture_render"))]
|
#[cfg(not(feature = "flutter_texture_render"))]
|
||||||
|
@ -66,5 +66,9 @@ pub mod clipboard_file;
|
|||||||
|
|
||||||
#[cfg(all(windows, feature = "with_rc"))]
|
#[cfg(all(windows, feature = "with_rc"))]
|
||||||
pub mod rc;
|
pub mod rc;
|
||||||
#[cfg(target_os = "windows")]
|
|
||||||
pub mod win_privacy;
|
#[cfg(windows)]
|
||||||
|
pub mod privacy_win_mag;
|
||||||
|
|
||||||
|
#[cfg(all(windows, feature = "virtual_display_driver"))]
|
||||||
|
pub mod virtual_display_manager;
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
use super::{CursorData, ResultType};
|
use super::{CursorData, ResultType};
|
||||||
use crate::common::PORTABLE_APPNAME_RUNTIME_ENV_KEY;
|
use crate::common::PORTABLE_APPNAME_RUNTIME_ENV_KEY;
|
||||||
use crate::ipc;
|
use crate::{
|
||||||
use crate::license::*;
|
ipc,
|
||||||
|
license::*,
|
||||||
|
privacy_win_mag::{self, WIN_MAG_INJECTED_PROCESS_EXE},
|
||||||
|
};
|
||||||
use hbb_common::{
|
use hbb_common::{
|
||||||
allow_err, bail,
|
allow_err, bail,
|
||||||
config::{self, Config},
|
config::{self, Config},
|
||||||
@ -838,8 +841,8 @@ fn get_default_install_path() -> String {
|
|||||||
|
|
||||||
pub fn check_update_broker_process() -> ResultType<()> {
|
pub fn check_update_broker_process() -> ResultType<()> {
|
||||||
// let (_, path, _, _) = get_install_info();
|
// let (_, path, _, _) = get_install_info();
|
||||||
let process_exe = crate::win_privacy::INJECTED_PROCESS_EXE;
|
let process_exe = privacy_win_mag::INJECTED_PROCESS_EXE;
|
||||||
let origin_process_exe = crate::win_privacy::ORIGIN_PROCESS_EXE;
|
let origin_process_exe = privacy_win_mag::ORIGIN_PROCESS_EXE;
|
||||||
|
|
||||||
let exe_file = std::env::current_exe()?;
|
let exe_file = std::env::current_exe()?;
|
||||||
if exe_file.parent().is_none() {
|
if exe_file.parent().is_none() {
|
||||||
@ -921,8 +924,7 @@ pub fn copy_raw_cmd(src_raw: &str, _raw: &str, _path: &str) -> String {
|
|||||||
|
|
||||||
pub fn copy_exe_cmd(src_exe: &str, exe: &str, path: &str) -> String {
|
pub fn copy_exe_cmd(src_exe: &str, exe: &str, path: &str) -> String {
|
||||||
let main_exe = copy_raw_cmd(src_exe, exe, path);
|
let main_exe = copy_raw_cmd(src_exe, exe, path);
|
||||||
|
format!(
|
||||||
return format!(
|
|
||||||
"
|
"
|
||||||
{main_exe}
|
{main_exe}
|
||||||
copy /Y \"{ORIGIN_PROCESS_EXE}\" \"{path}\\{broker_exe}\"
|
copy /Y \"{ORIGIN_PROCESS_EXE}\" \"{path}\\{broker_exe}\"
|
||||||
@ -930,9 +932,9 @@ pub fn copy_exe_cmd(src_exe: &str, exe: &str, path: &str) -> String {
|
|||||||
",
|
",
|
||||||
main_exe = main_exe,
|
main_exe = main_exe,
|
||||||
path = path,
|
path = path,
|
||||||
ORIGIN_PROCESS_EXE = crate::win_privacy::ORIGIN_PROCESS_EXE,
|
ORIGIN_PROCESS_EXE = privacy_win_mag::ORIGIN_PROCESS_EXE,
|
||||||
broker_exe = crate::win_privacy::INJECTED_PROCESS_EXE,
|
broker_exe = privacy_win_mag::INJECTED_PROCESS_EXE,
|
||||||
);
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_me() -> ResultType<()> {
|
pub fn update_me() -> ResultType<()> {
|
||||||
@ -963,7 +965,7 @@ pub fn update_me() -> ResultType<()> {
|
|||||||
",
|
",
|
||||||
copy_exe = copy_exe_cmd(&src_exe, &exe, &path),
|
copy_exe = copy_exe_cmd(&src_exe, &exe, &path),
|
||||||
copy_dll = copy_dll,
|
copy_dll = copy_dll,
|
||||||
broker_exe = crate::win_privacy::INJECTED_PROCESS_EXE,
|
broker_exe = WIN_MAG_INJECTED_PROCESS_EXE,
|
||||||
app_name = crate::get_app_name(),
|
app_name = crate::get_app_name(),
|
||||||
lic = register_licence(),
|
lic = register_licence(),
|
||||||
cur_pid = get_current_pid(),
|
cur_pid = get_current_pid(),
|
||||||
@ -1257,7 +1259,7 @@ fn get_before_uninstall(kill_self: bool) -> String {
|
|||||||
netsh advfirewall firewall delete rule name=\"{app_name} Service\"
|
netsh advfirewall firewall delete rule name=\"{app_name} Service\"
|
||||||
",
|
",
|
||||||
app_name = app_name,
|
app_name = app_name,
|
||||||
broker_exe = crate::win_privacy::INJECTED_PROCESS_EXE,
|
broker_exe = WIN_MAG_INJECTED_PROCESS_EXE,
|
||||||
ext = ext,
|
ext = ext,
|
||||||
filter = filter,
|
filter = filter,
|
||||||
)
|
)
|
||||||
@ -2180,6 +2182,14 @@ pub fn get_unicode_from_vk(vk: u32) -> Option<u16> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn is_process_consent_running() -> ResultType<bool> {
|
||||||
|
let output = std::process::Command::new("cmd")
|
||||||
|
.args(&["/C", "tasklist | findstr consent.exe"])
|
||||||
|
.creation_flags(CREATE_NO_WINDOW)
|
||||||
|
.output()?;
|
||||||
|
Ok(output.status.success() && !output.stdout.is_empty())
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
@ -5,7 +5,6 @@ use crate::{
|
|||||||
use hbb_common::{allow_err, bail, lazy_static, log, tokio, ResultType};
|
use hbb_common::{allow_err, bail, lazy_static, log, tokio, ResultType};
|
||||||
use std::{
|
use std::{
|
||||||
ffi::CString,
|
ffi::CString,
|
||||||
os::windows::process::CommandExt,
|
|
||||||
sync::Mutex,
|
sync::Mutex,
|
||||||
time::{Duration, Instant},
|
time::{Duration, Instant},
|
||||||
};
|
};
|
||||||
@ -25,18 +24,22 @@ use winapi::{
|
|||||||
CreateProcessAsUserW, GetCurrentThreadId, QueueUserAPC, ResumeThread,
|
CreateProcessAsUserW, GetCurrentThreadId, QueueUserAPC, ResumeThread,
|
||||||
PROCESS_INFORMATION, STARTUPINFOW,
|
PROCESS_INFORMATION, STARTUPINFOW,
|
||||||
},
|
},
|
||||||
winbase::{
|
winbase::{WTSGetActiveConsoleSessionId, CREATE_SUSPENDED, DETACHED_PROCESS},
|
||||||
WTSGetActiveConsoleSessionId, CREATE_NO_WINDOW, CREATE_SUSPENDED, DETACHED_PROCESS,
|
|
||||||
},
|
|
||||||
winnt::{MEM_COMMIT, PAGE_READWRITE},
|
winnt::{MEM_COMMIT, PAGE_READWRITE},
|
||||||
winuser::*,
|
winuser::*,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
pub const ORIGIN_PROCESS_EXE: &'static str = "C:\\Windows\\System32\\RuntimeBroker.exe";
|
pub const ORIGIN_PROCESS_EXE: &'static str = "C:\\Windows\\System32\\RuntimeBroker.exe";
|
||||||
pub const INJECTED_PROCESS_EXE: &'static str = "RuntimeBroker_rustdesk.exe";
|
pub const WIN_MAG_INJECTED_PROCESS_EXE: &'static str = "RuntimeBroker_rustdesk.exe";
|
||||||
|
pub const INJECTED_PROCESS_EXE: &'static str = WIN_MAG_INJECTED_PROCESS_EXE;
|
||||||
pub const PRIVACY_WINDOW_NAME: &'static str = "RustDeskPrivacyWindow";
|
pub const PRIVACY_WINDOW_NAME: &'static str = "RustDeskPrivacyWindow";
|
||||||
|
|
||||||
|
pub const OCCUPIED: &'static str = "Privacy occupied by another one";
|
||||||
|
pub const TURN_OFF_OTHER_ID: &'static str =
|
||||||
|
"Failed to turn off privacy mode that belongs to someone else";
|
||||||
|
pub const NO_DISPLAYS: &'static str = "No displays";
|
||||||
|
|
||||||
pub const GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT: u32 = 2;
|
pub const GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT: u32 = 2;
|
||||||
pub const GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS: u32 = 4;
|
pub const GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS: u32 = 4;
|
||||||
|
|
||||||
@ -317,14 +320,6 @@ 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"])
|
|
||||||
.creation_flags(CREATE_NO_WINDOW)
|
|
||||||
.output()?;
|
|
||||||
Ok(output.status.success() && !output.stdout.is_empty())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::main(flavor = "current_thread")]
|
#[tokio::main(flavor = "current_thread")]
|
||||||
async fn set_privacy_mode_state(
|
async fn set_privacy_mode_state(
|
||||||
conn_id: i32,
|
conn_id: i32,
|
@ -2346,13 +2346,13 @@ fn try_activate_screen() {
|
|||||||
|
|
||||||
mod privacy_mode {
|
mod privacy_mode {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
#[cfg(windows)]
|
||||||
|
use crate::privacy_win_mag;
|
||||||
|
|
||||||
pub(super) fn turn_off_privacy(_conn_id: i32) -> Message {
|
pub(super) fn turn_off_privacy(_conn_id: i32) -> Message {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
use crate::win_privacy::*;
|
let res = privacy_win_mag::turn_off_privacy(_conn_id, None);
|
||||||
|
|
||||||
let res = turn_off_privacy(_conn_id, None);
|
|
||||||
match res {
|
match res {
|
||||||
Ok(_) => crate::common::make_privacy_mode_msg(
|
Ok(_) => crate::common::make_privacy_mode_msg(
|
||||||
back_notification::PrivacyModeState::PrvOffSucceeded,
|
back_notification::PrivacyModeState::PrvOffSucceeded,
|
||||||
@ -2374,7 +2374,7 @@ mod privacy_mode {
|
|||||||
pub(super) fn turn_on_privacy(_conn_id: i32) -> ResultType<bool> {
|
pub(super) fn turn_on_privacy(_conn_id: i32) -> ResultType<bool> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
let plugin_exist = crate::win_privacy::turn_on_privacy(_conn_id)?;
|
let plugin_exist = privacy_win_mag::turn_on_privacy(_conn_id)?;
|
||||||
Ok(plugin_exist)
|
Ok(plugin_exist)
|
||||||
}
|
}
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
|
@ -19,6 +19,10 @@
|
|||||||
// https://slhck.info/video/2017/03/01/rate-control.html
|
// https://slhck.info/video/2017/03/01/rate-control.html
|
||||||
|
|
||||||
use super::{video_qos::VideoQoS, *};
|
use super::{video_qos::VideoQoS, *};
|
||||||
|
#[cfg(all(windows, feature = "virtual_display_driver"))]
|
||||||
|
use crate::virtual_display_manager;
|
||||||
|
#[cfg(windows)]
|
||||||
|
use crate::{platform::windows::is_process_consent_running, privacy_win_mag};
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
use hbb_common::get_version_number;
|
use hbb_common::get_version_number;
|
||||||
use hbb_common::tokio::sync::{
|
use hbb_common::tokio::sync::{
|
||||||
@ -41,8 +45,6 @@ use std::{
|
|||||||
ops::{Deref, DerefMut},
|
ops::{Deref, DerefMut},
|
||||||
time::{self, Duration, Instant},
|
time::{self, Duration, Instant},
|
||||||
};
|
};
|
||||||
#[cfg(windows)]
|
|
||||||
use virtual_display;
|
|
||||||
|
|
||||||
pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version.";
|
pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version.";
|
||||||
pub const SCRAP_OTHER_VERSION_OR_X11_REQUIRED: &str =
|
pub const SCRAP_OTHER_VERSION_OR_X11_REQUIRED: &str =
|
||||||
@ -208,8 +210,6 @@ fn create_capturer(
|
|||||||
if privacy_mode_id > 0 {
|
if privacy_mode_id > 0 {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
use crate::win_privacy::*;
|
|
||||||
|
|
||||||
match scrap::CapturerMag::new(
|
match scrap::CapturerMag::new(
|
||||||
display.origin(),
|
display.origin(),
|
||||||
display.width(),
|
display.width(),
|
||||||
@ -220,7 +220,7 @@ fn create_capturer(
|
|||||||
let mut ok = false;
|
let mut ok = false;
|
||||||
let check_begin = Instant::now();
|
let check_begin = Instant::now();
|
||||||
while check_begin.elapsed().as_secs() < 5 {
|
while check_begin.elapsed().as_secs() < 5 {
|
||||||
match c1.exclude("", PRIVACY_WINDOW_NAME) {
|
match c1.exclude("", privacy_win_mag::PRIVACY_WINDOW_NAME) {
|
||||||
Ok(false) => {
|
Ok(false) => {
|
||||||
ok = false;
|
ok = false;
|
||||||
std::thread::sleep(std::time::Duration::from_millis(500));
|
std::thread::sleep(std::time::Duration::from_millis(500));
|
||||||
@ -229,7 +229,7 @@ fn create_capturer(
|
|||||||
bail!(
|
bail!(
|
||||||
"Failed to exclude privacy window {} - {}, err: {}",
|
"Failed to exclude privacy window {} - {}, err: {}",
|
||||||
"",
|
"",
|
||||||
PRIVACY_WINDOW_NAME,
|
privacy_win_mag::PRIVACY_WINDOW_NAME,
|
||||||
e
|
e
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -243,7 +243,7 @@ fn create_capturer(
|
|||||||
bail!(
|
bail!(
|
||||||
"Failed to exclude privacy window {} - {} ",
|
"Failed to exclude privacy window {} - {} ",
|
||||||
"",
|
"",
|
||||||
PRIVACY_WINDOW_NAME
|
privacy_win_mag::PRIVACY_WINDOW_NAME
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
log::debug!("Create magnifier capture for {}", privacy_mode_id);
|
log::debug!("Create magnifier capture for {}", privacy_mode_id);
|
||||||
@ -275,18 +275,12 @@ fn create_capturer(
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
// to-do: do not close if in privacy mode.
|
||||||
|
#[cfg(all(windows, feature = "virtual_display_driver"))]
|
||||||
fn ensure_close_virtual_device() -> ResultType<()> {
|
fn ensure_close_virtual_device() -> ResultType<()> {
|
||||||
let num_displays = Display::all()?.len();
|
let num_displays = Display::all()?.len();
|
||||||
if num_displays == 0 {
|
if num_displays > 1 {
|
||||||
// Device may sometimes be uninstalled by user in "Device Manager" Window.
|
virtual_display_manager::plug_out_headless();
|
||||||
// Closing device will clear the instance data.
|
|
||||||
virtual_display::close_device();
|
|
||||||
} else if num_displays > 1 {
|
|
||||||
// Try close device, if display device changed.
|
|
||||||
if virtual_display::is_device_created() {
|
|
||||||
virtual_display::close_device();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@ -309,11 +303,11 @@ pub fn test_create_capturer(privacy_mode_id: i32, timeout_millis: u64) -> bool {
|
|||||||
fn check_uac_switch(privacy_mode_id: i32, capturer_privacy_mode_id: i32) -> ResultType<()> {
|
fn check_uac_switch(privacy_mode_id: i32, capturer_privacy_mode_id: i32) -> ResultType<()> {
|
||||||
if capturer_privacy_mode_id != 0 {
|
if capturer_privacy_mode_id != 0 {
|
||||||
if privacy_mode_id != capturer_privacy_mode_id {
|
if privacy_mode_id != capturer_privacy_mode_id {
|
||||||
if !crate::win_privacy::is_process_consent_running()? {
|
if !is_process_consent_running()? {
|
||||||
bail!("consent.exe is running");
|
bail!("consent.exe is running");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if crate::win_privacy::is_process_consent_running()? {
|
if is_process_consent_running()? {
|
||||||
bail!("consent.exe is running");
|
bail!("consent.exe is running");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -374,7 +368,7 @@ fn get_capturer(use_yuv: bool, portable_service_running: bool) -> ResultType<Cap
|
|||||||
let mut capturer_privacy_mode_id = privacy_mode_id;
|
let mut capturer_privacy_mode_id = privacy_mode_id;
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
if capturer_privacy_mode_id != 0 {
|
if capturer_privacy_mode_id != 0 {
|
||||||
if crate::win_privacy::is_process_consent_running()? {
|
if is_process_consent_running()? {
|
||||||
capturer_privacy_mode_id = 0;
|
capturer_privacy_mode_id = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -447,7 +441,7 @@ fn check_get_displays_changed_msg() -> Option<Message> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn run(sp: GenericService) -> ResultType<()> {
|
fn run(sp: GenericService) -> ResultType<()> {
|
||||||
#[cfg(windows)]
|
#[cfg(all(windows, feature = "virtual_display_driver"))]
|
||||||
ensure_close_virtual_device()?;
|
ensure_close_virtual_device()?;
|
||||||
|
|
||||||
// ensure_inited() is needed because release_resource() may be called.
|
// ensure_inited() is needed because release_resource() may be called.
|
||||||
@ -922,37 +916,24 @@ pub async fn switch_to_primary() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(all(windows, feature = "virtual_display_driver")))]
|
||||||
fn try_get_displays() -> ResultType<Vec<Display>> {
|
fn try_get_displays() -> ResultType<Vec<Display>> {
|
||||||
Ok(Display::all()?)
|
Ok(Display::all()?)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(all(windows, feature = "virtual_display_driver"))]
|
||||||
fn try_get_displays() -> ResultType<Vec<Display>> {
|
fn try_get_displays() -> ResultType<Vec<Display>> {
|
||||||
let mut displays = Display::all()?;
|
let mut displays = Display::all()?;
|
||||||
if displays.len() == 0 {
|
if displays.len() == 0 {
|
||||||
log::debug!("no displays, create virtual display");
|
log::debug!("no displays, create virtual display");
|
||||||
// Try plugin monitor
|
if let Err(e) = virtual_display_manager::plug_in_headless() {
|
||||||
if !virtual_display::is_device_created() {
|
log::error!("plug in headless failed {}", e);
|
||||||
if let Err(e) = virtual_display::create_device() {
|
|
||||||
log::debug!("Create device failed {}", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if virtual_display::is_device_created() {
|
|
||||||
if let Err(e) = virtual_display::plug_in_monitor() {
|
|
||||||
log::debug!("Plug in monitor failed {}", e);
|
|
||||||
} else {
|
} else {
|
||||||
if let Err(e) = virtual_display::update_monitor_modes() {
|
|
||||||
log::debug!("Update monitor modes failed {}", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
displays = Display::all()?;
|
displays = Display::all()?;
|
||||||
|
}
|
||||||
} else if displays.len() > 1 {
|
} else if displays.len() > 1 {
|
||||||
// If more than one displays exists, close RustDeskVirtualDisplay
|
// If more than one displays exists, close RustDeskVirtualDisplay
|
||||||
if virtual_display::is_device_created() {
|
let _res = virtual_display_manager::plug_in_headless();
|
||||||
virtual_display::close_device()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Ok(displays)
|
Ok(displays)
|
||||||
}
|
}
|
||||||
@ -991,7 +972,7 @@ fn start_uac_elevation_check() {
|
|||||||
if !crate::platform::is_installed() && !crate::platform::is_root() {
|
if !crate::platform::is_installed() && !crate::platform::is_root() {
|
||||||
std::thread::spawn(|| loop {
|
std::thread::spawn(|| loop {
|
||||||
std::thread::sleep(std::time::Duration::from_secs(1));
|
std::thread::sleep(std::time::Duration::from_secs(1));
|
||||||
if let Ok(uac) = crate::win_privacy::is_process_consent_running() {
|
if let Ok(uac) = is_process_consent_running() {
|
||||||
*IS_UAC_RUNNING.lock().unwrap() = uac;
|
*IS_UAC_RUNNING.lock().unwrap() = uac;
|
||||||
}
|
}
|
||||||
if !crate::platform::is_elevated(None).unwrap_or(false) {
|
if !crate::platform::is_elevated(None).unwrap_or(false) {
|
||||||
|
@ -504,7 +504,7 @@ pub async fn start_ipc<T: InvokeUiCM>(cm: ConnectionManager<T>) {
|
|||||||
e
|
e
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
allow_err!(crate::win_privacy::start());
|
allow_err!(crate::privacy_win_mag::start());
|
||||||
});
|
});
|
||||||
|
|
||||||
match ipc::new_listener("_cm").await {
|
match ipc::new_listener("_cm").await {
|
||||||
|
106
src/virtual_display_manager.rs
Normal file
106
src/virtual_display_manager.rs
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
use hbb_common::{allow_err, bail, lazy_static, log, ResultType};
|
||||||
|
use std::{
|
||||||
|
collections::HashSet,
|
||||||
|
sync::{Arc, Mutex},
|
||||||
|
};
|
||||||
|
|
||||||
|
// virtual display index range: 0 - 2 are reserved for headless and other special uses.
|
||||||
|
const VIRTUAL_DISPLAY_INDEX_FOR_HEADLESS: u32 = 0;
|
||||||
|
const VIRTUAL_DISPLAY_START_FOR_PEER: u32 = 3;
|
||||||
|
const VIRTUAL_DISPLAY_MAX_COUNT: u32 = 10;
|
||||||
|
|
||||||
|
lazy_static::lazy_static! {
|
||||||
|
static ref VIRTUAL_DISPLAY_MANAGER: Arc<Mutex<VirtualDisplayManager>> =
|
||||||
|
Arc::new(Mutex::new(VirtualDisplayManager::default()));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
struct VirtualDisplayManager {
|
||||||
|
headless_index: Option<u32>,
|
||||||
|
peer_required_indices: HashSet<u32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl VirtualDisplayManager {
|
||||||
|
fn prepare_driver() -> ResultType<()> {
|
||||||
|
if let Err(e) = virtual_display::create_device() {
|
||||||
|
if !e.to_string().contains("Device is already created") {
|
||||||
|
bail!("Create device failed {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Reboot is not required for this case.
|
||||||
|
let mut _reboot_required = false;
|
||||||
|
allow_err!(virtual_display::install_update_driver(
|
||||||
|
&mut _reboot_required
|
||||||
|
));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn plug_in_monitor(index: u32, modes: &[virtual_display::MonitorMode]) -> ResultType<()> {
|
||||||
|
if let Err(e) = virtual_display::plug_in_monitor(index) {
|
||||||
|
bail!("Plug in monitor failed {}", e);
|
||||||
|
}
|
||||||
|
if let Err(e) = virtual_display::update_monitor_modes(index, &modes) {
|
||||||
|
log::error!("Update monitor modes failed {}", e);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn plug_in_headless() -> ResultType<()> {
|
||||||
|
let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
|
||||||
|
VirtualDisplayManager::prepare_driver()?;
|
||||||
|
let modes = [virtual_display::MonitorMode {
|
||||||
|
width: 1920,
|
||||||
|
height: 1080,
|
||||||
|
sync: 60,
|
||||||
|
}];
|
||||||
|
VirtualDisplayManager::plug_in_monitor(VIRTUAL_DISPLAY_INDEX_FOR_HEADLESS, &modes)?;
|
||||||
|
manager.headless_index = Some(VIRTUAL_DISPLAY_INDEX_FOR_HEADLESS);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn plug_out_headless() {
|
||||||
|
let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
|
||||||
|
if let Some(index) = manager.headless_index.take() {
|
||||||
|
if let Err(e) = virtual_display::plug_out_monitor(index) {
|
||||||
|
log::error!("Plug out monitor failed {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn plug_in_peer_required(
|
||||||
|
modes: Vec<Vec<virtual_display::MonitorMode>>,
|
||||||
|
) -> ResultType<Vec<u32>> {
|
||||||
|
let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
|
||||||
|
VirtualDisplayManager::prepare_driver()?;
|
||||||
|
|
||||||
|
let mut indices: Vec<u32> = Vec::new();
|
||||||
|
for m in modes.iter() {
|
||||||
|
for idx in VIRTUAL_DISPLAY_START_FOR_PEER..VIRTUAL_DISPLAY_MAX_COUNT {
|
||||||
|
if !manager.peer_required_indices.contains(&idx) {
|
||||||
|
match VirtualDisplayManager::plug_in_monitor(idx, m) {
|
||||||
|
Ok(_) => {
|
||||||
|
manager.peer_required_indices.insert(idx);
|
||||||
|
indices.push(idx);
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Plug in monitor failed {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(indices)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn plug_out_peer_required(modes: &[u32]) -> ResultType<()> {
|
||||||
|
let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
|
||||||
|
for idx in modes.iter() {
|
||||||
|
if manager.peer_required_indices.contains(idx) {
|
||||||
|
allow_err!(virtual_display::plug_out_monitor(*idx));
|
||||||
|
manager.peer_required_indices.remove(idx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user