refactor: dynamic resize follow up (#425)

Author: Isaiah Becker-Mayer

crates/ironrdp-client/src/config.rs

@@ -181,14 +181,6 @@ struct Args {
     #[clap(long, value_parser, default_value_t = String::from(""))]
     dig_product_id: String,
 
-    /// Enable AVC444
-    #[clap(long, group = "avc")]
-    avc444: bool,
-
-    /// Enable H264
-    #[clap(long, group = "avc")]
-    h264: bool,
-
     /// Enable thin client
     #[clap(long)]
     thin_client: bool,
@@ -277,18 +269,6 @@ impl Config {
             None
         };
 
-        let graphics = if args.avc444 || args.h264 {
-            Some(connector::GraphicsConfig {
-                avc444: args.avc444,
-                h264: args.h264,
-                thin_client: args.thin_client,
-                small_cache: args.small_cache,
-                capabilities: args.capabilities,
-            })
-        } else {
-            None
-        };
-
         let clipboard_type = if args.clipboard_type == ClipboardType::Default {
             #[cfg(windows)]
             {
@@ -316,7 +296,6 @@ impl Config {
                 width: DEFAULT_WIDTH,
                 height: DEFAULT_HEIGHT,
             },
-            graphics,
             bitmap,
             client_build: semver::Version::parse(env!("CARGO_PKG_VERSION"))
                 .map(|version| version.major * 100 + version.minor * 10 + version.patch)

crates/ironrdp-cliprdr-native/src/stub.rs

@@ -6,11 +6,11 @@ use ironrdp_cliprdr::pdu::{
 use ironrdp_svc::impl_as_any;
 use tracing::debug;
 
-pub struct StubClipboard {}
+pub struct StubClipboard;
 
 impl StubClipboard {
     pub fn new() -> Self {
-        Self {}
+        Self
     }
 
     pub fn backend_factory(&self) -> Box<dyn CliprdrBackendFactory + Send> {
@@ -33,13 +33,13 @@ impl CliprdrBackendFactory for StubCliprdrBackendFactory {
 }
 
 #[derive(Debug)]
-pub(crate) struct StubCliprdrBackend {}
+pub(crate) struct StubCliprdrBackend;
 
 impl_as_any!(StubCliprdrBackend);
 
 impl StubCliprdrBackend {
     pub(crate) fn new() -> Self {
-        Self {}
+        Self
     }
 }
 

crates/ironrdp-connector/src/connection.rs

@@ -22,7 +22,6 @@ pub struct ConnectionResult {
     pub user_channel_id: u16,
     pub static_channels: StaticChannelSet,
     pub desktop_size: DesktopSize,
-    pub graphics_config: Option<crate::GraphicsConfig>,
     pub no_server_pointer: bool,
     pub pointer_software_rendering: bool,
     pub connection_activation: ConnectionActivationSequence,
@@ -558,7 +557,6 @@ impl Sequence for ClientConnector {
                                 user_channel_id,
                                 static_channels: mem::take(&mut self.static_channels),
                                 desktop_size,
-                                graphics_config: self.config.graphics.clone(),
                                 no_server_pointer: self.config.no_server_pointer,
                                 pointer_software_rendering: self.config.pointer_software_rendering,
                                 connection_activation,
@@ -651,10 +649,6 @@ fn create_gcc_blocks<'a>(
 
                     // TODO(#136): support for ClientEarlyCapabilityFlags::SUPPORT_STATUS_INFO_PDU
 
-                    if config.graphics.is_some() {
-                        early_capability_flags |= ClientEarlyCapabilityFlags::SUPPORT_DYN_VC_GFX_PROTOCOL;
-                    }
-
                     if max_color_depth == 32 {
                         early_capability_flags |= ClientEarlyCapabilityFlags::WANT_32_BPP_SESSION;
                     }

crates/ironrdp-connector/src/lib.rs

@@ -38,16 +38,6 @@ pub struct DesktopSize {
     pub height: u16,
 }
 
-#[derive(Debug, Clone)]
-#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
-pub struct GraphicsConfig {
-    pub avc444: bool,
-    pub h264: bool,
-    pub thin_client: bool,
-    pub small_cache: bool,
-    pub capabilities: u32,
-}
-
 #[derive(Debug, Clone)]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 pub struct BitmapConfig {
@@ -140,7 +130,6 @@ pub struct Config {
     pub keyboard_subtype: u32,
     pub keyboard_functional_keys_count: u32,
     pub ime_file_name: String,
-    pub graphics: Option<GraphicsConfig>,
     pub bitmap: Option<BitmapConfig>,
     pub dig_product_id: String,
     pub client_dir: String,

crates/ironrdp-displaycontrol/src/client.rs

@@ -8,7 +8,7 @@ use ironrdp_svc::{impl_as_any, ChannelFlags, SvcMessage};
 use tracing::debug;
 
 /// A client for the Display Control Virtual Channel.
-pub struct DisplayControlClient {}
+pub struct DisplayControlClient;
 
 impl_as_any!(DisplayControlClient);
 
@@ -33,7 +33,7 @@ impl DvcClientProcessor for DisplayControlClient {}
 
 impl DisplayControlClient {
     pub fn new() -> Self {
-        Self {}
+        Self
     }
 
     /// Fully encodes a [`MonitorLayoutPdu`] with the given monitors.

crates/ironrdp-displaycontrol/src/server.rs

@@ -9,7 +9,7 @@ use crate::{
 };
 
 /// A server for the Display Control Virtual Channel.
-pub struct DisplayControlServer {}
+pub struct DisplayControlServer;
 
 impl_as_any!(DisplayControlServer);
 

crates/ironrdp-dvc/src/complete_data.rs

@@ -49,7 +49,7 @@ impl CompleteData {
             return Ok(Some(data.data));
         }
 
-        // message is fragmented so need to reassemble it
+        // The message is fragmented and needs to be reassembled.
         match self.data.len().checked_add(data.data.len()) {
             Some(actual_data_length) => {
                 match actual_data_length.cmp(&(self.total_size)) {

crates/ironrdp-dvc/src/lib.rs

@@ -1,11 +1,11 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use crate::alloc::borrow::ToOwned;
 #[macro_use]
 extern crate tracing;
 
 extern crate alloc;
 
+use crate::alloc::borrow::ToOwned;
 use alloc::string::String;
 use core::any::TypeId;
 use pdu::DrdynvcDataPdu;

crates/ironrdp-dvc/src/pdu.rs

@@ -6,10 +6,7 @@ use ironrdp_pdu::{
     cast_length,
     cursor::{ReadCursor, WriteCursor},
     ensure_fixed_part_size, ensure_size, invalid_message_err, unsupported_pdu_err,
-    utils::{
-        checked_sum, checked_sum_or_panic, encoded_str_len, read_string_from_cursor, write_string_to_cursor,
-        CharacterSet,
-    },
+    utils::{checked_sum, encoded_str_len, read_string_from_cursor, strict_sum, write_string_to_cursor, CharacterSet},
     PduDecode, PduEncode, PduError, PduResult,
 };
 use ironrdp_svc::SvcPduEncode;
@@ -354,7 +351,7 @@ impl DataFirstPdu {
     }
 
     fn size(&self) -> usize {
-        checked_sum_or_panic(&[
+        strict_sum(&[
             Header::size(),
             self.header.cb_id.size_of_val(),
             self.header.sp.size_of_val(),
@@ -473,7 +470,7 @@ impl DataPdu {
     }
 
     fn size(&self) -> usize {
-        checked_sum_or_panic(&[
+        strict_sum(&[
             Header::size(),
             self.header.cb_id.size_of_val(), // ChannelId
             self.data.len(),                 // Data
@@ -524,14 +521,14 @@ impl CreateResponsePdu {
     }
 
     fn headerless_size(header: &Header) -> usize {
-        checked_sum_or_panic(&[
+        strict_sum(&[
             header.cb_id.size_of_val(), // ChannelId
             CreationStatus::size(),     // CreationStatus
         ])
     }
 
     fn size(&self) -> usize {
-        checked_sum_or_panic(&[Header::size(), Self::headerless_size(&self.header)])
+        strict_sum(&[Header::size(), Self::headerless_size(&self.header)])
     }
 }
 
@@ -606,7 +603,7 @@ impl ClosePdu {
     }
 
     fn size(&self) -> usize {
-        checked_sum_or_panic(&[Header::size(), Self::headerless_size(&self.header)])
+        strict_sum(&[Header::size(), Self::headerless_size(&self.header)])
     }
 }
 
@@ -840,7 +837,7 @@ impl CreateRequestPdu {
     }
 
     fn size(&self) -> usize {
-        checked_sum_or_panic(&[
+        strict_sum(&[
             Header::size(),
             Self::headerless_fixed_part_size(&self.header), // ChannelId
             encoded_str_len(&self.channel_name, CharacterSet::Ansi, true), // ChannelName + Null terminator

crates/ironrdp-graphics/src/rdp6/rle.rs

@@ -199,9 +199,7 @@ impl<I: Iterator<Item = u8>> Iterator for RleEncoderScanlineIterator<I> {
     type Item = I::Item;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let Some((idx, mut next)) = self.inner.next() else {
-            return None;
-        };
+        let (idx, mut next) = self.inner.next()?;
 
         let prev = std::mem::replace(&mut self.prev_scanline[idx % self.width], next);
         if idx >= self.width {

crates/ironrdp-pdu/src/gcc/message_channel_data.rs

@@ -37,7 +37,7 @@ impl<'de> PduDecode<'de> for ClientMessageChannelData {
 
         let _flags = src.read_u32(); // is unused
 
-        Ok(Self {})
+        Ok(Self)
     }
 }
 

crates/ironrdp-pdu/src/rdp/headers.rs

@@ -530,7 +530,7 @@ impl PduDecode<'_> for ServerDeactivateAll {
         let length_source_descriptor = src.read_u16();
         ensure_size!(in: src, size: length_source_descriptor.into());
         let _ = src.read_slice(length_source_descriptor.into());
-        Ok(Self {})
+        Ok(Self)
     }
 }
 

crates/ironrdp-pdu/src/utils.rs

@@ -274,20 +274,20 @@ where
     T: CheckedAdd + Copy + Debug,
 {
     values.split_first().map_or_else(
-        || Err(other_err!("Empty array provided to checked_sum")),
+        || Err(other_err!("empty array provided to checked_sum")),
         |(&first, rest)| {
             rest.iter().try_fold(first, |acc, &val| {
                 acc.checked_add(val)
-                    .ok_or_else(|| other_err!("Overflow detected during addition"))
+                    .ok_or_else(|| other_err!("overflow detected during addition"))
             })
         },
     )
 }
 
 // Utility function that panics on overflow
-pub fn checked_sum_or_panic<T>(values: &[T]) -> T
+pub fn strict_sum<T>(values: &[T]) -> T
 where
     T: CheckedAdd + Copy + Debug,
 {
-    checked_sum::<T>(values).expect("Overflow detected during addition")
+    checked_sum::<T>(values).expect("overflow detected during addition")
 }

crates/ironrdp-rdpsnd/src/lib.rs

@@ -13,7 +13,7 @@ impl Rdpsnd {
     pub const NAME: ChannelName = ChannelName::from_static(b"rdpsnd\0\0");
 
     pub fn new() -> Self {
-        Self {}
+        Self
     }
 }
 

crates/ironrdp-server/src/encoder/bitmap.rs

@@ -55,13 +55,13 @@ impl BitmapEncoder {
                     right: bitmap.left + bitmap.width.get() - 1,
                     bottom: u16::try_from(top + height - 1).unwrap(),
                 },
-                width: u16::try_from(bitmap.width).unwrap(),
+                width: u16::from(bitmap.width),
                 height: u16::try_from(height).unwrap(),
                 bits_per_pixel: u16::from(bitmap.format.bytes_per_pixel()) * 8,
                 compression_flags: Compression::BITMAP_COMPRESSION,
                 compressed_data_header: Some(bitmap::CompressedDataHeader {
                     main_body_size: u16::try_from(len).unwrap(),
-                    scan_width: u16::try_from(bitmap.width).unwrap(),
+                    scan_width: u16::from(bitmap.width),
                     uncompressed_size: u16::try_from(chunk.len()).unwrap(),
                 }),
                 bitmap_data: &self.buffer[..len],

crates/ironrdp-server/src/server.rs

@@ -188,7 +188,7 @@ impl RdpServer {
             .with_dynamic_channel(AInputHandler {
                 handler: Arc::clone(&self.handler),
             })
-            .with_dynamic_channel(DisplayControlServer {});
+            .with_dynamic_channel(DisplayControlServer);
         acceptor.attach_static_channel(dvc);
 
         match ironrdp_acceptor::accept_begin(framed, &mut acceptor).await {

crates/ironrdp-svc/src/lib.rs

@@ -60,6 +60,7 @@ impl<P: SvcProcessor> From<SvcProcessorMessages<P>> for Vec<SvcMessage> {
 pub trait SvcPduEncode: PduEncode + Send {}
 
 /// For legacy reasons, we implement [`SvcPduEncode`] for [`Vec<u8>`].
+// FIXME: legacy code
 impl SvcPduEncode for Vec<u8> {}
 
 /// Encodable PDU to be sent over a static virtual channel.

crates/ironrdp-web/src/image.rs

@@ -16,7 +16,7 @@ pub(crate) fn extract_partial_image(image: &DecodedImage, region: InclusiveRecta
 fn extract_smallest_rectangle(image: &DecodedImage, region: InclusiveRectangle) -> (InclusiveRectangle, Vec<u8>) {
     let pixel_size = usize::from(image.pixel_format().bytes_per_pixel());
 
-    let image_width = usize::try_from(image.width()).unwrap();
+    let image_width = usize::from(image.width());
     let image_stride = image_width * pixel_size;
 
     let region_top = usize::from(region.top);
@@ -49,7 +49,7 @@ fn extract_smallest_rectangle(image: &DecodedImage, region: InclusiveRectangle)
 fn extract_whole_rows(image: &DecodedImage, region: InclusiveRectangle) -> (InclusiveRectangle, Vec<u8>) {
     let pixel_size = usize::from(image.pixel_format().bytes_per_pixel());
 
-    let image_width = usize::try_from(image.width()).unwrap();
+    let image_width = usize::from(image.width());
     let image_stride = image_width * pixel_size;
 
     let region_top = usize::from(region.top);

crates/ironrdp-web/src/session.rs

@@ -741,7 +741,6 @@ fn build_config(
             width: desktop_size.width,
             height: desktop_size.height,
         },
-        graphics: None,
         bitmap: Some(connector::BitmapConfig {
             color_depth: 16,
             lossy_compression: true,

crates/ironrdp/examples/screenshot.rs

@@ -188,7 +188,6 @@ fn build_config(username: String, password: String, domain: Option<String>) -> c
             width: 1280,
             height: 1024,
         },
-        graphics: None,
         bitmap: None,
         client_build: 0,
         client_name: "ironrdp-screenshot-example".to_owned(),

crates/ironrdp/examples/server.rs

@@ -120,11 +120,11 @@ fn acceptor(cert_path: &str, key_path: &str) -> anyhow::Result<TlsAcceptor> {
 }
 
 #[derive(Clone, Debug)]
-struct Handler {}
+struct Handler;
 
 impl Handler {
     fn new() -> Self {
-        Self {}
+        Self
     }
 }