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

virtual display: win10 trivial refactor

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2022-03-13 17:08:33 +08:00
parent 957eabcef0
commit 974c259a3d
3 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/virtual_display/src/lib.rs
View File

@ -2,14 +2,9 @@
pub mod win10;
use hbb_common::{bail, lazy_static, ResultType};
use std::{
ffi::{CStr, CString},
path::Path,
sync::Mutex,
};
use std::{ffi::CString, path::Path, sync::Mutex};
lazy_static::lazy_static! {
#[cfg(windows)]
static ref H_SW_DEVICE: Mutex<u64> = Mutex::new(0);
}
@ -24,7 +19,7 @@ pub fn download_driver() -> ResultType<()> {
Ok(())
}
pub fn install_update_driver(reboot_required: &mut bool) -> ResultType<()> {
pub fn install_update_driver(_reboot_required: &mut bool) -> ResultType<()> {
#[cfg(windows)]
let install_path = win10::DRIVER_INSTALL_PATH;
#[cfg(not(windows))]
@ -35,28 +30,28 @@ pub fn install_update_driver(reboot_required: &mut bool) -> ResultType<()> {
bail!("{} not exists", install_path)
}
let full_install_path = match abs_path.to_str() {
let _full_install_path = match abs_path.to_str() {
Some(p) => CString::new(p)?.into_raw(),
None => bail!("{} not exists", install_path),
};
#[cfg(windows)]
unsafe {
#[cfg(windows)]
{
let mut reboot_required_tmp = win10::idd::FALSE;
if win10::idd::InstallUpdate(full_install_path, &mut reboot_required_tmp)
if win10::idd::InstallUpdate(_full_install_path, &mut reboot_required_tmp)
== win10::idd::FALSE
{
bail!("{}", CStr::from_ptr(win10::idd::GetLastMsg()).to_str()?);
bail!("{}", win10::get_last_msg()?);
}
*reboot_required = reboot_required_tmp == win10::idd::TRUE;
*_reboot_required = reboot_required_tmp == win10::idd::TRUE;
}
}
Ok(())
}
pub fn uninstall_driver(reboot_required: &mut bool) -> ResultType<()> {
pub fn uninstall_driver(_reboot_required: &mut bool) -> ResultType<()> {
#[cfg(windows)]
let install_path = win10::DRIVER_INSTALL_PATH;
#[cfg(not(windows))]
@ -67,21 +62,21 @@ pub fn uninstall_driver(reboot_required: &mut bool) -> ResultType<()> {
bail!("{} not exists", install_path)
}
let full_install_path = match abs_path.to_str() {
let _full_install_path = match abs_path.to_str() {
Some(p) => CString::new(p)?.into_raw(),
None => bail!("{} not exists", install_path),
};
#[cfg(windows)]
unsafe {
#[cfg(windows)]
{
let mut reboot_required_tmp = win10::idd::FALSE;
if win10::idd::Uninstall(full_install_path, &mut reboot_required_tmp)
if win10::idd::Uninstall(_full_install_path, &mut reboot_required_tmp)
== win10::idd::FALSE
{
bail!("{}", CStr::from_ptr(win10::idd::GetLastMsg()).to_str()?);
bail!("{}", win10::get_last_msg()?);
}
*reboot_required = reboot_required_tmp == win10::idd::TRUE;
*_reboot_required = reboot_required_tmp == win10::idd::TRUE;
}
}
@ -103,7 +98,7 @@ pub fn create_device() -> ResultType<()> {
unsafe {
let mut h_sw_device = *H_SW_DEVICE.lock().unwrap() as win10::idd::HSWDEVICE;
if win10::idd::DeviceCreate(&mut h_sw_device) == win10::idd::FALSE {
bail!("{}", CStr::from_ptr(win10::idd::GetLastMsg()).to_str()?);
bail!("{}", win10::get_last_msg()?);
} else {
*H_SW_DEVICE.lock().unwrap() = h_sw_device as u64;
Ok(())
@ -123,7 +118,7 @@ pub fn close_device() {
pub fn plug_in_monitor() -> ResultType<()> {
unsafe {
if win10::idd::MonitorPlugIn(0, 0, 30) == win10::idd::FALSE {
bail!("{}", CStr::from_ptr(win10::idd::GetLastMsg()).to_str()?);
bail!("{}", win10::get_last_msg()?);
}
Ok(())
}
@ -133,7 +128,7 @@ pub fn plug_in_monitor() -> ResultType<()> {
pub fn plug_out_monitor() -> ResultType<()> {
unsafe {
if win10::idd::MonitorPlugOut(0) == win10::idd::FALSE {
bail!("{}", CStr::from_ptr(win10::idd::GetLastMsg()).to_str()?);
bail!("{}", win10::get_last_msg()?);
}
Ok(())
}

5
libs/virtual_display/src/win10/mod.rs
View File

@ -1,4 +1,9 @@
pub mod idd;
use std::ffi::CStr;
pub const DRIVER_INSTALL_PATH: &str = "RustDeskIddDriver/RustDeskIddDriver.inf";
pub const DRIVER_DOWNLOAD_URL: &str = "";
pub unsafe fn get_last_msg() -> Result<&'static str, std::str::Utf8Error> {
CStr::from_ptr(idd::GetLastMsg()).to_str()
}

39
src/server/video_service.rs
View File

@ -32,6 +32,7 @@ use std::{
io::ErrorKind::WouldBlock,
time::{self, Duration, Instant},
};
#[cfg(windows)]
use virtual_display;
const WAIT_BASE: i32 = 17;
@ -104,7 +105,7 @@ impl VideoFrameController {
}
Ok(Some((id, instant))) => {
if let Some(tm) = instant {
log::trace!("channel recv latency: {}", tm.elapsed().as_secs_f32());
log::trace!("Channel recv latency: {}", tm.elapsed().as_secs_f32());
}
fetched_conn_ids.insert(id);
@ -150,13 +151,35 @@ impl Drop for VideoService {
}
}
pub fn new() -> VideoService {
let sp = VideoService(GenericService::new(NAME, true));
#[cfg(windows)]
if let Err(e) = virtual_display::create_device() {
log::error!("create device failed {}", e);
}
impl VideoService {
fn new() -> Self {
#[cfg(windows)]
if let Err(e) = virtual_display::create_device() {
log::error!("Create device failed {}", e);
}
#[cfg(windows)]
match Display::all() {
Ok(displays) => {
if displays.len() == 0 {
log::info!("Detect no displays, try create monitor");
if virtual_display::is_device_created() {
if let Err(e) = virtual_display::plug_in_monitor() {
log::error!("Plug in monitor failed {}", e);
}
}
}
}
Err(e) => {
log::error!("Get all displays failed {}", e)
}
}
VideoService(GenericService::new(NAME, true))
}
}
pub fn new() -> VideoService {
let sp = VideoService::new();
sp.0.run(run);
sp
}
@ -484,7 +507,7 @@ fn get_current_display() -> ResultType<(usize, usize, Display)> {
#[cfg(windows)]
if virtual_display::is_device_created() {
if let Err(e) = virtual_display::plug_in_monitor() {
log::error!("plug in monitor failed {}", e);
log::error!("Plug in monitor failed {}", e);
}
}
bail!("No displays");