diff --git a/crates/ironrdp-acceptor/src/channel_connection.rs b/crates/ironrdp-acceptor/src/channel_connection.rs index 697ce495..a176cb25 100644 --- a/crates/ironrdp-acceptor/src/channel_connection.rs +++ b/crates/ironrdp-acceptor/src/channel_connection.rs @@ -2,7 +2,8 @@ use std::collections::HashSet; use ironrdp_connector::{reason_err, ConnectorError, ConnectorErrorExt, ConnectorResult, Sequence, State, Written}; use ironrdp_core::WriteBuf; -use ironrdp_pdu::{self as pdu, x224::X224}; +use ironrdp_pdu::x224::X224; +use ironrdp_pdu::{self as pdu}; use pdu::mcs; #[derive(Debug)] diff --git a/crates/ironrdp-acceptor/src/connection.rs b/crates/ironrdp-acceptor/src/connection.rs index 73cbe081..f4777e8e 100644 --- a/crates/ironrdp-acceptor/src/connection.rs +++ b/crates/ironrdp-acceptor/src/connection.rs @@ -5,8 +5,7 @@ use ironrdp_connector::{ encode_x224_packet, reason_err, ConnectorError, ConnectorErrorExt, ConnectorResult, DesktopSize, Sequence, State, Written, }; -use ironrdp_core::decode; -use ironrdp_core::WriteBuf; +use ironrdp_core::{decode, WriteBuf}; use ironrdp_pdu as pdu; use ironrdp_pdu::nego::SecurityProtocol; use ironrdp_pdu::x224::X224; @@ -14,9 +13,7 @@ use ironrdp_svc::{StaticChannelSet, SvcServerProcessor}; use pdu::rdp::capability_sets::CapabilitySet; use pdu::rdp::client_info::Credentials; use pdu::rdp::headers::ShareControlPdu; -use pdu::rdp::server_error_info::ErrorInfo; -use pdu::rdp::server_error_info::ProtocolIndependentCode; -use pdu::rdp::server_error_info::ServerSetErrorInfoPdu; +use pdu::rdp::server_error_info::{ErrorInfo, ProtocolIndependentCode, ServerSetErrorInfoPdu}; use pdu::rdp::server_license::{LicensePdu, LicensingErrorMessage}; use pdu::{gcc, mcs, nego, rdp}; diff --git a/crates/ironrdp-acceptor/src/credssp.rs b/crates/ironrdp-acceptor/src/credssp.rs index 6045c4a9..f8aa233e 100644 --- a/crates/ironrdp-acceptor/src/credssp.rs +++ b/crates/ironrdp-acceptor/src/credssp.rs @@ -1,13 +1,11 @@ +use ironrdp_connector::credssp::KerberosConfig; +use ironrdp_connector::sspi::credssp::{ + ClientMode, CredSspServer, CredentialsProxy, ServerError, ServerState, TsRequest, +}; +use ironrdp_connector::sspi::negotiate::ProtocolConfig; +use ironrdp_connector::sspi::{self, AuthIdentity, Username}; use ironrdp_connector::{ - credssp::KerberosConfig, - custom_err, general_err, - sspi::{ - self, - credssp::{ClientMode, CredSspServer, CredentialsProxy, ServerError, ServerState, TsRequest}, - negotiate::ProtocolConfig, - AuthIdentity, Username, - }, - ConnectorError, ConnectorErrorKind, ConnectorResult, ServerName, Written, + custom_err, general_err, ConnectorError, ConnectorErrorKind, ConnectorResult, ServerName, Written, }; use ironrdp_core::{other_err, WriteBuf}; use ironrdp_pdu::PduHint; diff --git a/crates/ironrdp-acceptor/src/finalization.rs b/crates/ironrdp-acceptor/src/finalization.rs index dcc3451f..16c36f82 100644 --- a/crates/ironrdp-acceptor/src/finalization.rs +++ b/crates/ironrdp-acceptor/src/finalization.rs @@ -1,6 +1,7 @@ use ironrdp_connector::{ConnectorError, ConnectorErrorExt, ConnectorResult, Sequence, State, Written}; use ironrdp_core::WriteBuf; -use ironrdp_pdu::{self as pdu, x224::X224}; +use ironrdp_pdu::x224::X224; +use ironrdp_pdu::{self as pdu}; use pdu::rdp; use crate::util::{self, wrap_share_data}; diff --git a/crates/ironrdp-acceptor/src/util.rs b/crates/ironrdp-acceptor/src/util.rs index 83badd67..ee7592e3 100644 --- a/crates/ironrdp-acceptor/src/util.rs +++ b/crates/ironrdp-acceptor/src/util.rs @@ -2,7 +2,8 @@ use std::borrow::Cow; use ironrdp_connector::{ConnectorError, ConnectorErrorExt, ConnectorResult}; use ironrdp_core::{encode_vec, Encode, WriteBuf}; -use ironrdp_pdu::{rdp, x224::X224}; +use ironrdp_pdu::rdp; +use ironrdp_pdu::x224::X224; pub(crate) fn encode_send_data_indication( initiator_id: u16, diff --git a/crates/ironrdp-ainput/src/lib.rs b/crates/ironrdp-ainput/src/lib.rs index 790732e9..6625ad10 100644 --- a/crates/ironrdp-ainput/src/lib.rs +++ b/crates/ironrdp-ainput/src/lib.rs @@ -4,12 +4,12 @@ )] use bitflags::bitflags; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use ironrdp_dvc::DvcEncode; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; - -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, Encode}; // Advanced Input channel as defined from Freerdp, [here]: // // [here]: https://github.com/FreeRDP/FreeRDP/blob/master/include/freerdp/channels/ainput.h diff --git a/crates/ironrdp-async/src/framed.rs b/crates/ironrdp-async/src/framed.rs index fcca6675..370532c9 100644 --- a/crates/ironrdp-async/src/framed.rs +++ b/crates/ironrdp-async/src/framed.rs @@ -213,7 +213,8 @@ impl FramedWrite for Framed where S: FramedWrite, { - type WriteAllFut<'write> = S::WriteAllFut<'write> + type WriteAllFut<'write> + = S::WriteAllFut<'write> where Self: 'write; diff --git a/crates/ironrdp-cliprdr-format/src/bitmap.rs b/crates/ironrdp-cliprdr-format/src/bitmap.rs index e0adfc55..f8d1666a 100644 --- a/crates/ironrdp-cliprdr-format/src/bitmap.rs +++ b/crates/ironrdp-cliprdr-format/src/bitmap.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_int, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_int, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use thiserror::Error; /// Maximum size of PNG image that could be placed on the clipboard. diff --git a/crates/ironrdp-cliprdr-native/src/windows.rs b/crates/ironrdp-cliprdr-native/src/windows.rs index e44aa7eb..3166829d 100644 --- a/crates/ironrdp-cliprdr-native/src/windows.rs +++ b/crates/ironrdp-cliprdr-native/src/windows.rs @@ -14,6 +14,7 @@ use ironrdp_cliprdr::pdu::{ use thiserror::Error; use tracing::error; use windows::core::{s, Error}; +pub use windows::Win32::Foundation::HWND; use windows::Win32::Foundation::*; use windows::Win32::System::DataExchange::{AddClipboardFormatListener, RemoveClipboardFormatListener}; use windows::Win32::System::LibraryLoader::GetModuleHandleA; @@ -25,8 +26,6 @@ use windows::Win32::UI::WindowsAndMessaging::{ use self::clipboard_impl::{clipboard_subproc, WinClipboardImpl}; use self::cliprdr_backend::WinCliprdrBackend; -pub use windows::Win32::Foundation::HWND; - const BACKEND_CHANNEL_SIZE: usize = 8; const WM_CLIPRDR_BACKEND_EVENT: u32 = WM_USER; diff --git a/crates/ironrdp-cliprdr/src/lib.rs b/crates/ironrdp-cliprdr/src/lib.rs index 4345231b..4f984c56 100644 --- a/crates/ironrdp-cliprdr/src/lib.rs +++ b/crates/ironrdp-cliprdr/src/lib.rs @@ -14,8 +14,7 @@ pub mod pdu; use backend::CliprdrBackend; use ironrdp_core::{decode, AsAny, EncodeResult}; use ironrdp_pdu::gcc::ChannelName; -use ironrdp_pdu::PduResult; -use ironrdp_pdu::{decode_err, encode_err}; +use ironrdp_pdu::{decode_err, encode_err, PduResult}; use ironrdp_svc::{ ChannelFlags, CompressionCondition, SvcClientProcessor, SvcMessage, SvcProcessor, SvcProcessorMessages, SvcServerProcessor, diff --git a/crates/ironrdp-cliprdr/src/pdu/capabilities.rs b/crates/ironrdp-cliprdr/src/pdu/capabilities.rs index b8aee984..377586ea 100644 --- a/crates/ironrdp-cliprdr/src/pdu/capabilities.rs +++ b/crates/ironrdp-cliprdr/src/pdu/capabilities.rs @@ -1,9 +1,8 @@ use bitflags::bitflags; use ironrdp_core::{ - cast_int, cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, DecodeError, DecodeResult, - EncodeResult, ReadCursor, WriteCursor, + cast_int, cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeError, DecodeResult, + Encode, EncodeResult, ReadCursor, WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use ironrdp_pdu::{impl_pdu_pod, read_padding, write_padding}; use crate::pdu::PartialHeader; diff --git a/crates/ironrdp-cliprdr/src/pdu/client_temporary_directory.rs b/crates/ironrdp-cliprdr/src/pdu/client_temporary_directory.rs index d177c006..53e778ae 100644 --- a/crates/ironrdp-cliprdr/src/pdu/client_temporary_directory.rs +++ b/crates/ironrdp-cliprdr/src/pdu/client_temporary_directory.rs @@ -1,9 +1,9 @@ use std::borrow::Cow; use ironrdp_core::{ - cast_int, ensure_size, invalid_field_err, DecodeResult, EncodeResult, IntoOwned, ReadCursor, WriteCursor, + cast_int, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, IntoOwned, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use ironrdp_pdu::impl_pdu_borrowing; use ironrdp_pdu::utils::{read_string_from_cursor, write_string_to_cursor, CharacterSet}; diff --git a/crates/ironrdp-cliprdr/src/pdu/file_contents.rs b/crates/ironrdp-cliprdr/src/pdu/file_contents.rs index fb8baf1b..daebe690 100644 --- a/crates/ironrdp-cliprdr/src/pdu/file_contents.rs +++ b/crates/ironrdp-cliprdr/src/pdu/file_contents.rs @@ -2,9 +2,9 @@ use std::borrow::Cow; use bitflags::bitflags; use ironrdp_core::{ - cast_int, ensure_size, invalid_field_err, DecodeResult, EncodeResult, IntoOwned, ReadCursor, WriteCursor, + cast_int, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, IntoOwned, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use ironrdp_pdu::impl_pdu_borrowing; use ironrdp_pdu::utils::{combine_u64, split_u64}; diff --git a/crates/ironrdp-cliprdr/src/pdu/format_data/mod.rs b/crates/ironrdp-cliprdr/src/pdu/format_data/mod.rs index 6426fe66..e2acc1f4 100644 --- a/crates/ironrdp-cliprdr/src/pdu/format_data/mod.rs +++ b/crates/ironrdp-cliprdr/src/pdu/format_data/mod.rs @@ -9,13 +9,10 @@ pub use self::palette::*; #[rustfmt::skip] use std::borrow::Cow; -use ironrdp_core::cast_int; -use ironrdp_core::ensure_fixed_part_size; -use ironrdp_core::ensure_size; -use ironrdp_core::DecodeResult; -use ironrdp_core::EncodeResult; -use ironrdp_core::IntoOwned; -use ironrdp_core::{Decode, Encode, ReadCursor, WriteCursor}; +use ironrdp_core::{ + cast_int, ensure_fixed_part_size, ensure_size, Decode, DecodeResult, Encode, EncodeResult, IntoOwned, ReadCursor, + WriteCursor, +}; use ironrdp_pdu::impl_pdu_borrowing; use ironrdp_pdu::utils::{read_string_from_cursor, to_utf16_bytes, CharacterSet}; diff --git a/crates/ironrdp-cliprdr/src/pdu/mod.rs b/crates/ironrdp-cliprdr/src/pdu/mod.rs index ea58817a..8cb918e4 100644 --- a/crates/ironrdp-cliprdr/src/pdu/mod.rs +++ b/crates/ironrdp-cliprdr/src/pdu/mod.rs @@ -17,11 +17,9 @@ pub use self::lock::*; #[rustfmt::skip] use bitflags::bitflags; -use ironrdp_core::ensure_fixed_part_size; -use ironrdp_core::invalid_field_err; -use ironrdp_core::DecodeResult; -use ironrdp_core::EncodeResult; -use ironrdp_core::{Decode, Encode, ReadCursor, WriteCursor}; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use ironrdp_svc::SvcEncode; const MSG_TYPE_MONITOR_READY: u16 = 0x0001; diff --git a/crates/ironrdp-connector/src/channel_connection.rs b/crates/ironrdp-connector/src/channel_connection.rs index aa308328..219368ab 100644 --- a/crates/ironrdp-connector/src/channel_connection.rs +++ b/crates/ironrdp-connector/src/channel_connection.rs @@ -1,8 +1,9 @@ -use std::collections::HashSet; use core::mem; +use std::collections::HashSet; use ironrdp_core::WriteBuf; -use ironrdp_pdu::{mcs, x224::X224, PduHint}; +use ironrdp_pdu::x224::X224; +use ironrdp_pdu::{mcs, PduHint}; use crate::{ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written}; diff --git a/crates/ironrdp-connector/src/connection.rs b/crates/ironrdp-connector/src/connection.rs index 10c1e733..317e79ce 100644 --- a/crates/ironrdp-connector/src/connection.rs +++ b/crates/ironrdp-connector/src/connection.rs @@ -1,5 +1,5 @@ -use std::borrow::Cow; use core::mem; +use std::borrow::Cow; use std::net::SocketAddr; use ironrdp_core::{decode, encode_vec, Encode, WriteBuf}; diff --git a/crates/ironrdp-connector/src/connection_activation.rs b/crates/ironrdp-connector/src/connection_activation.rs index 9c52c5f2..8e501e3a 100644 --- a/crates/ironrdp-connector/src/connection_activation.rs +++ b/crates/ironrdp-connector/src/connection_activation.rs @@ -1,6 +1,7 @@ use core::mem; -use ironrdp_pdu::rdp::{self, capability_sets::CapabilitySet}; +use ironrdp_pdu::rdp::capability_sets::CapabilitySet; +use ironrdp_pdu::rdp::{self}; use crate::{legacy, Config, ConnectionFinalizationSequence, ConnectorResult, DesktopSize, Sequence, State, Written}; diff --git a/crates/ironrdp-connector/src/legacy.rs b/crates/ironrdp-connector/src/legacy.rs index e66f504a..56a70fdc 100644 --- a/crates/ironrdp-connector/src/legacy.rs +++ b/crates/ironrdp-connector/src/legacy.rs @@ -1,7 +1,6 @@ use std::borrow::Cow; -use ironrdp_core::WriteBuf; -use ironrdp_core::{decode, encode_vec, Decode, Encode}; +use ironrdp_core::{decode, encode_vec, Decode, Encode, WriteBuf}; use ironrdp_pdu::rdp; use ironrdp_pdu::rdp::headers::ServerDeactivateAll; use ironrdp_pdu::x224::X224; diff --git a/crates/ironrdp-connector/src/lib.rs b/crates/ironrdp-connector/src/lib.rs index 6e1ebd5f..eb24bf6c 100644 --- a/crates/ironrdp-connector/src/lib.rs +++ b/crates/ironrdp-connector/src/lib.rs @@ -25,8 +25,7 @@ use core::fmt; pub use channel_connection::{ChannelConnectionSequence, ChannelConnectionState}; pub use connection::{encode_send_data_request, ClientConnector, ClientConnectorState, ConnectionResult}; pub use connection_finalization::{ConnectionFinalizationSequence, ConnectionFinalizationState}; -use ironrdp_core::WriteBuf; -use ironrdp_core::{encode_buf, encode_vec, Encode}; +use ironrdp_core::{encode_buf, encode_vec, Encode, WriteBuf}; use ironrdp_pdu::rdp::capability_sets; use ironrdp_pdu::rdp::client_info::PerformanceFlags; use ironrdp_pdu::x224::X224; diff --git a/crates/ironrdp-connector/src/license_exchange.rs b/crates/ironrdp-connector/src/license_exchange.rs index 3ebcf0d0..dc2a8030 100644 --- a/crates/ironrdp-connector/src/license_exchange.rs +++ b/crates/ironrdp-connector/src/license_exchange.rs @@ -1,5 +1,4 @@ -use core::fmt; -use core::mem; +use core::{fmt, mem}; use ironrdp_core::WriteBuf; use ironrdp_pdu::rdp::server_license::{self, LicensePdu, ServerLicenseError}; diff --git a/crates/ironrdp-core/src/encode.rs b/crates/ironrdp-core/src/encode.rs index 87d46d27..c1e9c0e1 100644 --- a/crates/ironrdp-core/src/encode.rs +++ b/crates/ironrdp-core/src/encode.rs @@ -1,11 +1,11 @@ #[cfg(feature = "alloc")] -use crate::WriteBuf; -#[cfg(feature = "alloc")] use alloc::string::String; #[cfg(feature = "alloc")] use alloc::{vec, vec::Vec}; use core::fmt; +#[cfg(feature = "alloc")] +use crate::WriteBuf; use crate::{ InvalidFieldErr, NotEnoughBytesErr, OtherErr, UnexpectedMessageTypeErr, UnsupportedValueErr, UnsupportedVersionErr, WriteCursor, diff --git a/crates/ironrdp-core/src/error.rs b/crates/ironrdp-core/src/error.rs index 8a8aae0a..954ad77c 100644 --- a/crates/ironrdp-core/src/error.rs +++ b/crates/ironrdp-core/src/error.rs @@ -1,8 +1,7 @@ -use ironrdp_error::Error; - #[cfg(feature = "alloc")] use alloc::string::String; -use ironrdp_error::Source; + +use ironrdp_error::{Error, Source}; /// Trait for adding a source to an error type. pub trait WithSource { diff --git a/crates/ironrdp-displaycontrol/src/client.rs b/crates/ironrdp-displaycontrol/src/client.rs index 4e21df54..62646348 100644 --- a/crates/ironrdp-displaycontrol/src/client.rs +++ b/crates/ironrdp-displaycontrol/src/client.rs @@ -1,13 +1,12 @@ -use crate::{ - pdu::{DisplayControlCapabilities, DisplayControlMonitorLayout, DisplayControlPdu}, - CHANNEL_NAME, -}; use ironrdp_core::{impl_as_any, Decode, EncodeResult, ReadCursor}; use ironrdp_dvc::{encode_dvc_messages, DvcClientProcessor, DvcMessage, DvcProcessor}; use ironrdp_pdu::{decode_err, PduResult}; use ironrdp_svc::{ChannelFlags, SvcMessage}; use tracing::debug; +use crate::pdu::{DisplayControlCapabilities, DisplayControlMonitorLayout, DisplayControlPdu}; +use crate::CHANNEL_NAME; + /// A client for the Display Control Virtual Channel. pub struct DisplayControlClient { /// A callback that will be called when capabilities are received from the server. diff --git a/crates/ironrdp-displaycontrol/src/server.rs b/crates/ironrdp-displaycontrol/src/server.rs index 917cd643..21bee8a2 100644 --- a/crates/ironrdp-displaycontrol/src/server.rs +++ b/crates/ironrdp-displaycontrol/src/server.rs @@ -3,10 +3,8 @@ use ironrdp_dvc::{DvcMessage, DvcProcessor, DvcServerProcessor}; use ironrdp_pdu::{decode_err, PduResult}; use tracing::debug; -use crate::{ - pdu::{DisplayControlCapabilities, DisplayControlMonitorLayout, DisplayControlPdu}, - CHANNEL_NAME, -}; +use crate::pdu::{DisplayControlCapabilities, DisplayControlMonitorLayout, DisplayControlPdu}; +use crate::CHANNEL_NAME; pub trait DisplayControlHandler: Send { fn monitor_layout(&self, layout: DisplayControlMonitorLayout) { diff --git a/crates/ironrdp-dvc/src/client.rs b/crates/ironrdp-dvc/src/client.rs index 690b961b..e88e977d 100644 --- a/crates/ironrdp-dvc/src/client.rs +++ b/crates/ironrdp-dvc/src/client.rs @@ -1,18 +1,18 @@ +use alloc::vec::Vec; +use core::any::TypeId; +use core::fmt; + +use ironrdp_core::{impl_as_any, Decode as _, DecodeResult, ReadCursor}; +use ironrdp_pdu::{self as pdu, decode_err, encode_err, pdu_other_err}; +use ironrdp_svc::{ChannelFlags, CompressionCondition, SvcClientProcessor, SvcMessage, SvcProcessor}; +use pdu::gcc::ChannelName; +use pdu::PduResult; + use crate::pdu::{ CapabilitiesResponsePdu, CapsVersion, ClosePdu, CreateResponsePdu, CreationStatus, DrdynvcClientPdu, DrdynvcServerPdu, }; use crate::{encode_dvc_messages, DvcProcessor, DynamicChannelSet, DynamicVirtualChannel}; -use alloc::vec::Vec; -use core::any::TypeId; -use core::fmt; -use ironrdp_core::Decode as _; -use ironrdp_core::ReadCursor; -use ironrdp_core::{impl_as_any, DecodeResult}; -use ironrdp_pdu::{self as pdu, decode_err, encode_err, pdu_other_err}; -use ironrdp_svc::{ChannelFlags, CompressionCondition, SvcClientProcessor, SvcMessage, SvcProcessor}; -use pdu::gcc::ChannelName; -use pdu::PduResult; pub trait DvcClientProcessor: DvcProcessor {} diff --git a/crates/ironrdp-dvc/src/complete_data.rs b/crates/ironrdp-dvc/src/complete_data.rs index ada61bb4..0e0861d3 100644 --- a/crates/ironrdp-dvc/src/complete_data.rs +++ b/crates/ironrdp-dvc/src/complete_data.rs @@ -1,5 +1,6 @@ use alloc::vec::Vec; use core::cmp; + use ironrdp_core::{cast_length, invalid_field_err, DecodeResult}; use crate::pdu::{DataFirstPdu, DataPdu, DrdynvcDataPdu}; diff --git a/crates/ironrdp-dvc/src/lib.rs b/crates/ironrdp-dvc/src/lib.rs index de9c7c54..b01ef11c 100644 --- a/crates/ironrdp-dvc/src/lib.rs +++ b/crates/ironrdp-dvc/src/lib.rs @@ -9,14 +9,15 @@ extern crate tracing; extern crate alloc; -use crate::alloc::borrow::ToOwned; -use alloc::string::String; -use core::any::TypeId; -use pdu::DrdynvcDataPdu; - use alloc::boxed::Box; use alloc::collections::BTreeMap; +use alloc::string::String; use alloc::vec::Vec; +use core::any::TypeId; + +use pdu::DrdynvcDataPdu; + +use crate::alloc::borrow::ToOwned; // Re-export ironrdp_pdu crate for convenience #[rustfmt::skip] // do not re-order this pub use pub use ironrdp_pdu; diff --git a/crates/ironrdp-dvc/src/pdu.rs b/crates/ironrdp-dvc/src/pdu.rs index 38908295..097a6675 100644 --- a/crates/ironrdp-dvc/src/pdu.rs +++ b/crates/ironrdp-dvc/src/pdu.rs @@ -1,7 +1,6 @@ use alloc::format; use core::fmt; -use crate::{DynamicChannelId, String, Vec}; use ironrdp_core::{ cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, unsupported_value_err, Decode, DecodeError, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, @@ -11,6 +10,8 @@ use ironrdp_pdu::utils::{ }; use ironrdp_svc::SvcEncode; +use crate::{DynamicChannelId, String, Vec}; + /// Dynamic Virtual Channel PDU's that are sent by both client and server. #[derive(Debug, PartialEq)] pub enum DrdynvcDataPdu { diff --git a/crates/ironrdp-dvc/src/server.rs b/crates/ironrdp-dvc/src/server.rs index c1363098..e16918fa 100644 --- a/crates/ironrdp-dvc/src/server.rs +++ b/crates/ironrdp-dvc/src/server.rs @@ -1,19 +1,19 @@ -use crate::pdu::{ - CapabilitiesRequestPdu, CapsVersion, CreateRequestPdu, CreationStatus, DrdynvcClientPdu, DrdynvcServerPdu, -}; -use crate::{encode_dvc_messages, CompleteData, DvcProcessor}; use alloc::boxed::Box; use alloc::vec::Vec; use core::fmt; -use ironrdp_core::Decode as _; -use ironrdp_core::{cast_length, impl_as_any, DecodeResult}; -use ironrdp_core::{invalid_field_err, ReadCursor}; + +use ironrdp_core::{cast_length, impl_as_any, invalid_field_err, Decode as _, DecodeResult, ReadCursor}; use ironrdp_pdu::{self as pdu, decode_err, encode_err, pdu_other_err}; use ironrdp_svc::{ChannelFlags, CompressionCondition, SvcMessage, SvcProcessor, SvcServerProcessor}; use pdu::gcc::ChannelName; use pdu::PduResult; use slab::Slab; +use crate::pdu::{ + CapabilitiesRequestPdu, CapsVersion, CreateRequestPdu, CreationStatus, DrdynvcClientPdu, DrdynvcServerPdu, +}; +use crate::{encode_dvc_messages, CompleteData, DvcProcessor}; + pub trait DvcServerProcessor: DvcProcessor {} #[derive(Debug, Copy, Clone, PartialEq, Eq)] diff --git a/crates/ironrdp-error/src/lib.rs b/crates/ironrdp-error/src/lib.rs index 39f12c41..7f4c234c 100644 --- a/crates/ironrdp-error/src/lib.rs +++ b/crates/ironrdp-error/src/lib.rs @@ -8,7 +8,6 @@ extern crate alloc; #[cfg(feature = "alloc")] use alloc::boxed::Box; - use core::fmt; #[cfg(feature = "std")] diff --git a/crates/ironrdp-futures/src/lib.rs b/crates/ironrdp-futures/src/lib.rs index 255f3faa..3b10ed18 100644 --- a/crates/ironrdp-futures/src/lib.rs +++ b/crates/ironrdp-futures/src/lib.rs @@ -6,8 +6,8 @@ #[rustfmt::skip] // do not re-order this pub use pub use ironrdp_async::*; -use std::io; use core::pin::Pin; +use std::io; use bytes::BytesMut; use futures_util::io::{AsyncRead, AsyncWrite}; @@ -42,7 +42,8 @@ impl FramedRead for FuturesStream where S: Send + Sync + Unpin + AsyncRead, { - type ReadFut<'read> = Pin> + Send + Sync + 'read>> + type ReadFut<'read> + = Pin> + Send + Sync + 'read>> where Self: 'read; @@ -64,7 +65,8 @@ impl FramedWrite for FuturesStream where S: Send + Sync + Unpin + AsyncWrite, { - type WriteAllFut<'write> = Pin> + Send + Sync + 'write>> + type WriteAllFut<'write> + = Pin> + Send + Sync + 'write>> where Self: 'write; @@ -110,7 +112,8 @@ impl FramedRead for LocalFuturesStream where S: Unpin + AsyncRead, { - type ReadFut<'read> = Pin> + 'read>> + type ReadFut<'read> + = Pin> + 'read>> where Self: 'read; @@ -132,7 +135,8 @@ impl FramedWrite for LocalFuturesStream where S: Unpin + AsyncWrite, { - type WriteAllFut<'write> = Pin> + 'write>> + type WriteAllFut<'write> + = Pin> + 'write>> where Self: 'write; diff --git a/crates/ironrdp-graphics/src/rdp6/bitmap_stream/decoder.rs b/crates/ironrdp-graphics/src/rdp6/bitmap_stream/decoder.rs index e25d9b2f..be9c51c6 100644 --- a/crates/ironrdp-graphics/src/rdp6/bitmap_stream/decoder.rs +++ b/crates/ironrdp-graphics/src/rdp6/bitmap_stream/decoder.rs @@ -1,5 +1,4 @@ -use ironrdp_core::decode; -use ironrdp_core::DecodeError; +use ironrdp_core::{decode, DecodeError}; use ironrdp_pdu::bitmap::rdp6::{BitmapStream as BitmapStreamPdu, ColorPlaneDefinition}; use thiserror::Error; diff --git a/crates/ironrdp-graphics/src/rdp6/bitmap_stream/encoder.rs b/crates/ironrdp-graphics/src/rdp6/bitmap_stream/encoder.rs index 9c83ead8..73270aae 100644 --- a/crates/ironrdp-graphics/src/rdp6/bitmap_stream/encoder.rs +++ b/crates/ironrdp-graphics/src/rdp6/bitmap_stream/encoder.rs @@ -1,5 +1,4 @@ -use ironrdp_core::WriteCursor; -use ironrdp_core::{not_enough_bytes_err, EncodeError}; +use ironrdp_core::{not_enough_bytes_err, EncodeError, WriteCursor}; use ironrdp_pdu::bitmap::rdp6::{BitmapStreamHeader, ColorPlaneDefinition}; use thiserror::Error; diff --git a/crates/ironrdp-input/src/lib.rs b/crates/ironrdp-input/src/lib.rs index 18a99847..0d9a0556 100644 --- a/crates/ironrdp-input/src/lib.rs +++ b/crates/ironrdp-input/src/lib.rs @@ -3,6 +3,8 @@ html_logo_url = "https://webdevolutions.blob.core.windows.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg" )] +use std::collections::BTreeSet; + use bitvec::array::BitArray; use bitvec::BitArr; use ironrdp_pdu::input::fast_path::{FastPathInputEvent, KeyboardFlags}; @@ -10,7 +12,6 @@ use ironrdp_pdu::input::mouse::PointerFlags; use ironrdp_pdu::input::mouse_x::PointerXFlags; use ironrdp_pdu::input::{MousePdu, MouseXPdu}; use smallvec::SmallVec; -use std::collections::BTreeSet; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[repr(u8)] diff --git a/crates/ironrdp-pdu/src/basic_output/bitmap.rs b/crates/ironrdp-pdu/src/basic_output/bitmap.rs index dfa5891a..52b5163a 100644 --- a/crates/ironrdp-pdu/src/basic_output/bitmap.rs +++ b/crates/ironrdp-pdu/src/basic_output/bitmap.rs @@ -6,10 +6,12 @@ pub mod rdp6; use core::fmt::{self, Debug}; use bitflags::bitflags; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; use crate::geometry::InclusiveRectangle; -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const FIRST_ROW_SIZE_VALUE: u16 = 0; diff --git a/crates/ironrdp-pdu/src/basic_output/bitmap/rdp6.rs b/crates/ironrdp-pdu/src/basic_output/bitmap/rdp6.rs index aca33d8d..c21e582a 100644 --- a/crates/ironrdp-pdu/src/basic_output/bitmap/rdp6.rs +++ b/crates/ironrdp-pdu/src/basic_output/bitmap/rdp6.rs @@ -1,5 +1,7 @@ -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; const NON_RLE_PADDING_SIZE: usize = 1; diff --git a/crates/ironrdp-pdu/src/basic_output/bitmap/tests.rs b/crates/ironrdp-pdu/src/basic_output/bitmap/tests.rs index c13cb0ab..5adfa030 100644 --- a/crates/ironrdp-pdu/src/basic_output/bitmap/tests.rs +++ b/crates/ironrdp-pdu/src/basic_output/bitmap/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode}; const BITMAP_BUFFER: [u8; 114] = [ 0x01, 0x00, // Bitmap update type = must be PDATETYPE_BITMAP (0x0001) diff --git a/crates/ironrdp-pdu/src/basic_output/fast_path.rs b/crates/ironrdp-pdu/src/basic_output/fast_path.rs index 9bc4db17..589a096b 100644 --- a/crates/ironrdp-pdu/src/basic_output/fast_path.rs +++ b/crates/ironrdp-pdu/src/basic_output/fast_path.rs @@ -3,6 +3,10 @@ mod tests; use bit_field::BitField; use bitflags::bitflags; +use ironrdp_core::{ + decode_cursor, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeError, DecodeResult, Encode, + EncodeResult, InvalidFieldErr, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; @@ -12,11 +16,6 @@ use super::surface_commands::{SurfaceCommand, SURFACE_COMMAND_HEADER_SIZE}; use crate::per; use crate::rdp::client_info::CompressionType; use crate::rdp::headers::{CompressionFlags, SHARE_DATA_HEADER_COMPRESSION_MASK}; -use ironrdp_core::{decode_cursor, Decode, Encode}; -use ironrdp_core::{ - ensure_fixed_part_size, ensure_size, invalid_field_err, DecodeError, DecodeResult, EncodeResult, InvalidFieldErr, - ReadCursor, WriteCursor, -}; /// Implements the Fast-Path RDP message header PDU. /// TS_FP_UPDATE_PDU diff --git a/crates/ironrdp-pdu/src/basic_output/fast_path/tests.rs b/crates/ironrdp-pdu/src/basic_output/fast_path/tests.rs index d5778023..fea1e052 100644 --- a/crates/ironrdp-pdu/src/basic_output/fast_path/tests.rs +++ b/crates/ironrdp-pdu/src/basic_output/fast_path/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode}; const FAST_PATH_HEADER_WITH_SHORT_LEN_BUFFER: [u8; 2] = [0x80, 0x08]; const FAST_PATH_HEADER_WITH_LONG_LEN_BUFFER: [u8; 3] = [0x80, 0x81, 0xE7]; diff --git a/crates/ironrdp-pdu/src/basic_output/pointer.rs b/crates/ironrdp-pdu/src/basic_output/pointer.rs index b53fe794..285a4243 100644 --- a/crates/ironrdp-pdu/src/basic_output/pointer.rs +++ b/crates/ironrdp-pdu/src/basic_output/pointer.rs @@ -1,5 +1,7 @@ -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; // Represents `TS_POINT16` described in [MS-RDPBCGR] 2.2.9.1.1.4.1 #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/crates/ironrdp-pdu/src/basic_output/surface_commands.rs b/crates/ironrdp-pdu/src/basic_output/surface_commands.rs index d3ed789e..2da0461f 100644 --- a/crates/ironrdp-pdu/src/basic_output/surface_commands.rs +++ b/crates/ironrdp-pdu/src/basic_output/surface_commands.rs @@ -2,12 +2,14 @@ mod tests; use bitflags::bitflags; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; use crate::geometry::ExclusiveRectangle; -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; pub const SURFACE_COMMAND_HEADER_SIZE: usize = 2; diff --git a/crates/ironrdp-pdu/src/basic_output/surface_commands/tests.rs b/crates/ironrdp-pdu/src/basic_output/surface_commands/tests.rs index 5968aebe..99b36f94 100644 --- a/crates/ironrdp-pdu/src/basic_output/surface_commands/tests.rs +++ b/crates/ironrdp-pdu/src/basic_output/surface_commands/tests.rs @@ -1,8 +1,8 @@ +use ironrdp_core::{decode, encode}; use lazy_static::lazy_static; use super::*; use crate::geometry::ExclusiveRectangle; -use ironrdp_core::{decode, encode}; const FRAME_MARKER_BUFFER: [u8; 8] = [0x4, 0x0, 0x0, 0x0, 0x5, 0x0, 0x0, 0x0]; diff --git a/crates/ironrdp-pdu/src/ber.rs b/crates/ironrdp-pdu/src/ber.rs index f164bf9c..0012acb6 100644 --- a/crates/ironrdp-pdu/src/ber.rs +++ b/crates/ironrdp-pdu/src/ber.rs @@ -1,6 +1,7 @@ -use crate::{DecodeResult, EncodeResult}; use ironrdp_core::{cast_length, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; +use crate::{DecodeResult, EncodeResult}; + #[repr(u8)] #[allow(unused)] pub(crate) enum Pc { diff --git a/crates/ironrdp-pdu/src/codecs/rfx.rs b/crates/ironrdp-pdu/src/codecs/rfx.rs index 777809c1..42177061 100644 --- a/crates/ironrdp-pdu/src/codecs/rfx.rs +++ b/crates/ironrdp-pdu/src/codecs/rfx.rs @@ -4,13 +4,12 @@ mod header_messages; use std::io; use byteorder::{LittleEndian, ReadBytesExt as _, WriteBytesExt as _}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; use thiserror::Error; use crate::PduBufferParsing; -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; #[rustfmt::skip] pub use self::data_messages::{ diff --git a/crates/ironrdp-pdu/src/gcc.rs b/crates/ironrdp-pdu/src/gcc.rs index 5914244e..b7c8cc5d 100644 --- a/crates/ironrdp-pdu/src/gcc.rs +++ b/crates/ironrdp-pdu/src/gcc.rs @@ -1,15 +1,14 @@ use std::io; +use ironrdp_core::{ + cast_length, decode, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeErrorKind, DecodeResult, + Encode, EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; use thiserror::Error; use crate::PduError; -use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, DecodeErrorKind, DecodeResult, EncodeResult, - ReadCursor, WriteCursor, -}; -use ironrdp_core::{decode, Decode, Encode}; pub mod conference_create; diff --git a/crates/ironrdp-pdu/src/gcc/cluster_data.rs b/crates/ironrdp-pdu/src/gcc/cluster_data.rs index 29170f6f..cc94e447 100644 --- a/crates/ironrdp-pdu/src/gcc/cluster_data.rs +++ b/crates/ironrdp-pdu/src/gcc/cluster_data.rs @@ -1,13 +1,13 @@ use std::io; use bitflags::bitflags; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; use thiserror::Error; -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - const REDIRECTION_VERSION_MASK: u32 = 0x0000_003C; const FLAGS_SIZE: usize = 4; diff --git a/crates/ironrdp-pdu/src/gcc/conference_create.rs b/crates/ironrdp-pdu/src/gcc/conference_create.rs index b12549ef..e3d764f6 100644 --- a/crates/ironrdp-pdu/src/gcc/conference_create.rs +++ b/crates/ironrdp-pdu/src/gcc/conference_create.rs @@ -1,7 +1,10 @@ +use ironrdp_core::{ + cast_length, ensure_size, invalid_field_err, other_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; + use super::{ClientGccBlocks, ServerGccBlocks}; use crate::{mcs, per}; -use ironrdp_core::{cast_length, ensure_size, invalid_field_err, other_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const CONFERENCE_REQUEST_OBJECT_ID: [u8; 6] = [0, 0, 20, 124, 0, 1]; const CONFERENCE_REQUEST_CLIENT_TO_SERVER_H221_NON_STANDARD: &[u8; 4] = b"Duca"; diff --git a/crates/ironrdp-pdu/src/gcc/core_data/client.rs b/crates/ironrdp-pdu/src/gcc/core_data/client.rs index 3bcdb96b..9b2bf8c5 100644 --- a/crates/ironrdp-pdu/src/gcc/core_data/client.rs +++ b/crates/ironrdp-pdu/src/gcc/core_data/client.rs @@ -1,4 +1,8 @@ use bitflags::bitflags; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; use tap::Pipe as _; @@ -6,8 +10,6 @@ use tap::Pipe as _; use super::{RdpVersion, VERSION_SIZE}; use crate::nego::SecurityProtocol; use crate::utils; -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; pub const IME_FILE_NAME_SIZE: usize = 64; diff --git a/crates/ironrdp-pdu/src/gcc/core_data/server.rs b/crates/ironrdp-pdu/src/gcc/core_data/server.rs index a2ec91ca..676df2e2 100644 --- a/crates/ironrdp-pdu/src/gcc/core_data/server.rs +++ b/crates/ironrdp-pdu/src/gcc/core_data/server.rs @@ -1,10 +1,12 @@ use bitflags::bitflags; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; use tap::Pipe as _; use super::RdpVersion; use crate::nego::SecurityProtocol; -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const CLIENT_REQUESTED_PROTOCOL_SIZE: usize = 4; const EARLY_CAPABILITY_FLAGS_SIZE: usize = 4; diff --git a/crates/ironrdp-pdu/src/gcc/message_channel_data.rs b/crates/ironrdp-pdu/src/gcc/message_channel_data.rs index 65165602..b01a27c6 100644 --- a/crates/ironrdp-pdu/src/gcc/message_channel_data.rs +++ b/crates/ironrdp-pdu/src/gcc/message_channel_data.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; const CLIENT_FLAGS_SIZE: usize = 4; const SERVER_MCS_MESSAGE_CHANNEL_ID_SIZE: usize = 2; diff --git a/crates/ironrdp-pdu/src/gcc/monitor_data.rs b/crates/ironrdp-pdu/src/gcc/monitor_data.rs index ba1b58e7..f6cb021b 100644 --- a/crates/ironrdp-pdu/src/gcc/monitor_data.rs +++ b/crates/ironrdp-pdu/src/gcc/monitor_data.rs @@ -1,7 +1,8 @@ use bitflags::bitflags; -use ironrdp_core::{cast_length, ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; - -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; pub const MONITOR_COUNT_SIZE: usize = 4; pub const MONITOR_SIZE: usize = 20; diff --git a/crates/ironrdp-pdu/src/gcc/monitor_extended_data.rs b/crates/ironrdp-pdu/src/gcc/monitor_extended_data.rs index 88ff0814..629c78ad 100644 --- a/crates/ironrdp-pdu/src/gcc/monitor_extended_data.rs +++ b/crates/ironrdp-pdu/src/gcc/monitor_extended_data.rs @@ -1,9 +1,10 @@ -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - const MONITOR_COUNT_MAX: usize = 16; const MONITOR_ATTRIBUTE_SIZE: u32 = 20; diff --git a/crates/ironrdp-pdu/src/gcc/multi_transport_channel_data.rs b/crates/ironrdp-pdu/src/gcc/multi_transport_channel_data.rs index 24435199..e9bd3291 100644 --- a/crates/ironrdp-pdu/src/gcc/multi_transport_channel_data.rs +++ b/crates/ironrdp-pdu/src/gcc/multi_transport_channel_data.rs @@ -1,7 +1,7 @@ use bitflags::bitflags; -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; - -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct MultiTransportChannelData { diff --git a/crates/ironrdp-pdu/src/gcc/network_data.rs b/crates/ironrdp-pdu/src/gcc/network_data.rs index f14c2bb1..eea344a8 100644 --- a/crates/ironrdp-pdu/src/gcc/network_data.rs +++ b/crates/ironrdp-pdu/src/gcc/network_data.rs @@ -1,13 +1,14 @@ -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; use std::borrow::Cow; use std::{io, str}; use bitflags::bitflags; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use num_integer::Integer; use thiserror::Error; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - const CHANNELS_MAX: usize = 31; const CLIENT_CHANNEL_OPTIONS_SIZE: usize = 4; diff --git a/crates/ironrdp-pdu/src/gcc/security_data.rs b/crates/ironrdp-pdu/src/gcc/security_data.rs index d98e5181..243b8efd 100644 --- a/crates/ironrdp-pdu/src/gcc/security_data.rs +++ b/crates/ironrdp-pdu/src/gcc/security_data.rs @@ -1,13 +1,14 @@ use std::io; use bitflags::bitflags; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; use thiserror::Error; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - const CLIENT_ENCRYPTION_METHODS_SIZE: usize = 4; const CLIENT_EXT_ENCRYPTION_METHODS_SIZE: usize = 4; diff --git a/crates/ironrdp-pdu/src/geometry.rs b/crates/ironrdp-pdu/src/geometry.rs index 17c6d7c3..eb6f251d 100644 --- a/crates/ironrdp-pdu/src/geometry.rs +++ b/crates/ironrdp-pdu/src/geometry.rs @@ -1,7 +1,6 @@ use core::cmp::{max, min}; -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; pub(crate) mod private { pub struct BaseRectangle { diff --git a/crates/ironrdp-pdu/src/input/fast_path.rs b/crates/ironrdp-pdu/src/input/fast_path.rs index a00f7248..0791e4d5 100644 --- a/crates/ironrdp-pdu/src/input/fast_path.rs +++ b/crates/ironrdp-pdu/src/input/fast_path.rs @@ -1,15 +1,15 @@ use bit_field::BitField; use bitflags::bitflags; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, Decode, DecodeResult, Encode, + EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; use crate::fast_path::EncryptionFlags; use crate::input::{MousePdu, MouseRelPdu, MouseXPdu}; use crate::per; -use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, ReadCursor, WriteCursor, -}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; /// Implements the Fast-Path RDP message header PDU. #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/crates/ironrdp-pdu/src/input/mod.rs b/crates/ironrdp-pdu/src/input/mod.rs index 52ed2736..b4a33d0a 100644 --- a/crates/ironrdp-pdu/src/input/mod.rs +++ b/crates/ironrdp-pdu/src/input/mod.rs @@ -1,12 +1,13 @@ use std::io; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; use thiserror::Error; -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - pub mod fast_path; pub mod mouse; pub mod mouse_rel; diff --git a/crates/ironrdp-pdu/src/input/mouse.rs b/crates/ironrdp-pdu/src/input/mouse.rs index dbfccf2a..6f8fc159 100644 --- a/crates/ironrdp-pdu/src/input/mouse.rs +++ b/crates/ironrdp-pdu/src/input/mouse.rs @@ -1,7 +1,5 @@ use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct MousePdu { diff --git a/crates/ironrdp-pdu/src/input/mouse_rel.rs b/crates/ironrdp-pdu/src/input/mouse_rel.rs index d3b67462..47f1068d 100644 --- a/crates/ironrdp-pdu/src/input/mouse_rel.rs +++ b/crates/ironrdp-pdu/src/input/mouse_rel.rs @@ -1,7 +1,5 @@ use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct MouseRelPdu { diff --git a/crates/ironrdp-pdu/src/input/mouse_x.rs b/crates/ironrdp-pdu/src/input/mouse_x.rs index aa59630a..10937cf8 100644 --- a/crates/ironrdp-pdu/src/input/mouse_x.rs +++ b/crates/ironrdp-pdu/src/input/mouse_x.rs @@ -1,7 +1,5 @@ use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct MouseXPdu { diff --git a/crates/ironrdp-pdu/src/input/scan_code.rs b/crates/ironrdp-pdu/src/input/scan_code.rs index 3a521bf4..1cd17c1c 100644 --- a/crates/ironrdp-pdu/src/input/scan_code.rs +++ b/crates/ironrdp-pdu/src/input/scan_code.rs @@ -1,7 +1,5 @@ use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct ScanCodePdu { diff --git a/crates/ironrdp-pdu/src/input/sync.rs b/crates/ironrdp-pdu/src/input/sync.rs index 937af644..648a5b90 100644 --- a/crates/ironrdp-pdu/src/input/sync.rs +++ b/crates/ironrdp-pdu/src/input/sync.rs @@ -1,7 +1,5 @@ use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct SyncPdu { diff --git a/crates/ironrdp-pdu/src/input/unicode.rs b/crates/ironrdp-pdu/src/input/unicode.rs index 5957c952..7998cdd4 100644 --- a/crates/ironrdp-pdu/src/input/unicode.rs +++ b/crates/ironrdp-pdu/src/input/unicode.rs @@ -1,7 +1,5 @@ use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct UnicodePdu { diff --git a/crates/ironrdp-pdu/src/input/unused.rs b/crates/ironrdp-pdu/src/input/unused.rs index ef496ad4..d5e47f8b 100644 --- a/crates/ironrdp-pdu/src/input/unused.rs +++ b/crates/ironrdp-pdu/src/input/unused.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct UnusedPdu; diff --git a/crates/ironrdp-pdu/src/lib.rs b/crates/ironrdp-pdu/src/lib.rs index 45552688..7f0b3f23 100644 --- a/crates/ironrdp-pdu/src/lib.rs +++ b/crates/ironrdp-pdu/src/lib.rs @@ -9,8 +9,8 @@ #![allow(clippy::cast_sign_loss)] // FIXME: remove use core::fmt; -use ironrdp_core::{unexpected_message_type_err, DecodeResult, EncodeResult, ReadCursor}; +use ironrdp_core::{unexpected_message_type_err, DecodeResult, EncodeResult, ReadCursor}; use ironrdp_error::Source; #[macro_use] diff --git a/crates/ironrdp-pdu/src/mcs.rs b/crates/ironrdp-pdu/src/mcs.rs index 16dca8d2..71185a34 100644 --- a/crates/ironrdp-pdu/src/mcs.rs +++ b/crates/ironrdp-pdu/src/mcs.rs @@ -1,14 +1,15 @@ use std::borrow::Cow; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, unexpected_message_type_err, + IntoOwned, ReadCursor, WriteCursor, +}; + use crate::gcc::{ChannelDef, ClientGccBlocks, ConferenceCreateRequest, ConferenceCreateResponse}; use crate::tpdu::{TpduCode, TpduHeader}; use crate::tpkt::TpktHeader; use crate::x224::{user_data_size, X224Pdu}; use crate::{per, DecodeResult, EncodeResult, PduError}; -use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, unexpected_message_type_err, - IntoOwned, ReadCursor, WriteCursor, -}; // T.125 MCS is defined in: // @@ -938,13 +939,13 @@ pub use legacy::McsError; mod legacy { use std::io; + use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; use thiserror::Error; use super::*; use crate::ber; use crate::gcc::conference_create::{ConferenceCreateRequest, ConferenceCreateResponse}; use crate::gcc::GccError; - use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; // impl<'de> McsPdu<'de> for ConnectInitial { // const MCS_NAME: &'static str = "DisconnectProviderUltimatum"; diff --git a/crates/ironrdp-pdu/src/nego.rs b/crates/ironrdp-pdu/src/nego.rs index 2337e187..ed259902 100644 --- a/crates/ironrdp-pdu/src/nego.rs +++ b/crates/ironrdp-pdu/src/nego.rs @@ -3,13 +3,13 @@ use core::fmt; use bitflags::bitflags; +use ironrdp_core::{ensure_size, invalid_field_err, unexpected_message_type_err, ReadCursor, WriteCursor}; use tap::prelude::*; use crate::tpdu::{TpduCode, TpduHeader}; use crate::tpkt::TpktHeader; use crate::x224::X224Pdu; use crate::{DecodeResult, EncodeResult, Pdu as _}; -use ironrdp_core::{ensure_size, invalid_field_err, unexpected_message_type_err, ReadCursor, WriteCursor}; bitflags! { /// A 32-bit, unsigned integer that contains flags indicating the supported security protocols. diff --git a/crates/ironrdp-pdu/src/pcb.rs b/crates/ironrdp-pdu/src/pcb.rs index e736f95f..457196f8 100644 --- a/crates/ironrdp-pdu/src/pcb.rs +++ b/crates/ironrdp-pdu/src/pcb.rs @@ -1,11 +1,11 @@ //! This module contains the RDP_PRECONNECTION_PDU_V1 and RDP_PRECONNECTION_PDU_V2 structures. -use crate::Pdu; use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, invalid_field_err_with_source, DecodeResult, - EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, invalid_field_err_with_source, Decode, + DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, }; -use ironrdp_core::{Decode, Encode}; + +use crate::Pdu; /// Preconnection PDU version #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/crates/ironrdp-pdu/src/rdp.rs b/crates/ironrdp-pdu/src/rdp.rs index c4dedb81..a97f17d1 100644 --- a/crates/ironrdp-pdu/src/rdp.rs +++ b/crates/ironrdp-pdu/src/rdp.rs @@ -1,5 +1,8 @@ use std::io; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use thiserror::Error; use crate::input::InputEventError; @@ -8,9 +11,6 @@ use crate::rdp::client_info::{ClientInfo, ClientInfoError}; use crate::rdp::headers::{BasicSecurityHeader, BasicSecurityHeaderFlags, ShareControlPduType, ShareDataPduType}; use crate::rdp::server_license::ServerLicenseError; use crate::PduError; -use ironrdp_core::Encode; -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, EncodeResult}; pub mod capability_sets; pub mod client_info; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets.rs b/crates/ironrdp-pdu/src/rdp/capability_sets.rs index 751f2edb..c025a4d9 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets.rs @@ -1,14 +1,14 @@ use std::io; +use ironrdp_core::{ + cast_length, decode, ensure_fixed_part_size, ensure_size, invalid_field_err, unsupported_value_err, Decode, + DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; use thiserror::Error; use crate::{utils, PduError}; -use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, unsupported_value_err, ReadCursor, WriteCursor, -}; -use ironrdp_core::{decode, Decode, DecodeResult, Encode, EncodeResult}; mod bitmap; mod bitmap_cache; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap.rs index b74ba073..56d8c287 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap.rs @@ -2,9 +2,9 @@ mod tests; use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; const BITMAP_LENGTH: usize = 24; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap/tests.rs index 738196f4..a1ba6b06 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const BITMAP_BUFFER: [u8; 24] = [ 0x18, 0x00, // preferredBitsPerPixel diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_cache.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_cache.rs index fd879078..35771ec6 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_cache.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_cache.rs @@ -2,9 +2,7 @@ mod tests; use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; pub const BITMAP_CACHE_ENTRIES_NUM: usize = 3; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_cache/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_cache/tests.rs index 00b933a4..6ee14e9e 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_cache/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_cache/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const CACHE_ENTRY_BUFFER: [u8; 4] = [0x64, 0x00, 0x32, 0x00]; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs.rs index 06ea603d..ae306463 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs.rs @@ -2,14 +2,13 @@ mod tests; use bitflags::bitflags; +use ironrdp_core::{ + cast_length, decode, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, Decode, DecodeResult, + Encode, EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; -use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, ReadCursor, WriteCursor, -}; -use ironrdp_core::{decode, Decode, DecodeResult, Encode, EncodeResult}; - const RFX_ICAP_VERSION: u16 = 0x0100; const RFX_ICAP_TILE_SIZE: u16 = 0x40; const RFX_ICAP_COLOR_CONVERSION: u8 = 1; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs/tests.rs index 064e5122..1625c62f 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs/tests.rs @@ -1,8 +1,7 @@ -use ironrdp_core::DecodeErrorKind; +use ironrdp_core::{decode, decode_cursor, encode_vec, DecodeErrorKind}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, decode_cursor, encode_vec}; const GUID_BUFFER: [u8; 16] = [ 0xb9, 0x1b, 0x8d, 0xca, 0x0f, 0x00, 0x4f, 0x15, 0x58, 0x9f, 0xae, 0x2d, 0x1a, 0x87, 0xe2, 0xd6, diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/brush.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/brush.rs index 646ff4ed..aacde709 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/brush.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/brush.rs @@ -1,12 +1,12 @@ #[cfg(test)] mod tests; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - const BRUSH_LENGTH: usize = 4; #[derive(Copy, Clone, Debug, PartialEq, Eq, FromPrimitive, ToPrimitive)] diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/brush/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/brush/tests.rs index f87a1c84..3941e4f9 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/brush/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/brush/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const BRUSH_BUFFER: [u8; 4] = [0x01, 0x00, 0x00, 0x00]; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/frame_acknowledge.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/frame_acknowledge.rs index cf33d438..ea090c5e 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/frame_acknowledge.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/frame_acknowledge.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct FrameAcknowledge { @@ -44,9 +43,10 @@ impl<'de> Decode<'de> for FrameAcknowledge { #[cfg(test)] mod test { - use super::*; use ironrdp_core::{decode, encode_vec}; + use super::*; + const FRAME_ACKNOWLEDGE_PDU_BUFFER: [u8; 4] = [0xf4, 0xf3, 0xf2, 0xf1]; const FRAME_ACKNOWLEDGE_PDU: FrameAcknowledge = FrameAcknowledge { max_unacknowledged_frame_count: 0xf1f2_f3f4, diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/general.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/general.rs index be46ee72..074a9290 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/general.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/general.rs @@ -4,9 +4,9 @@ mod tests; use std::fmt; use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; const GENERAL_LENGTH: usize = 20; pub const PROTOCOL_VER: u16 = 0x0200; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/general/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/general/tests.rs index 23d3704c..76458295 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/general/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/general/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const GENERAL_CAPSET_BUFFER: [u8; 20] = [ 0x01, 0x00, // osMajorType diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache.rs index 827141ed..6f8866c9 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache.rs @@ -1,12 +1,12 @@ #[cfg(test)] mod tests; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - pub const GLYPH_CACHE_NUM: usize = 10; const GLYPH_CACHE_LENGTH: usize = 48; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache/tests.rs index 3015a0ef..be7443e0 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const GLYPH_CACHE_BUFFER: [u8; 48] = [ 0xfe, 0x00, 0x04, 0x00, 0xfe, 0x00, 0x04, 0x00, 0xfe, 0x00, 0x08, 0x00, 0xfe, 0x00, 0x08, 0x00, 0xfe, 0x00, 0x10, diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/input.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/input.rs index 164ddaec..5dc5c065 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/input.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/input.rs @@ -2,12 +2,11 @@ mod tests; use bitflags::bitflags; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; use num_traits::{FromPrimitive, ToPrimitive}; use crate::gcc::{KeyboardType, IME_FILE_NAME_SIZE}; use crate::utils; -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const INPUT_LENGTH: usize = 84; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/input/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/input/tests.rs index 914ad5ab..a9d15011 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/input/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/input/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const INPUT_BUFFER: [u8; 84] = [ 0x15, 0x00, // inputFlags diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/large_pointer.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/large_pointer.rs index 78f5d342..14c7ad92 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/large_pointer.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/large_pointer.rs @@ -1,7 +1,5 @@ use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, PartialEq, Eq, Clone)] pub struct LargePointer { @@ -52,9 +50,10 @@ bitflags! { #[cfg(test)] mod test { - use super::*; use ironrdp_core::{decode, encode_vec}; + use super::*; + const LARGE_POINTER_PDU_BUFFER: [u8; 2] = [0x01, 0x00]; const LARGE_POINTER_PDU: LargePointer = LargePointer { flags: LargePointerSupportFlags::UP_TO_96X96_PIXELS, diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/multifragment_update.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/multifragment_update.rs index 87dc7910..578d0532 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/multifragment_update.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/multifragment_update.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, PartialEq, Eq, Clone)] pub struct MultifragmentUpdate { @@ -42,9 +41,10 @@ impl<'de> Decode<'de> for MultifragmentUpdate { #[cfg(test)] mod test { - use super::*; use ironrdp_core::{decode, encode_vec}; + use super::*; + const MULTIFRAGMENT_UPDATE_PDU_BUFFER: [u8; 4] = [0xf4, 0xf3, 0xf2, 0xf1]; const MULTIFRAGMENT_UPDATE_PDU: MultifragmentUpdate = MultifragmentUpdate { max_request_size: 0xf1f2_f3f4, diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/offscreen_bitmap_cache.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/offscreen_bitmap_cache.rs index f0446f46..25271c84 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/offscreen_bitmap_cache.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/offscreen_bitmap_cache.rs @@ -1,8 +1,7 @@ #[cfg(test)] mod tests; -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; const OFFSCREEN_BITMAP_CACHE_LENGTH: usize = 8; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/offscreen_bitmap_cache/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/offscreen_bitmap_cache/tests.rs index 95004406..5501ac74 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/offscreen_bitmap_cache/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/offscreen_bitmap_cache/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const OFFSCREEN_BITMAP_CACHE_BUFFER: [u8; 8] = [ 0x01, 0x00, 0x00, 0x00, // offscreenSupportLevel diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/order.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/order.rs index 1dc48d14..30de1c57 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/order.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/order.rs @@ -2,9 +2,7 @@ mod tests; use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; const ORDER_LENGTH: usize = 84; const ORD_LEVEL_1_ORDERS: u16 = 1; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/order/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/order/tests.rs index d4c85a74..3f6c873e 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/order/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/order/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const ORDER_BUFFER: [u8; 84] = [ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/pointer.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/pointer.rs index f8de98c9..5c4d9842 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/pointer.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/pointer.rs @@ -1,8 +1,7 @@ #[cfg(test)] mod tests; -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; const POINTER_LENGTH: usize = 6; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/pointer/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/pointer/tests.rs index 58140710..d5933ab9 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/pointer/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/pointer/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const POINTER_BUFFER: [u8; 6] = [ 0x01, 0x00, // colorPointerFlag diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/sound.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/sound.rs index 895cee2e..e9fb6642 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/sound.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/sound.rs @@ -2,9 +2,7 @@ mod tests; use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; const SOUND_LENGTH: usize = 4; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/sound/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/sound/tests.rs index 60327506..0d3627ec 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/sound/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/sound/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const SOUND_BUFFER: [u8; 4] = [0x01, 0x00, 0x00, 0x00]; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/surface_commands.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/surface_commands.rs index 093f372d..c33cb178 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/surface_commands.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/surface_commands.rs @@ -2,9 +2,7 @@ mod tests; use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; const SURFACE_COMMANDS_LENGTH: usize = 8; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/surface_commands/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/surface_commands/tests.rs index 5311adb8..1dfbb2c0 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/surface_commands/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/surface_commands/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const SURFACE_COMMANDS_BUFFER: [u8; 8] = [ 0x52, 0x00, 0x00, 0x00, // flags diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/virtual_channel.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/virtual_channel.rs index 5d8508e7..f5fed5a7 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/virtual_channel.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/virtual_channel.rs @@ -2,9 +2,9 @@ mod tests; use bitflags::bitflags; - -use ironrdp_core::{ensure_fixed_part_size, ensure_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; const FLAGS_FIELD_SIZE: usize = 4; const CHUNK_SIZE_FIELD_SIZE: usize = 4; diff --git a/crates/ironrdp-pdu/src/rdp/capability_sets/virtual_channel/tests.rs b/crates/ironrdp-pdu/src/rdp/capability_sets/virtual_channel/tests.rs index db2a431c..6f42c549 100644 --- a/crates/ironrdp-pdu/src/rdp/capability_sets/virtual_channel/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/capability_sets/virtual_channel/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const VIRTUAL_CHANNEL_INCOMPLETE_BUFFER: [u8; 4] = [ 0x01, 0x00, 0x00, 0x00, // flags diff --git a/crates/ironrdp-pdu/src/rdp/client_info.rs b/crates/ironrdp-pdu/src/rdp/client_info.rs index 913c93ed..78a81b4c 100644 --- a/crates/ironrdp-pdu/src/rdp/client_info.rs +++ b/crates/ironrdp-pdu/src/rdp/client_info.rs @@ -2,14 +2,16 @@ use core::fmt; use std::io; use bitflags::bitflags; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; use thiserror::Error; use crate::utils::CharacterSet; use crate::{utils, PduError}; -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const RECONNECT_COOKIE_LEN: usize = 28; const TIMEZONE_INFO_NAME_LEN: usize = 64; @@ -703,9 +705,10 @@ fn string_len(value: &str, character_set: CharacterSet) -> u16 { } pub mod builder { - use super::*; use core::marker::PhantomData; + use super::*; + pub struct ExtendedClientOptionalInfoBuilderStateSetTimeZone; pub struct ExtendedClientOptionalInfoBuilderStateSetSessionId; pub struct ExtendedClientOptionalInfoBuilderStateSetPerformanceFlags; diff --git a/crates/ironrdp-pdu/src/rdp/finalization_messages.rs b/crates/ironrdp-pdu/src/rdp/finalization_messages.rs index 19f177e1..a1c9fb70 100644 --- a/crates/ironrdp-pdu/src/rdp/finalization_messages.rs +++ b/crates/ironrdp-pdu/src/rdp/finalization_messages.rs @@ -1,10 +1,12 @@ use bitflags::bitflags; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; use crate::gcc; -use ironrdp_core::{cast_length, ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const SYNCHRONIZE_PDU_SIZE: usize = 2 + 2; const CONTROL_PDU_SIZE: usize = 2 + 2 + 4; diff --git a/crates/ironrdp-pdu/src/rdp/headers.rs b/crates/ironrdp-pdu/src/rdp/headers.rs index c4df4c54..4cb0e1b9 100644 --- a/crates/ironrdp-pdu/src/rdp/headers.rs +++ b/crates/ironrdp-pdu/src/rdp/headers.rs @@ -1,4 +1,8 @@ use bitflags::bitflags; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, not_enough_bytes_err, other_err, Decode, + DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; @@ -11,11 +15,6 @@ use crate::rdp::refresh_rectangle::RefreshRectanglePdu; use crate::rdp::server_error_info::ServerSetErrorInfoPdu; use crate::rdp::session_info::SaveSessionInfoPdu; use crate::rdp::suppress_output::SuppressOutputPdu; -use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, not_enough_bytes_err, other_err, ReadCursor, - WriteCursor, -}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; pub const BASIC_SECURITY_HEADER_SIZE: usize = 4; pub const SHARE_DATA_HEADER_COMPRESSION_MASK: u8 = 0xF; diff --git a/crates/ironrdp-pdu/src/rdp/refresh_rectangle.rs b/crates/ironrdp-pdu/src/rdp/refresh_rectangle.rs index c3ff9981..5f9de045 100644 --- a/crates/ironrdp-pdu/src/rdp/refresh_rectangle.rs +++ b/crates/ironrdp-pdu/src/rdp/refresh_rectangle.rs @@ -1,6 +1,9 @@ +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; + use crate::geometry::InclusiveRectangle; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; /// [2.2.11.2.1] Refresh Rect PDU Data (TS_REFRESH_RECT_PDU) /// diff --git a/crates/ironrdp-pdu/src/rdp/server_error_info.rs b/crates/ironrdp-pdu/src/rdp/server_error_info.rs index 4fa9b685..4c22eea1 100644 --- a/crates/ironrdp-pdu/src/rdp/server_error_info.rs +++ b/crates/ironrdp-pdu/src/rdp/server_error_info.rs @@ -1,9 +1,9 @@ +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - #[derive(Debug, Clone, PartialEq, Eq)] pub struct ServerSetErrorInfoPdu(pub ErrorInfo); diff --git a/crates/ironrdp-pdu/src/rdp/server_license.rs b/crates/ironrdp-pdu/src/rdp/server_license.rs index a5edb1af..19215a1e 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license.rs @@ -1,6 +1,10 @@ use std::io; use bitflags::bitflags; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, invalid_field_err, unsupported_value_err, Decode, DecodeResult, Encode, + EncodeResult, ReadCursor, WriteCursor, +}; use md5::Digest; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; @@ -8,10 +12,6 @@ use thiserror::Error; use crate::rdp::headers::{BasicSecurityHeader, BasicSecurityHeaderFlags, BASIC_SECURITY_HEADER_SIZE}; use crate::PduError; -use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, unsupported_value_err, ReadCursor, WriteCursor, -}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; #[cfg(test)] mod tests; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/client_new_license_request.rs b/crates/ironrdp-pdu/src/rdp/server_license/client_new_license_request.rs index 8cd29589..f1d9a14b 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/client_new_license_request.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/client_new_license_request.rs @@ -4,6 +4,9 @@ mod tests; use std::io; use bitflags::bitflags; +use ironrdp_core::{ + ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use md5::Digest; use super::{ @@ -13,8 +16,6 @@ use super::{ }; use crate::crypto::rsa::encrypt_with_public_key; use crate::utils::{self, CharacterSet}; -use ironrdp_core::{ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const LICENSE_REQUEST_STATIC_FIELDS_SIZE: usize = 20; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/client_new_license_request/tests.rs b/crates/ironrdp-pdu/src/rdp/server_license/client_new_license_request/tests.rs index 79f152f3..70334a50 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/client_new_license_request/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/client_new_license_request/tests.rs @@ -1,11 +1,11 @@ use byteorder::{LittleEndian, WriteBytesExt}; +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; use crate::rdp::server_license::server_license_request::cert::{CertificateType, X509CertificateChain}; use crate::rdp::server_license::server_license_request::{ProductInfo, Scope, ServerCertificate}; use crate::rdp::server_license::{LicensePdu, PREAMBLE_SIZE}; -use ironrdp_core::{decode, encode_vec}; const LICENSE_HEADER_BUFFER_NO_SIZE: [u8; 6] = [ 0x80, 0x00, // flags diff --git a/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response.rs b/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response.rs index 26342660..1e7e039f 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response.rs @@ -4,6 +4,10 @@ mod test; use std::io::Write; use byteorder::{LittleEndian, WriteBytesExt as _}; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use md5::Digest; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; @@ -14,8 +18,6 @@ use super::{ BLOB_TYPE_SIZE, MAC_SIZE, PLATFORM_ID, PREAMBLE_SIZE, }; use crate::crypto::rc4::Rc4; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const RESPONSE_DATA_VERSION: u16 = 0x100; const RESPONSE_DATA_STATIC_FIELDS_SIZE: usize = 8; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response/test.rs b/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response/test.rs index 4ab957d4..6416a0ed 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response/test.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response/test.rs @@ -1,3 +1,4 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; @@ -5,7 +6,6 @@ use crate::rdp::server_license::{ BasicSecurityHeader, BasicSecurityHeaderFlags, LicenseHeader, LicensePdu, PreambleFlags, PreambleType, PreambleVersion, BASIC_SECURITY_HEADER_SIZE, PREAMBLE_SIZE, }; -use ironrdp_core::{decode, encode_vec}; const PLATFORM_CHALLENGE_RESPONSE_DATA_BUFFER: [u8; 18] = [ 0x00, 0x01, // version diff --git a/crates/ironrdp-pdu/src/rdp/server_license/licensing_error_message.rs b/crates/ironrdp-pdu/src/rdp/server_license/licensing_error_message.rs index fcfb1cf9..b6fb40f0 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/licensing_error_message.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/licensing_error_message.rs @@ -1,16 +1,16 @@ #[cfg(test)] mod test; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; use super::{BlobHeader, BlobType, LicenseHeader, PreambleFlags, PreambleVersion, BLOB_LENGTH_SIZE, BLOB_TYPE_SIZE}; -use crate::rdp::{ - headers::{BasicSecurityHeader, BasicSecurityHeaderFlags, BASIC_SECURITY_HEADER_SIZE}, - server_license::PreambleType, -}; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; +use crate::rdp::headers::{BasicSecurityHeader, BasicSecurityHeaderFlags, BASIC_SECURITY_HEADER_SIZE}; +use crate::rdp::server_license::PreambleType; const ERROR_CODE_SIZE: usize = 4; const STATE_TRANSITION_SIZE: usize = 4; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/licensing_error_message/test.rs b/crates/ironrdp-pdu/src/rdp/server_license/licensing_error_message/test.rs index 2a3371bf..974e1e3a 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/licensing_error_message/test.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/licensing_error_message/test.rs @@ -1,11 +1,9 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use crate::rdp::{ - headers::{BasicSecurityHeader, BasicSecurityHeaderFlags}, - server_license::{LicensePdu, PreambleFlags, PreambleVersion}, -}; -use ironrdp_core::{decode, encode_vec}; +use crate::rdp::headers::{BasicSecurityHeader, BasicSecurityHeaderFlags}; +use crate::rdp::server_license::{LicensePdu, PreambleFlags, PreambleVersion}; const HEADER_MESSAGE_BUFFER: [u8; 8] = [0x80, 0x00, 0x00, 0x00, 0xFF, 0x03, 0x14, 0x00]; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/server_license_request.rs b/crates/ironrdp-pdu/src/rdp/server_license/server_license_request.rs index e27c89ed..2fd7948d 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/server_license_request.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/server_license_request.rs @@ -4,14 +4,16 @@ pub mod cert; mod tests; use cert::{CertificateType, ProprietaryCertificate, X509CertificateChain}; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use super::{ BlobHeader, BlobType, LicenseHeader, PreambleType, ServerLicenseError, BLOB_LENGTH_SIZE, BLOB_TYPE_SIZE, KEY_EXCHANGE_ALGORITHM_RSA, RANDOM_NUMBER_SIZE, UTF16_NULL_TERMINATOR_SIZE, UTF8_NULL_TERMINATOR_SIZE, }; use crate::utils; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const CERT_VERSION_FIELD_SIZE: usize = 4; const KEY_EXCHANGE_FIELD_SIZE: usize = 4; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/server_license_request/cert.rs b/crates/ironrdp-pdu/src/rdp/server_license/server_license_request/cert.rs index 26763754..86f4b5b3 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/server_license_request/cert.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/server_license_request/cert.rs @@ -1,6 +1,9 @@ +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; + use super::{BlobHeader, BlobType, KEY_EXCHANGE_ALGORITHM_RSA}; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; pub const SIGNATURE_ALGORITHM_RSA: u32 = 1; pub const PROP_CERT_NO_BLOBS_SIZE: usize = 8; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/server_license_request/tests.rs b/crates/ironrdp-pdu/src/rdp/server_license/server_license_request/tests.rs index f51f3567..87416433 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/server_license_request/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/server_license_request/tests.rs @@ -1,10 +1,10 @@ +use ironrdp_core::{decode, encode_vec, Encode}; use lazy_static::lazy_static; use super::cert::{RsaPublicKey, PROP_CERT_BLOBS_HEADERS_SIZE, PROP_CERT_NO_BLOBS_SIZE, RSA_KEY_SIZE_WITHOUT_MODULUS}; use super::*; use crate::rdp::headers::{BasicSecurityHeader, BasicSecurityHeaderFlags}; use crate::rdp::server_license::{LicensePdu, PreambleFlags, PreambleVersion}; -use ironrdp_core::{decode, encode_vec, Encode}; const LICENSE_HEADER_BUFFER_WITH_CERT: [u8; 8] = [0x80, 0x00, 0x00, 0x00, 0x01, 0x03, 0x9C, 0x08]; const LICENSE_HEADER_BUFFER_NO_CERT: [u8; 8] = [0x80, 0x00, 0x00, 0x00, 0x01, 0x03, 0x8A, 0x00]; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/server_platform_challenge.rs b/crates/ironrdp-pdu/src/rdp/server_license/server_platform_challenge.rs index 87d16e87..658558e8 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/server_platform_challenge.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/server_platform_challenge.rs @@ -1,9 +1,11 @@ #[cfg(test)] mod test; +use ironrdp_core::{ + ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; + use super::{BlobHeader, BlobType, LicenseHeader, PreambleType, BLOB_LENGTH_SIZE, BLOB_TYPE_SIZE, MAC_SIZE}; -use ironrdp_core::{ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const CONNECT_FLAGS_FIELD_SIZE: usize = 4; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/server_platform_challenge/test.rs b/crates/ironrdp-pdu/src/rdp/server_license/server_platform_challenge/test.rs index 46bbd6ed..ac61d260 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/server_platform_challenge/test.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/server_platform_challenge/test.rs @@ -1,3 +1,4 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; @@ -5,7 +6,6 @@ use crate::rdp::server_license::{ BasicSecurityHeader, BasicSecurityHeaderFlags, LicensePdu, PreambleFlags, PreambleVersion, BASIC_SECURITY_HEADER_SIZE, }; -use ironrdp_core::{decode, encode_vec}; const PLATFORM_CHALLENGE_BUFFER: [u8; 42] = [ 0x80, 0x00, // flags diff --git a/crates/ironrdp-pdu/src/rdp/server_license/server_upgrade_license.rs b/crates/ironrdp-pdu/src/rdp/server_license/server_upgrade_license.rs index 81bcb56e..6751b912 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/server_upgrade_license.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/server_upgrade_license.rs @@ -1,6 +1,11 @@ #[cfg(test)] mod tests; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; + use super::{ BlobHeader, BlobType, LicenseEncryptionData, LicenseHeader, PreambleType, ServerLicenseError, BLOB_LENGTH_SIZE, BLOB_TYPE_SIZE, MAC_SIZE, UTF16_NULL_TERMINATOR_SIZE, UTF8_NULL_TERMINATOR_SIZE, @@ -8,8 +13,6 @@ use super::{ use crate::crypto::rc4::Rc4; use crate::utils; use crate::utils::CharacterSet; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const NEW_LICENSE_INFO_STATIC_FIELDS_SIZE: usize = 20; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/server_upgrade_license/tests.rs b/crates/ironrdp-pdu/src/rdp/server_license/server_upgrade_license/tests.rs index e5f92f74..2a398fef 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/server_upgrade_license/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/server_upgrade_license/tests.rs @@ -1,3 +1,4 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; @@ -5,7 +6,6 @@ use crate::rdp::server_license::{ BasicSecurityHeader, BasicSecurityHeaderFlags, LicensePdu, PreambleFlags, PreambleVersion, BASIC_SECURITY_HEADER_SIZE, PREAMBLE_SIZE, }; -use ironrdp_core::{decode, encode_vec}; const SERVER_UPGRADE_LICENSE_BUFFER: [u8; 2059] = [ 0x80, 0x00, // flags diff --git a/crates/ironrdp-pdu/src/rdp/server_license/tests.rs b/crates/ironrdp-pdu/src/rdp/server_license/tests.rs index cebe8367..27e12c61 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const LICENSE_HEADER_BUFFER: [u8; 8] = [ 0x80, 0x00, // flags diff --git a/crates/ironrdp-pdu/src/rdp/session_info.rs b/crates/ironrdp-pdu/src/rdp/session_info.rs index cd47d2f3..fc91ae78 100644 --- a/crates/ironrdp-pdu/src/rdp/session_info.rs +++ b/crates/ironrdp-pdu/src/rdp/session_info.rs @@ -1,12 +1,14 @@ use std::io; +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; use thiserror::Error; use crate::PduError; -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; #[cfg(test)] mod tests; diff --git a/crates/ironrdp-pdu/src/rdp/session_info/logon_extended.rs b/crates/ironrdp-pdu/src/rdp/session_info/logon_extended.rs index 1aaea885..acbc11a7 100644 --- a/crates/ironrdp-pdu/src/rdp/session_info/logon_extended.rs +++ b/crates/ironrdp-pdu/src/rdp/session_info/logon_extended.rs @@ -1,10 +1,11 @@ use bitflags::bitflags; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - const LOGON_EX_LENGTH_FIELD_SIZE: usize = 2; const LOGON_EX_FLAGS_FIELD_SIZE: usize = 4; const LOGON_EX_PADDING_SIZE: usize = 570; diff --git a/crates/ironrdp-pdu/src/rdp/session_info/logon_info.rs b/crates/ironrdp-pdu/src/rdp/session_info/logon_info.rs index 76f399da..5a5509f1 100644 --- a/crates/ironrdp-pdu/src/rdp/session_info/logon_info.rs +++ b/crates/ironrdp-pdu/src/rdp/session_info/logon_info.rs @@ -1,6 +1,9 @@ +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; + use crate::utils; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const DOMAIN_NAME_SIZE_FIELD_SIZE: usize = 4; const DOMAIN_NAME_SIZE_V1: usize = 52; diff --git a/crates/ironrdp-pdu/src/rdp/session_info/tests.rs b/crates/ironrdp-pdu/src/rdp/session_info/tests.rs index 5bd25116..ddb8a3f9 100644 --- a/crates/ironrdp-pdu/src/rdp/session_info/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/session_info/tests.rs @@ -1,8 +1,6 @@ -use ironrdp_core::DecodeErrorKind; +use ironrdp_core::{decode, encode_vec, DecodeErrorKind, Encode}; use lazy_static::lazy_static; -use ironrdp_core::{decode, encode_vec, Encode}; - use super::*; const LOGON_INFO_V1_BUFFER: [u8; 576] = [ diff --git a/crates/ironrdp-pdu/src/rdp/suppress_output.rs b/crates/ironrdp-pdu/src/rdp/suppress_output.rs index 0ad4a5b4..42e083d1 100644 --- a/crates/ironrdp-pdu/src/rdp/suppress_output.rs +++ b/crates/ironrdp-pdu/src/rdp/suppress_output.rs @@ -1,6 +1,9 @@ +use ironrdp_core::{ + ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; + use crate::geometry::InclusiveRectangle; -use ironrdp_core::{ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; #[repr(u8)] #[derive(Debug, PartialEq, Eq, Clone)] diff --git a/crates/ironrdp-pdu/src/rdp/vc.rs b/crates/ironrdp-pdu/src/rdp/vc.rs index ecd66124..ae465291 100644 --- a/crates/ironrdp-pdu/src/rdp/vc.rs +++ b/crates/ironrdp-pdu/src/rdp/vc.rs @@ -6,11 +6,10 @@ mod tests; use std::{io, str}; use bitflags::bitflags; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; use thiserror::Error; use crate::PduError; -use ironrdp_core::{ensure_fixed_part_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const CHANNEL_PDU_HEADER_SIZE: usize = 8; diff --git a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx.rs b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx.rs index da847100..90afd4a7 100644 --- a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx.rs +++ b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx.rs @@ -9,12 +9,13 @@ pub use graphics_messages::{ QueueDepth, ResetGraphicsPdu, SolidFillPdu, StartFramePdu, SurfaceToCachePdu, SurfaceToSurfacePdu, Timestamp, WireToSurface1Pdu, WireToSurface2Pdu, }; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive as _, ToPrimitive as _}; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; - #[derive(Debug, Clone, PartialEq, Eq)] pub enum ServerPdu { WireToSurface1(WireToSurface1Pdu), diff --git a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages.rs b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages.rs index ae69b31a..450dc77f 100644 --- a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages.rs +++ b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages.rs @@ -9,6 +9,10 @@ use num_traits::{FromPrimitive as _, ToPrimitive as _}; #[rustfmt::skip] // do not re-order this pub use avc_messages::{Avc420BitmapStream, Avc444BitmapStream, Encoding, QuantQuality}; pub use client::{CacheImportReplyPdu, CapabilitiesAdvertisePdu, FrameAcknowledgePdu, QueueDepth}; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; pub use server::{ CacheToSurfacePdu, CapabilitiesConfirmPdu, Codec1Type, Codec2Type, CreateSurfacePdu, DeleteEncodingContextPdu, DeleteSurfacePdu, EndFramePdu, EvictCacheEntryPdu, MapSurfaceToOutputPdu, MapSurfaceToScaledOutputPdu, @@ -17,8 +21,6 @@ pub use server::{ }; use super::RDP_GFX_HEADER_SIZE; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; const CAPABILITY_SET_HEADER_SIZE: usize = 8; diff --git a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/avc_messages.rs b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/avc_messages.rs index 295f332e..ace2d9a8 100644 --- a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/avc_messages.rs +++ b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/avc_messages.rs @@ -2,10 +2,12 @@ use core::fmt::Debug; use bit_field::BitField; use bitflags::bitflags; +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, +}; use crate::geometry::InclusiveRectangle; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct QuantQuality { diff --git a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/client.rs b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/client.rs index 8c64aa10..45d1b802 100644 --- a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/client.rs +++ b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/client.rs @@ -1,6 +1,9 @@ +use ironrdp_core::{ + cast_length, ensure_fixed_part_size, ensure_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, +}; + use super::CapabilitySet; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct CapabilitiesAdvertisePdu(pub Vec); diff --git a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/server.rs b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/server.rs index 910a6fa5..81b2bea5 100644 --- a/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/server.rs +++ b/crates/ironrdp-pdu/src/rdp/vc/dvc/gfx/graphics_messages/server.rs @@ -1,14 +1,16 @@ use std::fmt; use bit_field::BitField; +use ironrdp_core::{ + cast_length, decode_cursor, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, + EncodeResult, ReadCursor, WriteCursor, +}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; use super::{CapabilitySet, Color, Point, RDP_GFX_HEADER_SIZE}; use crate::gcc::Monitor; use crate::geometry::InclusiveRectangle; -use ironrdp_core::{cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, ReadCursor, WriteCursor}; -use ironrdp_core::{decode_cursor, Decode, DecodeResult, Encode, EncodeResult}; pub(crate) const RESET_GRAPHICS_PDU_SIZE: usize = 340; diff --git a/crates/ironrdp-pdu/src/rdp/vc/tests.rs b/crates/ironrdp-pdu/src/rdp/vc/tests.rs index 7c27b44b..b781bc4e 100644 --- a/crates/ironrdp-pdu/src/rdp/vc/tests.rs +++ b/crates/ironrdp-pdu/src/rdp/vc/tests.rs @@ -1,7 +1,7 @@ +use ironrdp_core::{decode, encode_vec}; use lazy_static::lazy_static; use super::*; -use ironrdp_core::{decode, encode_vec}; const CHANNEL_CHUNK_LENGTH_DEFAULT: u32 = 1600; const CHANNEL_PDU_HEADER_BUFFER: [u8; CHANNEL_PDU_HEADER_SIZE] = [0x40, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00]; diff --git a/crates/ironrdp-pdu/src/tpdu.rs b/crates/ironrdp-pdu/src/tpdu.rs index f85e4668..37d9cfb6 100644 --- a/crates/ironrdp-pdu/src/tpdu.rs +++ b/crates/ironrdp-pdu/src/tpdu.rs @@ -1,9 +1,10 @@ -use crate::tpkt::TpktHeader; -use crate::{DecodeResult, EncodeResult}; use ironrdp_core::{ ensure_fixed_part_size, ensure_size, invalid_field_err, unexpected_message_type_err, ReadCursor, WriteCursor, }; +use crate::tpkt::TpktHeader; +use crate::{DecodeResult, EncodeResult}; + /// TPDU type used during X.224 messages exchange #[derive(Copy, Clone, Debug, PartialEq, Eq)] pub struct TpduCode(u8); diff --git a/crates/ironrdp-pdu/src/tpkt.rs b/crates/ironrdp-pdu/src/tpkt.rs index 402762cb..10767513 100644 --- a/crates/ironrdp-pdu/src/tpkt.rs +++ b/crates/ironrdp-pdu/src/tpkt.rs @@ -1,6 +1,7 @@ -use crate::{DecodeResult, EncodeResult}; use ironrdp_core::{ensure_fixed_part_size, unsupported_version_err, ReadCursor, WriteCursor}; +use crate::{DecodeResult, EncodeResult}; + /// TPKT header /// /// TPKTs are defined in: diff --git a/crates/ironrdp-pdu/src/utils.rs b/crates/ironrdp-pdu/src/utils.rs index f5782db6..b0658787 100644 --- a/crates/ironrdp-pdu/src/utils.rs +++ b/crates/ironrdp-pdu/src/utils.rs @@ -1,11 +1,12 @@ -use byteorder::{LittleEndian, ReadBytesExt as _}; -use num_derive::{FromPrimitive, ToPrimitive}; use core::fmt::Debug; use core::mem::size_of; use core::ops::Add; -use crate::{DecodeResult, EncodeResult}; +use byteorder::{LittleEndian, ReadBytesExt as _}; use ironrdp_core::{ensure_size, invalid_field_err, other_err, ReadCursor, WriteCursor}; +use num_derive::{FromPrimitive, ToPrimitive}; + +use crate::{DecodeResult, EncodeResult}; pub fn split_u64(value: u64) -> (u32, u32) { let bytes = value.to_le_bytes(); diff --git a/crates/ironrdp-pdu/src/x224.rs b/crates/ironrdp-pdu/src/x224.rs index 27bd5f24..c4edc9bb 100644 --- a/crates/ironrdp-pdu/src/x224.rs +++ b/crates/ironrdp-pdu/src/x224.rs @@ -1,10 +1,12 @@ use std::borrow::Cow; +use ironrdp_core::{ + ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, IntoOwned, ReadCursor, WriteCursor, +}; + use crate::tpdu::{TpduCode, TpduHeader}; use crate::tpkt::TpktHeader; use crate::Pdu; -use ironrdp_core::{ensure_size, invalid_field_err, IntoOwned, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; pub trait X224Pdu<'de>: Sized { const X224_NAME: &'static str; diff --git a/crates/ironrdp-rdpdr-native/src/nix/backend.rs b/crates/ironrdp-rdpdr-native/src/nix/backend.rs index 03fca44c..b5a1d75b 100644 --- a/crates/ironrdp-rdpdr-native/src/nix/backend.rs +++ b/crates/ironrdp-rdpdr-native/src/nix/backend.rs @@ -1,3 +1,8 @@ +use std::ffi::CString; +use std::io::{Read, Seek, SeekFrom, Write}; +use std::os::fd::{AsFd, AsRawFd}; +use std::os::unix::fs::MetadataExt; + use ironrdp_core::impl_as_any; use ironrdp_pdu::{encode_err, PduResult}; use ironrdp_rdpdr::pdu::efs::*; @@ -6,11 +11,6 @@ use ironrdp_rdpdr::pdu::RdpdrPdu; use ironrdp_rdpdr::RdpdrBackend; use ironrdp_svc::SvcMessage; use nix::dir::{Dir, OwningIter}; -use std::ffi::CString; -use std::io::Read; -use std::io::{Seek, SeekFrom, Write}; -use std::os::fd::{AsFd, AsRawFd}; -use std::os::unix::fs::MetadataExt; #[derive(Debug, Default)] pub struct NixRdpdrBackend { diff --git a/crates/ironrdp-rdpdr/src/backend/mod.rs b/crates/ironrdp-rdpdr/src/backend/mod.rs index 8fd9ae9f..6c0f1519 100644 --- a/crates/ironrdp-rdpdr/src/backend/mod.rs +++ b/crates/ironrdp-rdpdr/src/backend/mod.rs @@ -4,10 +4,10 @@ use core::fmt; use ironrdp_core::AsAny; use ironrdp_pdu::PduResult; +use ironrdp_svc::SvcMessage; use crate::pdu::efs::{DeviceControlRequest, ServerDeviceAnnounceResponse, ServerDriveIoRequest}; use crate::pdu::esc::{ScardCall, ScardIoCtlCode}; -use ironrdp_svc::SvcMessage; /// OS-specific device redirection backend interface. pub trait RdpdrBackend: AsAny + fmt::Debug + Send { diff --git a/crates/ironrdp-rdpdr/src/lib.rs b/crates/ironrdp-rdpdr/src/lib.rs index 4f2cb71a..8a9a9534 100644 --- a/crates/ironrdp-rdpdr/src/lib.rs +++ b/crates/ironrdp-rdpdr/src/lib.rs @@ -11,13 +11,9 @@ #[macro_use] extern crate tracing; -use ironrdp_core::decode_cursor; -use ironrdp_core::impl_as_any; -use ironrdp_core::ReadCursor; -use ironrdp_pdu::decode_err; +use ironrdp_core::{decode_cursor, impl_as_any, ReadCursor}; use ironrdp_pdu::gcc::ChannelName; -use ironrdp_pdu::pdu_other_err; -use ironrdp_pdu::PduResult; +use ironrdp_pdu::{decode_err, pdu_other_err, PduResult}; use ironrdp_svc::{CompressionCondition, SvcClientProcessor, SvcMessage, SvcProcessor}; use pdu::efs::{ Capabilities, ClientDeviceListAnnounce, ClientNameRequest, ClientNameRequestUnicodeFlag, CoreCapability, diff --git a/crates/ironrdp-rdpdr/src/pdu/mod.rs b/crates/ironrdp-rdpdr/src/pdu/mod.rs index ee560e9a..0f262037 100644 --- a/crates/ironrdp-rdpdr/src/pdu/mod.rs +++ b/crates/ironrdp-rdpdr/src/pdu/mod.rs @@ -2,10 +2,9 @@ use core::fmt::{self, Display}; use core::mem::size_of; use ironrdp_core::{ - ensure_size, invalid_field_err, unsupported_value_err, DecodeError, DecodeResult, EncodeResult, ReadCursor, - WriteCursor, + ensure_size, invalid_field_err, unsupported_value_err, Decode, DecodeError, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use ironrdp_svc::SvcEncode; use self::efs::{ diff --git a/crates/ironrdp-rdpsnd-native/examples/cpal.rs b/crates/ironrdp-rdpsnd-native/examples/cpal.rs index 2e598558..d3d96d9c 100644 --- a/crates/ironrdp-rdpsnd-native/examples/cpal.rs +++ b/crates/ironrdp-rdpsnd-native/examples/cpal.rs @@ -1,6 +1,6 @@ +use core::time::Duration; use std::sync::mpsc; use std::thread; -use core::time::Duration; use anyhow::Context; use cpal::traits::StreamTrait; diff --git a/crates/ironrdp-rdpsnd-native/src/cpal.rs b/crates/ironrdp-rdpsnd-native/src/cpal.rs index 01186fbb..395ebbb1 100644 --- a/crates/ironrdp-rdpsnd-native/src/cpal.rs +++ b/crates/ironrdp-rdpsnd-native/src/cpal.rs @@ -1,9 +1,9 @@ -use std::borrow::Cow; use core::sync::atomic::{AtomicBool, Ordering}; +use core::time::Duration; +use std::borrow::Cow; use std::sync::mpsc::{self, Receiver, Sender}; use std::sync::Arc; use std::thread::{self, JoinHandle}; -use core::time::Duration; use anyhow::{bail, Context}; use cpal::traits::{DeviceTrait, HostTrait}; diff --git a/crates/ironrdp-rdpsnd/src/client.rs b/crates/ironrdp-rdpsnd/src/client.rs index 8ee79192..82fcbecc 100644 --- a/crates/ironrdp-rdpsnd/src/client.rs +++ b/crates/ironrdp-rdpsnd/src/client.rs @@ -1,15 +1,8 @@ use std::borrow::Cow; -use ironrdp_core::cast_length; -use ironrdp_core::impl_as_any; -use ironrdp_core::Decode; -use ironrdp_core::EncodeResult; -use ironrdp_core::ReadCursor; -use ironrdp_pdu::decode_err; -use ironrdp_pdu::encode_err; +use ironrdp_core::{cast_length, impl_as_any, Decode, EncodeResult, ReadCursor}; use ironrdp_pdu::gcc::ChannelName; -use ironrdp_pdu::pdu_other_err; -use ironrdp_pdu::PduResult; +use ironrdp_pdu::{decode_err, encode_err, pdu_other_err, PduResult}; use ironrdp_svc::{CompressionCondition, SvcClientProcessor, SvcMessage, SvcProcessor}; use tracing::{debug, error}; diff --git a/crates/ironrdp-rdpsnd/src/pdu/mod.rs b/crates/ironrdp-rdpsnd/src/pdu/mod.rs index 9f1b315e..da6f636b 100644 --- a/crates/ironrdp-rdpsnd/src/pdu/mod.rs +++ b/crates/ironrdp-rdpsnd/src/pdu/mod.rs @@ -7,10 +7,9 @@ use std::fmt; use bitflags::bitflags; use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, DecodeError, DecodeResult, - EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, Decode, DecodeError, DecodeResult, + Encode, EncodeResult, ReadCursor, WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use ironrdp_pdu::{read_padding, write_padding}; use ironrdp_svc::SvcEncode; diff --git a/crates/ironrdp-rdpsnd/src/server.rs b/crates/ironrdp-rdpsnd/src/server.rs index d5d89355..8671cafa 100644 --- a/crates/ironrdp-rdpsnd/src/server.rs +++ b/crates/ironrdp-rdpsnd/src/server.rs @@ -1,10 +1,6 @@ -use ironrdp_core::impl_as_any; -use ironrdp_core::Decode; -use ironrdp_core::ReadCursor; -use ironrdp_pdu::decode_err; +use ironrdp_core::{impl_as_any, Decode, ReadCursor}; use ironrdp_pdu::gcc::ChannelName; -use ironrdp_pdu::pdu_other_err; -use ironrdp_pdu::PduResult; +use ironrdp_pdu::{decode_err, pdu_other_err, PduResult}; use ironrdp_svc::{CompressionCondition, SvcMessage, SvcProcessor, SvcProcessorMessages, SvcServerProcessor}; use tracing::{debug, error}; diff --git a/crates/ironrdp-server/src/encoder/bitmap.rs b/crates/ironrdp-server/src/encoder/bitmap.rs index 521ffdbf..c502cdf3 100644 --- a/crates/ironrdp-server/src/encoder/bitmap.rs +++ b/crates/ironrdp-server/src/encoder/bitmap.rs @@ -1,5 +1,4 @@ -use ironrdp_core::Encode; -use ironrdp_core::{invalid_field_err, EncodeResult, WriteCursor}; +use ironrdp_core::{invalid_field_err, Encode, EncodeResult, WriteCursor}; use ironrdp_graphics::image_processing::PixelFormat; use ironrdp_graphics::rdp6::{ABgrChannels, ARgbChannels, BgrAChannels, BitmapStreamEncoder, RgbAChannels}; use ironrdp_pdu::bitmap::{self, BitmapData, BitmapUpdateData, Compression}; diff --git a/crates/ironrdp-server/src/encoder/mod.rs b/crates/ironrdp-server/src/encoder/mod.rs index 0c388409..05b1424e 100644 --- a/crates/ironrdp-server/src/encoder/mod.rs +++ b/crates/ironrdp-server/src/encoder/mod.rs @@ -4,8 +4,7 @@ pub(crate) mod rfx; use core::{cmp, mem}; use anyhow::{Context, Result}; -use ironrdp_core::Encode; -use ironrdp_core::WriteCursor; +use ironrdp_core::{Encode, WriteCursor}; use ironrdp_pdu::fast_path::{EncryptionFlags, FastPathHeader, FastPathUpdatePdu, Fragmentation, UpdateCode}; use ironrdp_pdu::geometry::ExclusiveRectangle; use ironrdp_pdu::pointer::{ColorPointerAttribute, Point16, PointerAttribute, PointerPositionAttribute}; diff --git a/crates/ironrdp-server/src/helper.rs b/crates/ironrdp-server/src/helper.rs index cd3673b6..7548c249 100644 --- a/crates/ironrdp-server/src/helper.rs +++ b/crates/ironrdp-server/src/helper.rs @@ -1,4 +1,7 @@ -use std::{fs::File, io::BufReader, path::Path, sync::Arc}; +use std::fs::File; +use std::io::BufReader; +use std::path::Path; +use std::sync::Arc; use anyhow::Context; use rustls_pemfile::{certs, pkcs8_private_keys}; diff --git a/crates/ironrdp-server/src/lib.rs b/crates/ironrdp-server/src/lib.rs index 62b2e563..a0523c24 100644 --- a/crates/ironrdp-server/src/lib.rs +++ b/crates/ironrdp-server/src/lib.rs @@ -4,8 +4,7 @@ )] #![allow(clippy::arithmetic_side_effects)] // TODO: should we enable this lint back? -pub use tokio; -pub use tokio_rustls; +pub use {tokio, tokio_rustls}; #[macro_use] extern crate tracing; diff --git a/crates/ironrdp-server/src/server.rs b/crates/ironrdp-server/src/server.rs index e59e2bb4..ef8e6206 100644 --- a/crates/ironrdp-server/src/server.rs +++ b/crates/ironrdp-server/src/server.rs @@ -947,7 +947,8 @@ impl FramedWrite for SharedWriter<'_, W> where W: FramedWrite, { - type WriteAllFut<'write> = core::pin::Pin> + 'write>> + type WriteAllFut<'write> + = core::pin::Pin> + 'write>> where Self: 'write; diff --git a/crates/ironrdp-session/src/fast_path.rs b/crates/ironrdp-session/src/fast_path.rs index 120ef7a2..1099715b 100644 --- a/crates/ironrdp-session/src/fast_path.rs +++ b/crates/ironrdp-session/src/fast_path.rs @@ -1,7 +1,6 @@ use std::rc::Rc; -use ironrdp_core::decode_cursor; -use ironrdp_core::{DecodeErrorKind, ReadCursor, WriteBuf}; +use ironrdp_core::{decode_cursor, DecodeErrorKind, ReadCursor, WriteBuf}; use ironrdp_graphics::image_processing::PixelFormat; use ironrdp_graphics::pointer::{DecodedPointer, PointerBitmapTarget}; use ironrdp_graphics::rdp6::BitmapStreamDecoder; diff --git a/crates/ironrdp-session/src/x224/mod.rs b/crates/ironrdp-session/src/x224/mod.rs index 552dac12..3313aabe 100644 --- a/crates/ironrdp-session/src/x224/mod.rs +++ b/crates/ironrdp-session/src/x224/mod.rs @@ -1,8 +1,7 @@ use ironrdp_connector::connection_activation::ConnectionActivationSequence; use ironrdp_connector::legacy::SendDataIndicationCtx; use ironrdp_core::WriteBuf; -use ironrdp_dvc::DynamicVirtualChannel; -use ironrdp_dvc::{DrdynvcClient, DvcProcessor}; +use ironrdp_dvc::{DrdynvcClient, DvcProcessor, DynamicVirtualChannel}; use ironrdp_pdu::mcs::{DisconnectProviderUltimatum, DisconnectReason, McsMessage}; use ironrdp_pdu::rdp::headers::ShareDataPdu; use ironrdp_pdu::rdp::server_error_info::{ErrorInfo, ProtocolIndependentCode, ServerSetErrorInfoPdu}; diff --git a/crates/ironrdp-svc/src/lib.rs b/crates/ironrdp-svc/src/lib.rs index 412e6b5a..58abc08d 100644 --- a/crates/ironrdp-svc/src/lib.rs +++ b/crates/ironrdp-svc/src/lib.rs @@ -16,12 +16,14 @@ use alloc::boxed::Box; use alloc::collections::BTreeMap; use core::any::TypeId; use core::fmt; -use std::borrow::Cow; use core::marker::PhantomData; +use std::borrow::Cow; use bitflags::bitflags; -use ironrdp_core::{assert_obj_safe, AsAny, DecodeResult, EncodeResult, ReadCursor, WriteBuf, WriteCursor}; -use ironrdp_core::{decode_cursor, encode_buf, Encode}; +use ironrdp_core::{ + assert_obj_safe, decode_cursor, encode_buf, AsAny, DecodeResult, Encode, EncodeResult, ReadCursor, WriteBuf, + WriteCursor, +}; use ironrdp_pdu::gcc::{ChannelName, ChannelOptions}; use ironrdp_pdu::{decode_err, mcs, PduResult}; use pdu::gcc::ChannelDef; diff --git a/crates/ironrdp-testsuite-core/src/now_proto.rs b/crates/ironrdp-testsuite-core/src/now_proto.rs index deeca7dc..008d125f 100644 --- a/crates/ironrdp-testsuite-core/src/now_proto.rs +++ b/crates/ironrdp-testsuite-core/src/now_proto.rs @@ -1,9 +1,6 @@ //! Various test utilities use expect_test::Expect; - -use ironrdp_core::Decode as _; -use ironrdp_core::ReadCursor; - +use ironrdp_core::{Decode as _, ReadCursor}; use now_proto_pdu::NowMessage; pub fn now_msg_roundtrip(msg: impl Into, expected_bytes: Expect) { diff --git a/crates/ironrdp-testsuite-core/tests/displaycontrol/mod.rs b/crates/ironrdp-testsuite-core/tests/displaycontrol/mod.rs index 1642addd..5a31df70 100644 --- a/crates/ironrdp-testsuite-core/tests/displaycontrol/mod.rs +++ b/crates/ironrdp-testsuite-core/tests/displaycontrol/mod.rs @@ -1,6 +1,5 @@ -use ironrdp_displaycontrol::pdu; - use ironrdp_core::decode; +use ironrdp_displaycontrol::pdu; use ironrdp_testsuite_core::encode_decode_test; encode_decode_test! { diff --git a/crates/ironrdp-testsuite-core/tests/dvc/mod.rs b/crates/ironrdp-testsuite-core/tests/dvc/mod.rs index 154e19ee..9c56425e 100644 --- a/crates/ironrdp-testsuite-core/tests/dvc/mod.rs +++ b/crates/ironrdp-testsuite-core/tests/dvc/mod.rs @@ -1,14 +1,11 @@ -use ironrdp_core::Decode; -use ironrdp_core::Encode; -use ironrdp_core::{ReadCursor, WriteCursor}; -use ironrdp_dvc::pdu::ClosePdu; -use ironrdp_dvc::pdu::DataPdu; -use ironrdp_dvc::pdu::{CapabilitiesRequestPdu, CapabilitiesResponsePdu, CapsVersion}; -use ironrdp_dvc::pdu::{CreateRequestPdu, CreateResponsePdu, CreationStatus}; -use ironrdp_dvc::pdu::{DataFirstPdu, FieldType}; -use ironrdp_dvc::pdu::{DrdynvcClientPdu, DrdynvcDataPdu, DrdynvcServerPdu}; use std::sync::OnceLock; +use ironrdp_core::{Decode, Encode, ReadCursor, WriteCursor}; +use ironrdp_dvc::pdu::{ + CapabilitiesRequestPdu, CapabilitiesResponsePdu, CapsVersion, ClosePdu, CreateRequestPdu, CreateResponsePdu, + CreationStatus, DataFirstPdu, DataPdu, DrdynvcClientPdu, DrdynvcDataPdu, DrdynvcServerPdu, FieldType, +}; + // TODO: This likely generalizes to many tests and can thus be reused outside of this module. fn test_encodes(data: &T, expected: &[u8]) { let mut buffer = vec![0x00; data.size()]; diff --git a/crates/ironrdp-testsuite-core/tests/graphics/color_conversion.rs b/crates/ironrdp-testsuite-core/tests/graphics/color_conversion.rs index a601949f..8bec2db0 100644 --- a/crates/ironrdp-testsuite-core/tests/graphics/color_conversion.rs +++ b/crates/ironrdp-testsuite-core/tests/graphics/color_conversion.rs @@ -1,4 +1,5 @@ -use ironrdp_graphics::{color_conversion::*, image_processing::PixelFormat}; +use ironrdp_graphics::color_conversion::*; +use ironrdp_graphics::image_processing::PixelFormat; #[test] fn to_64x64_ycbcr() { diff --git a/crates/ironrdp-testsuite-core/tests/now_proto/buffer.rs b/crates/ironrdp-testsuite-core/tests/now_proto/buffer.rs index 1e5a1b45..05468a27 100644 --- a/crates/ironrdp-testsuite-core/tests/now_proto/buffer.rs +++ b/crates/ironrdp-testsuite-core/tests/now_proto/buffer.rs @@ -1,5 +1,4 @@ use now_proto_pdu::*; - use rstest::rstest; #[rstest] diff --git a/crates/ironrdp-testsuite-core/tests/now_proto/exec.rs b/crates/ironrdp-testsuite-core/tests/now_proto/exec.rs index a43fe5e2..61b5328e 100644 --- a/crates/ironrdp-testsuite-core/tests/now_proto/exec.rs +++ b/crates/ironrdp-testsuite-core/tests/now_proto/exec.rs @@ -1,5 +1,4 @@ use expect_test::expect; - use ironrdp_testsuite_core::now_proto::now_msg_roundtrip; use now_proto_pdu::*; diff --git a/crates/ironrdp-testsuite-core/tests/now_proto/session.rs b/crates/ironrdp-testsuite-core/tests/now_proto/session.rs index 577f5763..d7add6f2 100644 --- a/crates/ironrdp-testsuite-core/tests/now_proto/session.rs +++ b/crates/ironrdp-testsuite-core/tests/now_proto/session.rs @@ -1,5 +1,4 @@ use expect_test::expect; - use ironrdp_testsuite_core::now_proto::now_msg_roundtrip; use now_proto_pdu::*; diff --git a/crates/ironrdp-testsuite-core/tests/now_proto/status.rs b/crates/ironrdp-testsuite-core/tests/now_proto/status.rs index dd4a1549..4e5de747 100644 --- a/crates/ironrdp-testsuite-core/tests/now_proto/status.rs +++ b/crates/ironrdp-testsuite-core/tests/now_proto/status.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{Decode as _, Encode as _}; -use ironrdp_core::{ReadCursor, WriteCursor}; +use ironrdp_core::{Decode as _, Encode as _, ReadCursor, WriteCursor}; use now_proto_pdu::{NowSeverity, NowStatus, NowStatusCode}; #[test] diff --git a/crates/ironrdp-testsuite-core/tests/now_proto/string.rs b/crates/ironrdp-testsuite-core/tests/now_proto/string.rs index ba0cb4e2..26e72c61 100644 --- a/crates/ironrdp-testsuite-core/tests/now_proto/string.rs +++ b/crates/ironrdp-testsuite-core/tests/now_proto/string.rs @@ -1,5 +1,4 @@ use now_proto_pdu::*; - use rstest::rstest; #[rstest] diff --git a/crates/ironrdp-testsuite-core/tests/now_proto/system.rs b/crates/ironrdp-testsuite-core/tests/now_proto/system.rs index d45807b7..1136f41b 100644 --- a/crates/ironrdp-testsuite-core/tests/now_proto/system.rs +++ b/crates/ironrdp-testsuite-core/tests/now_proto/system.rs @@ -1,5 +1,4 @@ use expect_test::expect; - use ironrdp_testsuite_core::now_proto::now_msg_roundtrip; use now_proto_pdu::*; diff --git a/crates/ironrdp-testsuite-core/tests/pdu/gcc.rs b/crates/ironrdp-testsuite-core/tests/pdu/gcc.rs index 7522bd95..03ef10d2 100644 --- a/crates/ironrdp-testsuite-core/tests/pdu/gcc.rs +++ b/crates/ironrdp-testsuite-core/tests/pdu/gcc.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{decode, encode_vec, Encode}; -use ironrdp_core::{DecodeErrorKind, EncodeErrorKind, ReadCursor}; +use ironrdp_core::{decode, encode_vec, DecodeErrorKind, Encode, EncodeErrorKind, ReadCursor}; use ironrdp_pdu::gcc::*; use ironrdp_testsuite_core::cluster_data::*; use ironrdp_testsuite_core::conference_create::*; diff --git a/crates/ironrdp-testsuite-core/tests/pdu/gfx.rs b/crates/ironrdp-testsuite-core/tests/pdu/gfx.rs index 24c30f45..21f0cf99 100644 --- a/crates/ironrdp-testsuite-core/tests/pdu/gfx.rs +++ b/crates/ironrdp-testsuite-core/tests/pdu/gfx.rs @@ -1,5 +1,4 @@ -use ironrdp_core::ReadCursor; -use ironrdp_core::{decode, decode_cursor, encode_vec, Encode}; +use ironrdp_core::{decode, decode_cursor, encode_vec, Encode, ReadCursor}; use ironrdp_testsuite_core::gfx::*; use ironrdp_testsuite_core::graphics_messages::*; diff --git a/crates/ironrdp-testsuite-core/tests/pdu/input.rs b/crates/ironrdp-testsuite-core/tests/pdu/input.rs index 2e4def08..6bc1b54d 100644 --- a/crates/ironrdp-testsuite-core/tests/pdu/input.rs +++ b/crates/ironrdp-testsuite-core/tests/pdu/input.rs @@ -1,5 +1,4 @@ -use ironrdp_core::ReadCursor; -use ironrdp_core::{decode_cursor, encode_vec}; +use ironrdp_core::{decode_cursor, encode_vec, ReadCursor}; use ironrdp_pdu::input::fast_path::{FastPathInput, FastPathInputEvent}; use ironrdp_pdu::input::mouse::PointerFlags; use ironrdp_pdu::input::MousePdu; diff --git a/crates/ironrdp-tls/src/rustls.rs b/crates/ironrdp-tls/src/rustls.rs index 2991b8fc..2f9bbc1b 100644 --- a/crates/ironrdp-tls/src/rustls.rs +++ b/crates/ironrdp-tls/src/rustls.rs @@ -1,7 +1,8 @@ use std::io; use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt as _}; -use tokio_rustls::rustls::{self, pki_types::ServerName}; +use tokio_rustls::rustls::pki_types::ServerName; +use tokio_rustls::rustls::{self}; pub type TlsStream = tokio_rustls::client::TlsStream; @@ -49,8 +50,7 @@ where mod danger { use tokio_rustls::rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}; - use tokio_rustls::rustls::pki_types; - use tokio_rustls::rustls::{DigitallySignedStruct, Error, SignatureScheme}; + use tokio_rustls::rustls::{pki_types, DigitallySignedStruct, Error, SignatureScheme}; #[derive(Debug)] pub(super) struct NoCertificateVerification; diff --git a/crates/ironrdp-tokio/src/lib.rs b/crates/ironrdp-tokio/src/lib.rs index 3044a2ac..5074f0ef 100644 --- a/crates/ironrdp-tokio/src/lib.rs +++ b/crates/ironrdp-tokio/src/lib.rs @@ -6,8 +6,8 @@ #[rustfmt::skip] // do not re-order this pub use pub use ironrdp_async::*; -use std::io; use core::pin::Pin; +use std::io; use bytes::BytesMut; use tokio::io::{AsyncRead, AsyncWrite, ReadHalf, WriteHalf}; @@ -62,7 +62,8 @@ impl FramedRead for TokioStream where S: Send + Sync + Unpin + AsyncRead, { - type ReadFut<'read> = Pin> + Send + Sync + 'read>> + type ReadFut<'read> + = Pin> + Send + Sync + 'read>> where Self: 'read; @@ -77,7 +78,8 @@ impl FramedWrite for TokioStream where S: Send + Sync + Unpin + AsyncWrite, { - type WriteAllFut<'write> = Pin> + Send + Sync + 'write>> + type WriteAllFut<'write> + = Pin> + Send + Sync + 'write>> where Self: 'write; @@ -123,7 +125,8 @@ impl FramedRead for LocalTokioStream where S: Unpin + AsyncRead, { - type ReadFut<'read> = Pin> + 'read>> + type ReadFut<'read> + = Pin> + 'read>> where Self: 'read; @@ -138,7 +141,8 @@ impl FramedWrite for LocalTokioStream where S: Unpin + AsyncWrite, { - type WriteAllFut<'write> = Pin> + 'write>> + type WriteAllFut<'write> + = Pin> + 'write>> where Self: 'write; diff --git a/crates/ironrdp-web/src/session.rs b/crates/ironrdp-web/src/session.rs index 6ced91f5..63879ef7 100644 --- a/crates/ironrdp-web/src/session.rs +++ b/crates/ironrdp-web/src/session.rs @@ -2,10 +2,10 @@ #![allow(non_snake_case)] use core::cell::RefCell; -use std::borrow::Cow; use core::num::NonZeroU32; -use std::rc::Rc; use core::time::Duration; +use std::borrow::Cow; +use std::rc::Rc; use anyhow::Context as _; use base64::Engine as _; diff --git a/crates/ironrdp/examples/screenshot.rs b/crates/ironrdp/examples/screenshot.rs index d9dce02d..b398268a 100644 --- a/crates/ironrdp/examples/screenshot.rs +++ b/crates/ironrdp/examples/screenshot.rs @@ -20,10 +20,10 @@ #[macro_use] extern crate tracing; +use core::time::Duration; use std::io::Write as _; use std::net::TcpStream; use std::path::PathBuf; -use core::time::Duration; use anyhow::Context as _; use connector::Credentials; @@ -380,8 +380,7 @@ fn extract_tls_server_public_key(cert: &[u8]) -> anyhow::Result> { mod danger { use tokio_rustls::rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}; - use tokio_rustls::rustls::pki_types; - use tokio_rustls::rustls::{DigitallySignedStruct, Error, SignatureScheme}; + use tokio_rustls::rustls::{pki_types, DigitallySignedStruct, Error, SignatureScheme}; #[derive(Debug)] pub(super) struct NoCertificateVerification; diff --git a/crates/ironrdp/examples/server.rs b/crates/ironrdp/examples/server.rs index 8a4ab9f9..0ed797a3 100644 --- a/crates/ironrdp/examples/server.rs +++ b/crates/ironrdp/examples/server.rs @@ -16,9 +16,10 @@ use ironrdp::cliprdr::backend::{CliprdrBackend, CliprdrBackendFactory}; use ironrdp::connector::DesktopSize; use ironrdp::rdpsnd::pdu::ClientAudioFormatPdu; use ironrdp::rdpsnd::server::{RdpsndServerHandler, RdpsndServerMessage}; +use ironrdp::server::tokio::sync::mpsc::UnboundedSender; +use ironrdp::server::tokio::time::{self, sleep, Duration}; +use ironrdp::server::tokio::{self}; use ironrdp::server::{ - tokio::time::{self, sleep, Duration}, - tokio::{self, sync::mpsc::UnboundedSender}, BitmapUpdate, CliprdrServerFactory, Credentials, DisplayUpdate, KeyboardEvent, MouseEvent, PixelFormat, PixelOrder, RdpServer, RdpServerDisplay, RdpServerDisplayUpdates, RdpServerInputHandler, ServerEvent, ServerEventSender, SoundServerFactory, TlsIdentityCtx, diff --git a/crates/now-proto-pdu/src/core/buffer.rs b/crates/now-proto-pdu/src/core/buffer.rs index db3d2734..0be118fe 100644 --- a/crates/now-proto-pdu/src/core/buffer.rs +++ b/crates/now-proto-pdu/src/core/buffer.rs @@ -3,10 +3,9 @@ use alloc::vec::Vec; use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, - WriteCursor, + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::VarU32; diff --git a/crates/now-proto-pdu/src/core/header.rs b/crates/now-proto-pdu/src/core/header.rs index 79eb9003..5d0fa590 100644 --- a/crates/now-proto-pdu/src/core/header.rs +++ b/crates/now-proto-pdu/src/core/header.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{ensure_fixed_part_size, DecodeResult, EncodeResult, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, Encode}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct NowMessageClass(pub u8); diff --git a/crates/now-proto-pdu/src/core/mod.rs b/crates/now-proto-pdu/src/core/mod.rs index 69e18f26..1e0572ef 100644 --- a/crates/now-proto-pdu/src/core/mod.rs +++ b/crates/now-proto-pdu/src/core/mod.rs @@ -6,9 +6,8 @@ mod number; mod status; mod string; -pub use header::{NowHeader, NowMessageClass}; - pub use buffer::{NowLrgBuf, NowVarBuf}; +pub use header::{NowHeader, NowMessageClass}; pub use number::{VarI16, VarI32, VarI64, VarU16, VarU32, VarU64}; pub use status::{NowSeverity, NowStatus, NowStatusCode}; pub use string::{NowLrgStr, NowString128, NowString16, NowString256, NowString32, NowString64, NowVarStr}; diff --git a/crates/now-proto-pdu/src/core/number.rs b/crates/now-proto-pdu/src/core/number.rs index 0a496569..bcd99deb 100644 --- a/crates/now-proto-pdu/src/core/number.rs +++ b/crates/now-proto-pdu/src/core/number.rs @@ -1,8 +1,8 @@ //! Variable-length number types. use ironrdp_core::{ - ensure_size, invalid_field_err, DecodeError, DecodeResult, EncodeError, EncodeResult, ReadCursor, WriteCursor, + ensure_size, invalid_field_err, Decode, DecodeError, DecodeResult, Encode, EncodeError, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; /// Variable-length encoded u16. /// Value range:`[0..0x7FFF]` diff --git a/crates/now-proto-pdu/src/core/status.rs b/crates/now-proto-pdu/src/core/status.rs index d88d3a03..8231719a 100644 --- a/crates/now-proto-pdu/src/core/status.rs +++ b/crates/now-proto-pdu/src/core/status.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - ensure_fixed_part_size, invalid_field_err, DecodeError, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + ensure_fixed_part_size, invalid_field_err, Decode, DecodeError, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; /// Error or status severity. #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/crates/now-proto-pdu/src/core/string.rs b/crates/now-proto-pdu/src/core/string.rs index 6ca1dae3..d9064951 100644 --- a/crates/now-proto-pdu/src/core/string.rs +++ b/crates/now-proto-pdu/src/core/string.rs @@ -3,10 +3,9 @@ use alloc::string::String; use ironrdp_core::{ - cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, - WriteCursor, + cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::VarU32; diff --git a/crates/now-proto-pdu/src/exec/abort.rs b/crates/now-proto-pdu/src/exec/abort.rs index da3f215d..75a59866 100644 --- a/crates/now-proto-pdu/src/exec/abort.rs +++ b/crates/now-proto-pdu/src/exec/abort.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowStatus}; diff --git a/crates/now-proto-pdu/src/exec/batch.rs b/crates/now-proto-pdu/src/exec/batch.rs index aaa61fc1..78ca7d20 100644 --- a/crates/now-proto-pdu/src/exec/batch.rs +++ b/crates/now-proto-pdu/src/exec/batch.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowVarStr}; diff --git a/crates/now-proto-pdu/src/exec/cancel_req.rs b/crates/now-proto-pdu/src/exec/cancel_req.rs index 3db60b36..8597d749 100644 --- a/crates/now-proto-pdu/src/exec/cancel_req.rs +++ b/crates/now-proto-pdu/src/exec/cancel_req.rs @@ -1,5 +1,6 @@ -use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, Encode}; +use ironrdp_core::{ + ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass}; diff --git a/crates/now-proto-pdu/src/exec/cancel_rsp.rs b/crates/now-proto-pdu/src/exec/cancel_rsp.rs index 6e850360..d98d409e 100644 --- a/crates/now-proto-pdu/src/exec/cancel_rsp.rs +++ b/crates/now-proto-pdu/src/exec/cancel_rsp.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowStatus}; diff --git a/crates/now-proto-pdu/src/exec/capset.rs b/crates/now-proto-pdu/src/exec/capset.rs index 198b1d7a..eba3b556 100644 --- a/crates/now-proto-pdu/src/exec/capset.rs +++ b/crates/now-proto-pdu/src/exec/capset.rs @@ -1,7 +1,5 @@ use bitflags::bitflags; - -use ironrdp_core::{invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, Encode}; +use ironrdp_core::{invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass}; diff --git a/crates/now-proto-pdu/src/exec/data.rs b/crates/now-proto-pdu/src/exec/data.rs index e52e7488..d41822cc 100644 --- a/crates/now-proto-pdu/src/exec/data.rs +++ b/crates/now-proto-pdu/src/exec/data.rs @@ -1,9 +1,8 @@ use bitflags::bitflags; - use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowVarBuf}; diff --git a/crates/now-proto-pdu/src/exec/mod.rs b/crates/now-proto-pdu/src/exec/mod.rs index 7b85ea9a..99560344 100644 --- a/crates/now-proto-pdu/src/exec/mod.rs +++ b/crates/now-proto-pdu/src/exec/mod.rs @@ -12,17 +12,13 @@ mod run; mod shell; mod win_ps; -use ironrdp_core::Encode; -use ironrdp_core::{invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor}; - -use crate::NowHeader; - pub use abort::NowExecAbortMsg; pub use batch::NowExecBatchMsg; pub use cancel_req::NowExecCancelReqMsg; pub use cancel_rsp::NowExecCancelRspMsg; pub use capset::{NowExecCapsetFlags, NowExecCapsetMsg}; pub use data::{NowExecDataFlags, NowExecDataMsg}; +use ironrdp_core::{invalid_field_err, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; pub use process::NowExecProcessMsg; pub use pwsh::NowExecPwshMsg; pub use result::NowExecResultMsg; @@ -30,6 +26,8 @@ pub use run::NowExecRunMsg; pub use shell::NowExecShellMsg; pub use win_ps::{NowExecWinPsFlags, NowExecWinPsMsg}; +use crate::NowHeader; + #[derive(Debug, Clone, PartialEq, Eq)] pub enum NowExecMessage { Capset(NowExecCapsetMsg), diff --git a/crates/now-proto-pdu/src/exec/process.rs b/crates/now-proto-pdu/src/exec/process.rs index 4b51ae43..24dc0d3c 100644 --- a/crates/now-proto-pdu/src/exec/process.rs +++ b/crates/now-proto-pdu/src/exec/process.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowVarStr}; diff --git a/crates/now-proto-pdu/src/exec/pwsh.rs b/crates/now-proto-pdu/src/exec/pwsh.rs index bb2464af..2d655462 100644 --- a/crates/now-proto-pdu/src/exec/pwsh.rs +++ b/crates/now-proto-pdu/src/exec/pwsh.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowExecWinPsFlags, NowHeader, NowMessage, NowMessageClass, NowVarStr}; diff --git a/crates/now-proto-pdu/src/exec/result.rs b/crates/now-proto-pdu/src/exec/result.rs index 2c1fe42f..d6010673 100644 --- a/crates/now-proto-pdu/src/exec/result.rs +++ b/crates/now-proto-pdu/src/exec/result.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowStatus}; diff --git a/crates/now-proto-pdu/src/exec/run.rs b/crates/now-proto-pdu/src/exec/run.rs index 3754cba0..b39174ea 100644 --- a/crates/now-proto-pdu/src/exec/run.rs +++ b/crates/now-proto-pdu/src/exec/run.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowVarStr}; diff --git a/crates/now-proto-pdu/src/exec/shell.rs b/crates/now-proto-pdu/src/exec/shell.rs index 4bbf3220..53905bc2 100644 --- a/crates/now-proto-pdu/src/exec/shell.rs +++ b/crates/now-proto-pdu/src/exec/shell.rs @@ -1,7 +1,7 @@ use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowVarStr}; diff --git a/crates/now-proto-pdu/src/exec/win_ps.rs b/crates/now-proto-pdu/src/exec/win_ps.rs index 6f491bc7..0eb4a225 100644 --- a/crates/now-proto-pdu/src/exec/win_ps.rs +++ b/crates/now-proto-pdu/src/exec/win_ps.rs @@ -1,9 +1,8 @@ use bitflags::bitflags; - use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowExecMessage, NowExecMsgKind, NowHeader, NowMessage, NowMessageClass, NowVarStr}; diff --git a/crates/now-proto-pdu/src/lib.rs b/crates/now-proto-pdu/src/lib.rs index 11e9ab1f..2d114f50 100644 --- a/crates/now-proto-pdu/src/lib.rs +++ b/crates/now-proto-pdu/src/lib.rs @@ -25,6 +25,7 @@ mod session; mod system; pub use core::*; + pub use exec::*; pub use message::*; pub use session::*; diff --git a/crates/now-proto-pdu/src/message.rs b/crates/now-proto-pdu/src/message.rs index 8d9130eb..259101fc 100644 --- a/crates/now-proto-pdu/src/message.rs +++ b/crates/now-proto-pdu/src/message.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{Decode, Encode}; -use ironrdp_core::{DecodeResult, EncodeResult, ReadCursor, WriteCursor}; +use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; use crate::{NowExecMessage, NowHeader, NowMessageClass, NowSessionMessage, NowSystemMessage}; diff --git a/crates/now-proto-pdu/src/session/lock.rs b/crates/now-proto-pdu/src/session/lock.rs index d7064611..d77f70bd 100644 --- a/crates/now-proto-pdu/src/session/lock.rs +++ b/crates/now-proto-pdu/src/session/lock.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{Decode, Encode}; -use ironrdp_core::{DecodeResult, EncodeResult, ReadCursor, WriteCursor}; +use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; use crate::{NowHeader, NowMessage, NowMessageClass, NowSessionMessage, NowSessionMessageKind}; diff --git a/crates/now-proto-pdu/src/session/logoff.rs b/crates/now-proto-pdu/src/session/logoff.rs index 53521e18..8bba4ee7 100644 --- a/crates/now-proto-pdu/src/session/logoff.rs +++ b/crates/now-proto-pdu/src/session/logoff.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{Decode, Encode}; -use ironrdp_core::{DecodeResult, EncodeResult, ReadCursor, WriteCursor}; +use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; use crate::{NowHeader, NowMessage, NowMessageClass, NowSessionMessage, NowSessionMessageKind}; diff --git a/crates/now-proto-pdu/src/session/mod.rs b/crates/now-proto-pdu/src/session/mod.rs index 36e6e7cb..46a2e407 100644 --- a/crates/now-proto-pdu/src/session/mod.rs +++ b/crates/now-proto-pdu/src/session/mod.rs @@ -3,9 +3,7 @@ mod logoff; mod msg_box_req; mod msg_box_rsp; -use ironrdp_core::{DecodeResult, EncodeResult, ReadCursor, WriteCursor}; - -use ironrdp_core::Encode; +use ironrdp_core::{DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; pub use lock::NowSessionLockMsg; pub use logoff::NowSessionLogoffMsg; pub use msg_box_req::{NowMessageBoxStyle, NowSessionMsgBoxReqMsg}; diff --git a/crates/now-proto-pdu/src/session/msg_box_req.rs b/crates/now-proto-pdu/src/session/msg_box_req.rs index 653865d2..9c875810 100644 --- a/crates/now-proto-pdu/src/session/msg_box_req.rs +++ b/crates/now-proto-pdu/src/session/msg_box_req.rs @@ -1,10 +1,10 @@ use alloc::string::String; -use bitflags::bitflags; +use bitflags::bitflags; use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, + WriteCursor, }; -use ironrdp_core::{Decode, Encode}; use crate::{NowHeader, NowMessage, NowMessageClass, NowSessionMessage, NowSessionMessageKind, NowVarStr}; diff --git a/crates/now-proto-pdu/src/session/msg_box_rsp.rs b/crates/now-proto-pdu/src/session/msg_box_rsp.rs index 1c0a378b..2f91cfe9 100644 --- a/crates/now-proto-pdu/src/session/msg_box_rsp.rs +++ b/crates/now-proto-pdu/src/session/msg_box_rsp.rs @@ -1,5 +1,4 @@ -use ironrdp_core::{ensure_fixed_part_size, DecodeResult, EncodeResult, ReadCursor, WriteCursor}; -use ironrdp_core::{Decode, Encode}; +use ironrdp_core::{ensure_fixed_part_size, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; use crate::{NowHeader, NowMessage, NowMessageClass, NowSessionMessage, NowSessionMessageKind}; diff --git a/crates/now-proto-pdu/src/system/mod.rs b/crates/now-proto-pdu/src/system/mod.rs index e406c852..7ce5f945 100644 --- a/crates/now-proto-pdu/src/system/mod.rs +++ b/crates/now-proto-pdu/src/system/mod.rs @@ -1,12 +1,10 @@ mod shutdown; -use ironrdp_core::Encode; -use ironrdp_core::{DecodeResult, EncodeResult, ReadCursor, WriteCursor}; +use ironrdp_core::{DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor}; +pub use shutdown::{NowSystemShutdownFlags, NowSystemShutdownMsg}; use crate::NowHeader; -pub use shutdown::{NowSystemShutdownFlags, NowSystemShutdownMsg}; - // Wrapper for the `NOW_SYSTEM_MSG_CLASS_ID` message class. #[derive(Debug, Clone, PartialEq, Eq)] pub enum NowSystemMessage { diff --git a/crates/now-proto-pdu/src/system/shutdown.rs b/crates/now-proto-pdu/src/system/shutdown.rs index 8af23466..b16014c8 100644 --- a/crates/now-proto-pdu/src/system/shutdown.rs +++ b/crates/now-proto-pdu/src/system/shutdown.rs @@ -1,11 +1,11 @@ use bitflags::bitflags; - use ironrdp_core::{ - cast_length, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor, + cast_length, ensure_fixed_part_size, invalid_field_err, Decode as _, DecodeResult, Encode, EncodeResult, + ReadCursor, WriteCursor, }; -use ironrdp_core::{Decode as _, Encode}; -use crate::{system::NowSystemMessageKind, NowHeader, NowMessage, NowMessageClass, NowSystemMessage, NowVarStr}; +use crate::system::NowSystemMessageKind; +use crate::{NowHeader, NowMessage, NowMessageClass, NowSystemMessage, NowVarStr}; bitflags! { /// NOW_PROTO: NOW_SYSTEM_SHUTDOWN_FLAG_* constants. diff --git a/ffi/src/clipboard/windows.rs b/ffi/src/clipboard/windows.rs index 5d6926e3..3ea9ff30 100644 --- a/ffi/src/clipboard/windows.rs +++ b/ffi/src/clipboard/windows.rs @@ -1,11 +1,12 @@ #![allow(clippy::unused_self)] // We want to keep the signature of the function stay the same between windows and non-windows +#[cfg(not(windows))] +use ironrdp_cliprdr_native as _; + use super::ffi::CliprdrBackendFactory; use crate::error::ffi::IronRdpError; #[cfg(not(windows))] -use crate::error::WrongOSError; -#[cfg(not(windows))] -use ironrdp_cliprdr_native as _; // avoid linter error, stub clipboard will be used in later commit +use crate::error::WrongOSError; // avoid linter error, stub clipboard will be used in later commit /* Why are we creating a WinCliprdrInner struct and implement differently? @@ -20,12 +21,11 @@ use ironrdp_cliprdr_native as _; // avoid linter error, stub clipboard will be u #[diplomat::bridge] pub mod ffi { + use super::WinCliprdrInner; use crate::clipboard::ffi::CliprdrBackendFactory; use crate::clipboard::message::ffi::ClipboardMessage; use crate::error::ffi::IronRdpError; - use super::WinCliprdrInner; - #[diplomat::opaque] pub struct WinCliprdr(WinCliprdrInner); diff --git a/ffi/src/connector/activation.rs b/ffi/src/connector/activation.rs index 13fb0ee0..2967feee 100644 --- a/ffi/src/connector/activation.rs +++ b/ffi/src/connector/activation.rs @@ -1,13 +1,14 @@ #[diplomat::bridge] pub mod ffi { - use crate::{ - connector::{config::ffi::DesktopSize, ffi::PduHint, result::ffi::Written}, - error::{ffi::IronRdpError, IncorrectEnumTypeError}, - pdu::ffi::WriteBuf, - }; - use ironrdp::connector::Sequence; + use crate::connector::config::ffi::DesktopSize; + use crate::connector::ffi::PduHint; + use crate::connector::result::ffi::Written; + use crate::error::ffi::IronRdpError; + use crate::error::IncorrectEnumTypeError; + use crate::pdu::ffi::WriteBuf; + #[diplomat::opaque] pub struct ConnectionActivationSequence( pub Box, diff --git a/ffi/src/connector/config.rs b/ffi/src/connector/config.rs index 4bb54ad2..317eed8d 100644 --- a/ffi/src/connector/config.rs +++ b/ffi/src/connector/config.rs @@ -4,7 +4,8 @@ use self::ffi::PerformanceFlagsType; #[diplomat::bridge] pub mod ffi { - use ironrdp::{connector::Credentials, pdu::rdp::capability_sets::MajorPlatformType}; + use ironrdp::connector::Credentials; + use ironrdp::pdu::rdp::capability_sets::MajorPlatformType; use crate::error::ffi::IronRdpError; diff --git a/ffi/src/connector/mod.rs b/ffi/src/connector/mod.rs index 4a01757e..9ba768df 100644 --- a/ffi/src/connector/mod.rs +++ b/ffi/src/connector/mod.rs @@ -5,21 +5,20 @@ pub mod state; #[diplomat::bridge] pub mod ffi { - use diplomat_runtime::DiplomatWriteable; - use ironrdp::{connector::Sequence as _, displaycontrol::client::DisplayControlClient}; use core::fmt::Write; + + use diplomat_runtime::DiplomatWriteable; + use ironrdp::connector::Sequence as _; + use ironrdp::displaycontrol::client::DisplayControlClient; use tracing::info; - use crate::{ - clipboard::ffi::Cliprdr, - error::{ - ffi::{IronRdpError, IronRdpErrorKind}, - ValueConsumedError, - }, - pdu::ffi::WriteBuf, - }; - - use super::{config::ffi::Config, result::ffi::Written, state::ffi::ClientConnectorState}; + use super::config::ffi::Config; + use super::result::ffi::Written; + use super::state::ffi::ClientConnectorState; + use crate::clipboard::ffi::Cliprdr; + use crate::error::ffi::{IronRdpError, IronRdpErrorKind}; + use crate::error::ValueConsumedError; + use crate::pdu::ffi::WriteBuf; #[diplomat::opaque] // We must use Option here, as ClientConnector is not Clone and have functions that consume it pub struct ClientConnector(pub Option); diff --git a/ffi/src/connector/result.rs b/ffi/src/connector/result.rs index 54211cc3..9d894977 100644 --- a/ffi/src/connector/result.rs +++ b/ffi/src/connector/result.rs @@ -1,10 +1,9 @@ #[diplomat::bridge] pub mod ffi { - use crate::{ - connector::config::ffi::DesktopSize, - error::{ffi::IronRdpError, ValueConsumedError}, - utils::ffi::OptionalUsize, - }; + use crate::connector::config::ffi::DesktopSize; + use crate::error::ffi::IronRdpError; + use crate::error::ValueConsumedError; + use crate::utils::ffi::OptionalUsize; #[diplomat::opaque] pub struct Written(pub ironrdp::connector::Written); diff --git a/ffi/src/connector/state.rs b/ffi/src/connector/state.rs index bf7a6305..97ccfeae 100644 --- a/ffi/src/connector/state.rs +++ b/ffi/src/connector/state.rs @@ -1,9 +1,8 @@ #[diplomat::bridge] pub mod ffi { - use crate::{ - error::{ffi::IronRdpError, IncorrectEnumTypeError, ValueConsumedError}, - pdu::ffi::SecurityProtocol, - }; + use crate::error::ffi::IronRdpError; + use crate::error::{IncorrectEnumTypeError, ValueConsumedError}; + use crate::pdu::ffi::SecurityProtocol; #[diplomat::opaque] pub struct ClientConnectorState(pub Option); diff --git a/ffi/src/credssp/mod.rs b/ffi/src/credssp/mod.rs index da22739f..b912d268 100644 --- a/ffi/src/credssp/mod.rs +++ b/ffi/src/credssp/mod.rs @@ -6,16 +6,12 @@ pub mod ffi { use ironrdp::connector::ClientConnectorState; - use crate::{ - connector::{ - ffi::{ClientConnector, PduHint}, - result::ffi::Written, - }, - error::{ffi::IronRdpError, ValueConsumedError}, - pdu::ffi::WriteBuf, - }; - use super::network::ffi::{ClientState, CredsspProcessGenerator}; + use crate::connector::ffi::{ClientConnector, PduHint}; + use crate::connector::result::ffi::Written; + use crate::error::ffi::IronRdpError; + use crate::error::ValueConsumedError; + use crate::pdu::ffi::WriteBuf; #[diplomat::opaque] pub struct KerberosConfig(pub ironrdp::connector::credssp::KerberosConfig); diff --git a/ffi/src/credssp/network.rs b/ffi/src/credssp/network.rs index ea69a0d5..b2244c0e 100644 --- a/ffi/src/credssp/network.rs +++ b/ffi/src/credssp/network.rs @@ -6,9 +6,10 @@ pub type CredsspGeneratorState = #[diplomat::bridge] pub mod ffi { - use crate::{credssp::ffi::TsRequest, error::ffi::IronRdpError, utils::ffi::VecU8}; - use super::CredsspGeneratorState; + use crate::credssp::ffi::TsRequest; + use crate::error::ffi::IronRdpError; + use crate::utils::ffi::VecU8; #[diplomat::opaque] pub struct CredsspProcessGenerator<'a>(pub ironrdp::connector::credssp::CredsspProcessGenerator<'a>); diff --git a/ffi/src/error.rs b/ffi/src/error.rs index 275a4f87..96b5111c 100644 --- a/ffi/src/error.rs +++ b/ffi/src/error.rs @@ -1,7 +1,9 @@ #![allow(clippy::return_self_not_must_use)] use core::fmt::Display; -use ironrdp::{cliprdr::backend::ClipboardError, connector::ConnectorError, session::SessionError}; +use ironrdp::cliprdr::backend::ClipboardError; +use ironrdp::connector::ConnectorError; +use ironrdp::session::SessionError; #[cfg(target_os = "windows")] use ironrdp_cliprdr_native::WinCliprdrError; @@ -109,9 +111,10 @@ struct IronRdpErrorInner { #[diplomat::bridge] pub mod ffi { - use diplomat_runtime::DiplomatWriteable; use core::fmt::Write as _; + use diplomat_runtime::DiplomatWriteable; + #[derive(Debug, Clone, Copy, thiserror::Error)] pub enum IronRdpErrorKind { #[error("Generic error")] diff --git a/ffi/src/input.rs b/ffi/src/input.rs index be758134..81c35ead 100644 --- a/ffi/src/input.rs +++ b/ffi/src/input.rs @@ -1,6 +1,7 @@ #[diplomat::bridge] pub mod ffi { - use crate::{error::ffi::IronRdpError, pdu::ffi::FastPathInputEventIterator}; + use crate::error::ffi::IronRdpError; + use crate::pdu::ffi::FastPathInputEventIterator; #[diplomat::opaque] pub struct InputDatabase(pub ironrdp::input::Database); diff --git a/ffi/src/log.rs b/ffi/src/log.rs index 85c4bb37..6ee4e62e 100644 --- a/ffi/src/log.rs +++ b/ffi/src/log.rs @@ -1,4 +1,5 @@ -use std::{error::Error, sync::Once}; +use std::error::Error; +use std::sync::Once; static INIT_LOG: Once = Once::new(); @@ -24,7 +25,9 @@ pub mod ffi { } fn setup_logging(log_file_path: Option<&str>) -> Result<(), Box> { - use std::{fs::create_dir_all, fs::OpenOptions, path::PathBuf}; + use std::fs::{create_dir_all, OpenOptions}; + use std::path::PathBuf; + use tracing::metadata::LevelFilter; use tracing_subscriber::prelude::*; use tracing_subscriber::EnvFilter; diff --git a/ffi/src/pdu.rs b/ffi/src/pdu.rs index d74bc3a3..a75329f9 100644 --- a/ffi/src/pdu.rs +++ b/ffi/src/pdu.rs @@ -3,7 +3,8 @@ pub mod ffi { use ironrdp::pdu::geometry::Rectangle; - use crate::{error::ffi::IronRdpError, utils::ffi::VecU8}; + use crate::error::ffi::IronRdpError; + use crate::utils::ffi::VecU8; #[diplomat::opaque] pub struct WriteBuf(pub ironrdp_core::WriteBuf); diff --git a/ffi/src/session/mod.rs b/ffi/src/session/mod.rs index 7c099be3..3505fcc7 100644 --- a/ffi/src/session/mod.rs +++ b/ffi/src/session/mod.rs @@ -3,16 +3,15 @@ pub mod image; #[diplomat::bridge] pub mod ffi { - use crate::{ - clipboard::message::ffi::{ClipboardFormatId, ClipboardFormatIterator, FormatDataResponse}, - connector::{activation::ffi::ConnectionActivationSequence, result::ffi::ConnectionResult}, - error::{ffi::IronRdpError, IncorrectEnumTypeError, ValueConsumedError}, - graphics::ffi::DecodedPointer, - pdu::ffi::{Action, FastPathInputEventIterator, InclusiveRectangle}, - utils::ffi::{BytesSlice, Position, VecU8}, - }; - use super::image::ffi::DecodedImage; + use crate::clipboard::message::ffi::{ClipboardFormatId, ClipboardFormatIterator, FormatDataResponse}; + use crate::connector::activation::ffi::ConnectionActivationSequence; + use crate::connector::result::ffi::ConnectionResult; + use crate::error::ffi::IronRdpError; + use crate::error::{IncorrectEnumTypeError, ValueConsumedError}; + use crate::graphics::ffi::DecodedPointer; + use crate::pdu::ffi::{Action, FastPathInputEventIterator, InclusiveRectangle}; + use crate::utils::ffi::{BytesSlice, Position, VecU8}; #[diplomat::opaque] pub struct ActiveStage(pub ironrdp::session::ActiveStage);