weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove get_error() in windows.rs

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-11-20 17:38:53 +08:00
parent c6d587f0c7
commit 2aaca0c54a
5 changed files with 39 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/privacy_mode/win_input.rs
View File

@@ -43,7 +43,7 @@ fn do_hook(tx: Sender<String>) -> ResultType<(HHOOK, HHOOK)> {
&mut hm_keyboard as _,
) {
tx.send(format!(
"Failed to GetModuleHandleExA, error: {:?}",
"Failed to GetModuleHandleExA, error: {}",
Error::last_os_error()
))?;
return Ok(invalid_ret);
@@ -55,7 +55,7 @@ fn do_hook(tx: Sender<String>) -> ResultType<(HHOOK, HHOOK)> {
&mut hm_mouse as _,
) {
tx.send(format!(
"Failed to GetModuleHandleExA, error: {:?}",
"Failed to GetModuleHandleExA, error: {}",
Error::last_os_error()
))?;
return Ok(invalid_ret);
@@ -69,7 +69,7 @@ fn do_hook(tx: Sender<String>) -> ResultType<(HHOOK, HHOOK)> {
);
if hook_keyboard.is_null() {
tx.send(format!(
" SetWindowsHookExA keyboard, error {:?}",
" SetWindowsHookExA keyboard, error {}",
Error::last_os_error()
))?;
return Ok(invalid_ret);
@@ -80,12 +80,12 @@ fn do_hook(tx: Sender<String>) -> ResultType<(HHOOK, HHOOK)> {
if FALSE == UnhookWindowsHookEx(hook_keyboard) {
// Fatal error
log::error!(
" UnhookWindowsHookEx keyboard, error {:?}",
" UnhookWindowsHookEx keyboard, error {}",
Error::last_os_error()
);
}
tx.send(format!(
" SetWindowsHookExA mouse, error {:?}",
" SetWindowsHookExA mouse, error {}",
Error::last_os_error()
))?;
return Ok(invalid_ret);
@@ -141,7 +141,7 @@ pub fn hook() -> ResultType<()> {
if FALSE == UnhookWindowsHookEx(hook_keyboard as _) {
// Fatal error
log::error!(
"Failed UnhookWindowsHookEx keyboard, error {:?}",
"Failed UnhookWindowsHookEx keyboard, error {}",
Error::last_os_error()
);
}
@@ -149,7 +149,7 @@ pub fn hook() -> ResultType<()> {
if FALSE == UnhookWindowsHookEx(hook_mouse as _) {
// Fatal error
log::error!(
"Failed UnhookWindowsHookEx mouse, error {:?}",
"Failed UnhookWindowsHookEx mouse, error {}",
Error::last_os_error()
);
}
@@ -178,7 +178,7 @@ pub fn unhook() -> ResultType<()> {
if *cur_hook_thread_id != 0 {
if FALSE == PostThreadMessageA(*cur_hook_thread_id, WM_USER_EXIT_HOOK, 0, 0) {
bail!(
"Failed to post message to exit hook, error {:?}",
"Failed to post message to exit hook, error {}",
Error::last_os_error()
);
}

4
src/privacy_mode/win_topmost_window.rs
View File

@@ -266,7 +266,7 @@ impl PrivacyModeImpl {
CloseHandle(token);
if 0 == create_res {
bail!(
"Failed to create privacy window process {}, error {:?}",
"Failed to create privacy window process {}, error {}",
cmdline,
Error::last_os_error()
);
@@ -284,7 +284,7 @@ impl PrivacyModeImpl {
CloseHandle(proc_info.hProcess);
bail!(
"Failed to create privacy window process, error {:?}",
"Failed to create privacy window process, error {}",
Error::last_os_error()
);
}

4
src/privacy_mode/win_virtual_display.rs
View File

@@ -195,7 +195,7 @@ impl PrivacyModeImpl {
)
{
bail!(
"Failed EnumDisplaySettingsW, device name: {:?}, error: {:?}",
"Failed EnumDisplaySettingsW, device name: {:?}, error: {}",
std::string::String::from_utf16(&display.name),
Error::last_os_error()
);
@@ -229,7 +229,7 @@ impl PrivacyModeImpl {
== EnumDisplaySettingsW(dd.DeviceName.as_ptr(), ENUM_CURRENT_SETTINGS, &mut dm)
{
bail!(
"Failed EnumDisplaySettingsW, device name: {:?}, error: {:?}",
"Failed EnumDisplaySettingsW, device name: {:?}, error: {}",
std::string::String::from_utf16(&dd.DeviceName),
Error::last_os_error()
);