From 059e067bdce7229e854f1a9b308ccf2f8933e411 Mon Sep 17 00:00:00 2001 From: dignow Date: Fri, 3 Nov 2023 07:17:40 +0800 Subject: [PATCH 1/2] fix, android rotate screen Signed-off-by: dignow --- libs/clipboard/src/lib.rs | 4 +++- src/server.rs | 2 +- src/server/display_service.rs | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/clipboard/src/lib.rs b/libs/clipboard/src/lib.rs index 0e80cda2d..3b58dd2ab 100644 --- a/libs/clipboard/src/lib.rs +++ b/libs/clipboard/src/lib.rs @@ -4,8 +4,10 @@ use std::{ sync::{Arc, Mutex, RwLock}, }; +#[cfg(any(target_os = "windows", feature = "unix-file-copy-paste",))] +use hbb_common::allow_err; use hbb_common::{ - allow_err, lazy_static, log, + lazy_static, tokio::sync::{ mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}, Mutex as TokioMutex, diff --git a/src/server.rs b/src/server.rs index 0e1abfd55..e019f1889 100644 --- a/src/server.rs +++ b/src/server.rs @@ -95,7 +95,7 @@ pub fn new() -> ServerPtr { id_count: hbb_common::rand::random::() % 1000 + 1000, // ensure positive }; server.add_service(Box::new(audio_service::new())); - #[cfg(not(any(target_os = "android", target_os = "ios")))] + #[cfg(not(target_os = "ios"))] server.add_service(Box::new(display_service::new())); server.add_service(Box::new(video_service::new( *display_service::PRIMARY_DISPLAY_IDX, diff --git a/src/server/display_service.rs b/src/server/display_service.rs index 30225e491..f13d87015 100644 --- a/src/server/display_service.rs +++ b/src/server/display_service.rs @@ -12,6 +12,7 @@ use scrap::Display; pub const NAME: &'static str = "display"; +#[cfg(all(windows, feature = "virtual_display_driver"))] const DUMMY_DISPLAY_SIDE_MAX_SIZE: usize = 1024; struct ChangedResolution { From df0ad4486ebb06cc9817402fd432d43f49c56eb6 Mon Sep 17 00:00:00 2001 From: dignow Date: Fri, 3 Nov 2023 09:23:28 +0800 Subject: [PATCH 2/2] fix build Signed-off-by: dignow --- libs/clipboard/src/lib.rs | 2 +- libs/clipboard/src/platform/windows.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/clipboard/src/lib.rs b/libs/clipboard/src/lib.rs index 3b58dd2ab..1a9a04757 100644 --- a/libs/clipboard/src/lib.rs +++ b/libs/clipboard/src/lib.rs @@ -5,7 +5,7 @@ use std::{ }; #[cfg(any(target_os = "windows", feature = "unix-file-copy-paste",))] -use hbb_common::allow_err; +use hbb_common::{allow_err, log}; use hbb_common::{ lazy_static, tokio::sync::{ diff --git a/libs/clipboard/src/platform/windows.rs b/libs/clipboard/src/platform/windows.rs index 1576b4a78..1148112b5 100644 --- a/libs/clipboard/src/platform/windows.rs +++ b/libs/clipboard/src/platform/windows.rs @@ -10,11 +10,11 @@ use std::{ ffi::{CStr, CString}, result::Result, }; - use crate::{ - allow_err, log, send_data, ClipboardFile, CliprdrError, CliprdrServiceContext, ResultType, + allow_err, send_data, ClipboardFile, CliprdrError, CliprdrServiceContext, ResultType, ERR_CODE_INVALID_PARAMETER, ERR_CODE_SERVER_FUNCTION_NONE, VEC_MSG_CHANNEL, }; +use hbb_common::log; // only used error code will be recorded here /// success