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

fix build

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-10-27 20:57:35 +08:00
parent 725a44abd8
commit 5ab0f499ce
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/virtual_display/dylib/src/lib.rs
View File

@ -1,8 +1,9 @@
#[cfg(windows)] #[cfg(windows)]
pub mod win10; pub mod win10;
use hbb_common::ResultType;
#[cfg(windows)]
use hbb_common::{bail, lazy_static};
#[cfg(windows)] #[cfg(windows)]
use hbb_common::lazy_static;
use hbb_common::{bail, ResultType};
use std::path::PathBuf; use std::path::PathBuf;
#[cfg(windows)] #[cfg(windows)]
@ -33,12 +34,9 @@ pub fn download_driver() -> ResultType<()> {
Ok(()) Ok(())
} }
fn get_driver_install_abs_path() -> ResultType<PathBuf> {
#[cfg(windows)] #[cfg(windows)]
fn get_driver_install_abs_path() -> ResultType<PathBuf> {
let install_path = win10::DRIVER_INSTALL_PATH; let install_path = win10::DRIVER_INSTALL_PATH;
#[cfg(not(windows))]
bail!("Not implemented for non-windows");
let exe_file = std::env::current_exe()?; let exe_file = std::env::current_exe()?;
let abs_path = match exe_file.parent() { let abs_path = match exe_file.parent() {
Some(cur_dir) => cur_dir.join(install_path), Some(cur_dir) => cur_dir.join(install_path),
@ -55,8 +53,6 @@ fn get_driver_install_abs_path() -> ResultType<PathBuf> {
#[no_mangle] #[no_mangle]
pub fn install_update_driver(_reboot_required: &mut bool) -> ResultType<()> { pub fn install_update_driver(_reboot_required: &mut bool) -> ResultType<()> {
let abs_path = get_driver_install_abs_path()?;
#[cfg(windows)] #[cfg(windows)]
unsafe { unsafe {
{ {
@ -66,6 +62,7 @@ pub fn install_update_driver(_reboot_required: &mut bool) -> ResultType<()> {
bail!("{}", e); bail!("{}", e);
} }
let abs_path = get_driver_install_abs_path()?;
let full_install_path: Vec<u16> = abs_path let full_install_path: Vec<u16> = abs_path
.to_string_lossy() .to_string_lossy()
.as_ref() .as_ref()
@ -88,11 +85,10 @@ pub fn install_update_driver(_reboot_required: &mut bool) -> ResultType<()> {
#[no_mangle] #[no_mangle]
pub fn uninstall_driver(_reboot_required: &mut bool) -> ResultType<()> { pub fn uninstall_driver(_reboot_required: &mut bool) -> ResultType<()> {
let abs_path = get_driver_install_abs_path()?;
#[cfg(windows)] #[cfg(windows)]
unsafe { unsafe {
{ {
let abs_path = get_driver_install_abs_path()?;
let full_install_path: Vec<u16> = abs_path let full_install_path: Vec<u16> = abs_path
.to_string_lossy() .to_string_lossy()
.as_ref() .as_ref()