fix: win, file clipboard, try empty (#10609)

Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2025-01-27 16:16:44 +08:00
committed by GitHub
parent f08cb0412d
commit 55005f8129
5 changed files with 72 additions and 7 deletions

View File

@@ -6,10 +6,10 @@
#![allow(deref_nullptr)]
use crate::{
allow_err, send_data, ClipboardFile, CliprdrError, CliprdrServiceContext, ResultType,
send_data, send_data_exclude, ClipboardFile, CliprdrError, CliprdrServiceContext, ResultType,
ERR_CODE_INVALID_PARAMETER, ERR_CODE_SEND_MSG, ERR_CODE_SERVER_FUNCTION_NONE, VEC_MSG_CHANNEL,
};
use hbb_common::log;
use hbb_common::{allow_err, log};
use std::{
boxed::Box,
ffi::{CStr, CString},
@@ -643,6 +643,7 @@ pub fn server_clip_file(
conn_id,
&format_list
);
send_data_exclude(conn_id as _, ClipboardFile::TryEmpty);
ret = server_format_list(context, conn_id, format_list);
log::debug!(
"server_format_list called, conn_id {}, return {}",
@@ -740,6 +741,11 @@ pub fn server_clip_file(
ret
);
}
ClipboardFile::TryEmpty => {
log::debug!("empty_clipboard called");
let ret = empty_clipboard(context, conn_id);
log::debug!("empty_clipboard called, conn_id {}, return {}", conn_id, ret);
}
}
ret
}