mirror of
https://github.com/netbirdio/IronRDP.git
synced 2026-05-22 18:43:12 -07:00
refactor: add wildcard_imports clippy extra-pedantic lint (#902)
This commit is contained in:
@@ -144,6 +144,7 @@ alloc_instead_of_core = "warn"
|
||||
empty_drop = "warn"
|
||||
return_self_not_must_use = "warn"
|
||||
wildcard_dependencies = "warn"
|
||||
wildcard_imports = "warn"
|
||||
|
||||
# == Let’s not merge unintended eprint!/print! statements in libraries == #
|
||||
print_stderr = "warn"
|
||||
|
||||
@@ -14,7 +14,7 @@ use ironrdp_cliprdr::pdu::{
|
||||
use tracing::error;
|
||||
use windows::core::{s, Error};
|
||||
pub use windows::Win32::Foundation::HWND;
|
||||
use windows::Win32::Foundation::*;
|
||||
use windows::Win32::Foundation::{FALSE, LPARAM, LRESULT, WPARAM};
|
||||
use windows::Win32::System::DataExchange::{AddClipboardFormatListener, RemoveClipboardFormatListener};
|
||||
use windows::Win32::System::LibraryLoader::GetModuleHandleA;
|
||||
use windows::Win32::UI::Shell::{RemoveWindowSubclass, SetWindowSubclass};
|
||||
|
||||
@@ -609,7 +609,11 @@ fn create_gcc_blocks<'a>(
|
||||
selected_protocol: nego::SecurityProtocol,
|
||||
static_channels: impl Iterator<Item = &'a StaticVirtualChannel>,
|
||||
) -> gcc::ClientGccBlocks {
|
||||
use ironrdp_pdu::gcc::*;
|
||||
use ironrdp_pdu::gcc::{
|
||||
ClientCoreData, ClientCoreOptionalData, ClientEarlyCapabilityFlags, ClientGccBlocks, ClientNetworkData,
|
||||
ClientSecurityData, ColorDepth, ConnectionType, EncryptionMethod, HighColorDepth, MonitorOrientation,
|
||||
RdpVersion, SecureAccessSequence, SupportedColorDepths,
|
||||
};
|
||||
|
||||
let max_color_depth = config.bitmap.as_ref().map(|bitmap| bitmap.color_depth).unwrap_or(32);
|
||||
|
||||
|
||||
@@ -261,7 +261,14 @@ fn create_client_confirm_active(
|
||||
mut server_capability_sets: Vec<CapabilitySet>,
|
||||
desktop_size: DesktopSize,
|
||||
) -> rdp::capability_sets::ClientConfirmActive {
|
||||
use ironrdp_pdu::rdp::capability_sets::*;
|
||||
use ironrdp_pdu::rdp::capability_sets::{
|
||||
client_codecs_capabilities, Bitmap, BitmapCache, BitmapDrawingFlags, Brush, CacheDefinition, CacheEntry,
|
||||
CapabilitySet, ClientConfirmActive, CmdFlags, DemandActive, FrameAcknowledge, General, GeneralExtraFlags,
|
||||
GlyphCache, GlyphSupportLevel, Input, InputFlags, LargePointer, LargePointerSupportFlags, MultifragmentUpdate,
|
||||
OffscreenBitmapCache, Order, OrderFlags, OrderSupportExFlags, Pointer, Sound, SoundFlags, SupportLevel,
|
||||
SurfaceCommands, VirtualChannel, VirtualChannelFlags, BITMAP_CACHE_ENTRIES_NUM, GLYPH_CACHE_NUM,
|
||||
SERVER_CHANNEL_ID,
|
||||
};
|
||||
|
||||
server_capability_sets.retain(|capability_set| matches!(capability_set, CapabilitySet::MultiFragmentUpdate(_)));
|
||||
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
use crate::generators::BitmapInput;
|
||||
|
||||
pub fn pdu_decode(data: &[u8]) {
|
||||
use ironrdp_core::*;
|
||||
use ironrdp_pdu::mcs::*;
|
||||
use ironrdp_pdu::nego::*;
|
||||
use ironrdp_pdu::rdp::*;
|
||||
use ironrdp_pdu::x224::*;
|
||||
use ironrdp_pdu::*;
|
||||
use ironrdp_core::decode;
|
||||
use ironrdp_pdu::mcs::{ConnectInitial, ConnectResponse, McsMessage};
|
||||
use ironrdp_pdu::nego::{ConnectionConfirm, ConnectionRequest};
|
||||
use ironrdp_pdu::rdp::{capability_sets, headers, server_error_info, server_license, vc, ClientInfoPdu};
|
||||
use ironrdp_pdu::x224::X224;
|
||||
use ironrdp_pdu::{bitmap, codecs, fast_path, gcc, input, ironrdp_core, pcb, surface_commands};
|
||||
|
||||
let _ = decode::<X224<ConnectionRequest>>(data);
|
||||
let _ = decode::<X224<ConnectionConfirm>>(data);
|
||||
|
||||
@@ -32,7 +32,7 @@ pub(crate) mod private {
|
||||
}
|
||||
}
|
||||
|
||||
use private::*;
|
||||
use private::{BaseRectangle, RectangleImpl};
|
||||
|
||||
pub trait Rectangle: RectangleImpl {
|
||||
fn width(&self) -> u16;
|
||||
|
||||
@@ -942,7 +942,10 @@ mod legacy {
|
||||
use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult};
|
||||
use thiserror::Error;
|
||||
|
||||
use super::*;
|
||||
use super::{
|
||||
cast_length, ensure_size, ConnectInitial, ConnectResponse, DomainParameters, PduError, ReadCursor, WriteCursor,
|
||||
RESULT_ENUM_LENGTH,
|
||||
};
|
||||
use crate::ber;
|
||||
use crate::gcc::conference_create::{ConferenceCreateRequest, ConferenceCreateResponse};
|
||||
use crate::gcc::GccError;
|
||||
|
||||
@@ -714,7 +714,7 @@ fn string_len(value: &str, character_set: CharacterSet) -> u16 {
|
||||
pub mod builder {
|
||||
use core::marker::PhantomData;
|
||||
|
||||
use super::*;
|
||||
use super::{ExtendedClientOptionalInfo, PerformanceFlags, TimezoneInfo, RECONNECT_COOKIE_LEN};
|
||||
|
||||
pub struct ExtendedClientOptionalInfoBuilderStateSetTimeZone;
|
||||
pub struct ExtendedClientOptionalInfoBuilderStateSetSessionId;
|
||||
|
||||
@@ -7,7 +7,7 @@ use tokio_rustls::TlsAcceptor;
|
||||
use super::clipboard::CliprdrServerFactory;
|
||||
use super::display::{DesktopSize, RdpServerDisplay};
|
||||
use super::handler::{KeyboardEvent, MouseEvent, RdpServerInputHandler};
|
||||
use super::server::*;
|
||||
use super::server::{RdpServer, RdpServerOptions, RdpServerSecurity};
|
||||
use crate::{DisplayUpdate, RdpServerDisplayUpdates, SoundServerFactory};
|
||||
|
||||
pub struct WantsAddr {}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
use ironrdp_core::decode;
|
||||
use ironrdp_pdu::rdp::capability_sets::*;
|
||||
use ironrdp_pdu::rdp::capability_sets::{
|
||||
CapabilitySet, ClientConfirmActive, DemandActive, ServerDemandActive, SERVER_CHANNEL_ID,
|
||||
};
|
||||
|
||||
pub const SERVER_DEMAND_ACTIVE_BUFFER: [u8; 357] = [
|
||||
0x04, 0x00, // source descriptor length
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
use ironrdp_pdu::rdp::client_info::*;
|
||||
use ironrdp_pdu::rdp::client_info::{
|
||||
AddressFamily, ClientInfo, ClientInfoFlags, CompressionType, Credentials, DayOfWeek, DayOfWeekOccurrence,
|
||||
ExtendedClientInfo, ExtendedClientOptionalInfo, Month, OptionalSystemTime, PerformanceFlags, SystemTime,
|
||||
TimezoneInfo,
|
||||
};
|
||||
|
||||
pub const CLIENT_INFO_BUFFER_UNICODE_WITHOUT_OPTIONAL_FIELDS_LEN: usize = 218;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use ironrdp_pdu::gcc::*;
|
||||
use ironrdp_pdu::gcc::{ConferenceCreateRequest, ConferenceCreateResponse};
|
||||
|
||||
use crate::gcc;
|
||||
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
use ironrdp_pdu::gcc::*;
|
||||
use ironrdp_pdu::gcc::{
|
||||
ClientCoreData, ClientCoreOptionalData, ClientEarlyCapabilityFlags, ColorDepth, ConnectionType, HighColorDepth,
|
||||
KeyboardType, RdpVersion, SecureAccessSequence, ServerCoreData, ServerCoreOptionalData, ServerEarlyCapabilityFlags,
|
||||
SupportedColorDepths,
|
||||
};
|
||||
use ironrdp_pdu::nego::SecurityProtocol;
|
||||
|
||||
pub const CLIENT_CORE_DATA_BUFFER: [u8; 128] = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use ironrdp_pdu::gcc::*;
|
||||
use ironrdp_pdu::gcc::{ClientGccBlocks, ClientGccType, ServerGccBlocks, ServerGccType};
|
||||
|
||||
use crate::cluster_data::{CLUSTER_DATA, CLUSTER_DATA_BUFFER};
|
||||
use crate::core_data::{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use ironrdp_pdu::rdp::vc::dvc::gfx::*;
|
||||
use ironrdp_pdu::rdp::vc::dvc::gfx::{ClientPdu, ServerPdu};
|
||||
|
||||
use crate::graphics_messages::{
|
||||
FRAME_ACKNOWLEDGE, FRAME_ACKNOWLEDGE_BUFFER, WIRE_TO_SURFACE_1, WIRE_TO_SURFACE_1_BUFFER,
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
use ironrdp_pdu::gcc::{Monitor, MonitorFlags};
|
||||
use ironrdp_pdu::geometry::InclusiveRectangle;
|
||||
use ironrdp_pdu::rdp::vc::dvc::gfx::*;
|
||||
use ironrdp_pdu::rdp::vc::dvc::gfx::{
|
||||
Avc420BitmapStream, Avc444BitmapStream, CacheImportReplyPdu, CacheToSurfacePdu, CapabilitiesAdvertisePdu,
|
||||
CapabilitiesConfirmPdu, CapabilitiesV103Flags, CapabilitiesV104Flags, CapabilitiesV10Flags, CapabilitiesV81Flags,
|
||||
CapabilitiesV8Flags, CapabilitySet, Codec1Type, Codec2Type, Color, CreateSurfacePdu, DeleteEncodingContextPdu,
|
||||
DeleteSurfacePdu, Encoding, EndFramePdu, EvictCacheEntryPdu, FrameAcknowledgePdu, MapSurfaceToOutputPdu,
|
||||
PixelFormat, Point, QuantQuality, QueueDepth, ResetGraphicsPdu, SolidFillPdu, StartFramePdu, SurfaceToCachePdu,
|
||||
SurfaceToSurfacePdu, Timestamp, WireToSurface1Pdu, WireToSurface2Pdu,
|
||||
};
|
||||
|
||||
pub const WIRE_TO_SURFACE_1_BUFFER: [u8; 218] = [
|
||||
0x00, 0x00, 0x08, 0x00, 0x20, 0xa5, 0x03, 0xde, 0x02, 0xab, 0x03, 0xe7, 0x02, 0xc9, 0x00, 0x00, 0x00, 0x01, 0x0e,
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
use std::borrow::Cow;
|
||||
|
||||
use ironrdp_pdu::mcs::*;
|
||||
use ironrdp_pdu::mcs::{
|
||||
AttachUserConfirm, AttachUserRequest, ChannelJoinConfirm, ChannelJoinRequest, ConnectInitial, ConnectResponse,
|
||||
DisconnectProviderUltimatum, DisconnectReason, DomainParameters, ErectDomainPdu, OwnedSendDataIndication,
|
||||
OwnedSendDataRequest, SendDataIndication, SendDataRequest,
|
||||
};
|
||||
|
||||
use crate::conference_create::{
|
||||
CONFERENCE_CREATE_REQUEST, CONFERENCE_CREATE_REQUEST_BUFFER, CONFERENCE_CREATE_RESPONSE,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use ironrdp_pdu::gcc::*;
|
||||
use ironrdp_pdu::gcc::{ClientMonitorData, Monitor, MonitorFlags};
|
||||
|
||||
pub const MONITOR_DATA_WITHOUT_MONITORS_BUFFER: [u8; 8] = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use ironrdp_pdu::gcc::*;
|
||||
use ironrdp_pdu::gcc::{ClientMonitorExtendedData, ExtendedMonitorInfo, MonitorOrientation};
|
||||
|
||||
pub const MONITOR_DATA_WITHOUT_MONITORS_BUFFER: [u8; 12] =
|
||||
[0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use ironrdp_pdu::gcc::*;
|
||||
use ironrdp_pdu::gcc::{ChannelDef, ChannelName, ChannelOptions, ClientNetworkData, ServerNetworkData};
|
||||
|
||||
pub const CLIENT_NETWORK_DATA_WITH_CHANNELS_BUFFER: [u8; 40] = [
|
||||
0x03, 0x00, 0x00, 0x00, // channels count
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user