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

fix: privacy mode, windows vd, init resolution (#8992)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2024-08-08 15:31:11 +08:00 committed by GitHub
parent 6197832317
commit 049c334db3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/privacy_mode.rs
View File

@ -187,6 +187,7 @@ fn get_supported_impl(impl_key: &str) -> String {
if supported_impls.iter().any(|(k, _)| k == &impl_key) { if supported_impls.iter().any(|(k, _)| k == &impl_key) {
return impl_key.to_owned(); return impl_key.to_owned();
}; };
// TODO: Is it a good idea to use fallback here? Because user do not know the fallback.
// fallback // fallback
let mut cur_impl = get_option("privacy-mode-impl-key".to_owned()); let mut cur_impl = get_option("privacy-mode-impl-key".to_owned());
if !get_supported_privacy_mode_impl() if !get_supported_privacy_mode_impl()
@ -223,6 +224,8 @@ async fn turn_on_privacy_async(impl_key: String, conn_id: i32) -> Option<ResultT
let res = turn_on_privacy_sync(&impl_key, conn_id); let res = turn_on_privacy_sync(&impl_key, conn_id);
let _ = tx.send(res); let _ = tx.send(res);
}); });
// Wait at most 5 seconds for the result.
// Because it may take a long time to turn on the privacy mode with amyuni idd.
match hbb_common::timeout(5000, rx).await { match hbb_common::timeout(5000, rx).await {
Ok(res) => match res { Ok(res) => match res {
Ok(res) => res, Ok(res) => res,

12
src/privacy_mode/win_virtual_display.rs
View File

@ -213,6 +213,8 @@ impl PrivacyModeImpl {
dm.u1.s2_mut().dmPosition.x -= new_primary_dm.u1.s2().dmPosition.x; dm.u1.s2_mut().dmPosition.x -= new_primary_dm.u1.s2().dmPosition.x;
dm.u1.s2_mut().dmPosition.y -= new_primary_dm.u1.s2().dmPosition.y; dm.u1.s2_mut().dmPosition.y -= new_primary_dm.u1.s2().dmPosition.y;
dm.dmFields |= DM_POSITION; dm.dmFields |= DM_POSITION;
dm.dmPelsWidth = 1920;
dm.dmPelsHeight = 1080;
let rc = ChangeDisplaySettingsExW( let rc = ChangeDisplaySettingsExW(
dd.DeviceName.as_ptr(), dd.DeviceName.as_ptr(),
&mut dm, &mut dm,
@ -220,7 +222,6 @@ impl PrivacyModeImpl {
flags, flags,
NULL, NULL,
); );
if rc != DISP_CHANGE_SUCCESSFUL { if rc != DISP_CHANGE_SUCCESSFUL {
log::error!( log::error!(
"Failed ChangeDisplaySettingsEx, device name: {:?}, flags: {}, ret: {}", "Failed ChangeDisplaySettingsEx, device name: {:?}, flags: {}, ret: {}",
@ -230,6 +231,15 @@ impl PrivacyModeImpl {
); );
bail!("Failed ChangeDisplaySettingsEx, ret: {}", rc); bail!("Failed ChangeDisplaySettingsEx, ret: {}", rc);
} }
// If we want to set dpi, the following references may be helpful.
// And setting dpi should be called after changing the display settings.
// https://stackoverflow.com/questions/35233182/how-can-i-change-windows-10-display-scaling-programmatically-using-c-sharp
// https://github.com/lihas/windows-DPI-scaling-sample/blob/master/DPIHelper/DpiHelper.cpp
//
// But the official API does not provide a way to get/set dpi.
// https://learn.microsoft.com/en-us/windows/win32/api/wingdi/ne-wingdi-displayconfig_device_info_type
// https://github.com/lihas/windows-DPI-scaling-sample/blob/738ac18b7a7ce2d8fdc157eb825de9cb5eee0448/DPIHelper/DpiHelper.h#L37
} }
} }