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

fix: privacy mode 2, more error info (#9111)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2024-08-19 11:35:35 +08:00 committed by GitHub
parent e3f09b3ec6
commit 715d475f49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/privacy_mode/win_virtual_display.rs
View File

@ -21,8 +21,8 @@ use winapi::{
winuser::{ winuser::{
ChangeDisplaySettingsExW, EnumDisplayDevicesW, EnumDisplaySettingsExW, ChangeDisplaySettingsExW, EnumDisplayDevicesW, EnumDisplaySettingsExW,
EnumDisplaySettingsW, CDS_NORESET, CDS_RESET, CDS_SET_PRIMARY, CDS_UPDATEREGISTRY, EnumDisplaySettingsW, CDS_NORESET, CDS_RESET, CDS_SET_PRIMARY, CDS_UPDATEREGISTRY,
DISP_CHANGE_SUCCESSFUL, EDD_GET_DEVICE_INTERFACE_NAME, ENUM_CURRENT_SETTINGS, DISP_CHANGE_FAILED, DISP_CHANGE_SUCCESSFUL, EDD_GET_DEVICE_INTERFACE_NAME,
ENUM_REGISTRY_SETTINGS, ENUM_CURRENT_SETTINGS, ENUM_REGISTRY_SETTINGS,
}, },
}, },
}; };
@ -155,6 +155,19 @@ impl PrivacyModeImpl {
self.virtual_displays_added.clear(); self.virtual_displays_added.clear();
} }
#[inline]
fn change_display_settings_ex_err_msg(rc: i32) -> String {
if rc != DISP_CHANGE_FAILED {
format!("ret: {}", rc)
} else {
format!(
"ret: {}, last error: {:?}",
rc,
std::io::Error::last_os_error()
)
}
}
fn set_primary_display(&mut self) -> ResultType<()> { fn set_primary_display(&mut self) -> ResultType<()> {
let display = &self.virtual_displays[0]; let display = &self.virtual_displays[0];
@ -224,13 +237,14 @@ impl PrivacyModeImpl {
NULL, NULL,
); );
if rc != DISP_CHANGE_SUCCESSFUL { if rc != DISP_CHANGE_SUCCESSFUL {
let err = Self::change_display_settings_ex_err_msg(rc);
log::error!( log::error!(
"Failed ChangeDisplaySettingsEx, device name: {:?}, flags: {}, ret: {}", "Failed ChangeDisplaySettingsEx, device name: {:?}, flags: {}, {}",
std::string::String::from_utf16(&dd.DeviceName), std::string::String::from_utf16(&dd.DeviceName),
flags, flags,
rc &err
); );
bail!("Failed ChangeDisplaySettingsEx, ret: {}", rc); bail!("Failed ChangeDisplaySettingsEx, {}", err);
} }
// If we want to set dpi, the following references may be helpful. // If we want to set dpi, the following references may be helpful.
@ -264,13 +278,14 @@ impl PrivacyModeImpl {
NULL as _, NULL as _,
); );
if rc != DISP_CHANGE_SUCCESSFUL { if rc != DISP_CHANGE_SUCCESSFUL {
let err = Self::change_display_settings_ex_err_msg(rc);
log::error!( log::error!(
"Failed ChangeDisplaySettingsEx, device name: {:?}, flags: {}, ret: {}", "Failed ChangeDisplaySettingsEx, device name: {:?}, flags: {}, {}",
std::string::String::from_utf16(&display.name), std::string::String::from_utf16(&display.name),
flags, flags,
rc &err
); );
bail!("Failed ChangeDisplaySettingsEx, ret: {}", rc); bail!("Failed ChangeDisplaySettingsEx, {}", err);
} }
} }
} }
@ -327,9 +342,10 @@ impl PrivacyModeImpl {
// } // }
// } // }
let ret = ChangeDisplaySettingsExW(NULL as _, NULL as _, NULL as _, flags, NULL as _); let rc = ChangeDisplaySettingsExW(NULL as _, NULL as _, NULL as _, flags, NULL as _);
if ret != DISP_CHANGE_SUCCESSFUL { if rc != DISP_CHANGE_SUCCESSFUL {
bail!("Failed ChangeDisplaySettingsEx, ret: {}", ret); let err = Self::change_display_settings_ex_err_msg(rc);
bail!("Failed ChangeDisplaySettingsEx, {}", err);
} }
// if !desk_current.is_null() { // if !desk_current.is_null() {