From aac0740d525967edf21dd628f620142e4ba31b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 13 Aug 2024 17:38:06 +0400 Subject: [PATCH] refactor(pdu): impl Debuf for ExtendedBitmapDataPdu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau --- .../src/basic_output/surface_commands.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/crates/ironrdp-pdu/src/basic_output/surface_commands.rs b/crates/ironrdp-pdu/src/basic_output/surface_commands.rs index 5ff8f254..62240594 100644 --- a/crates/ironrdp-pdu/src/basic_output/surface_commands.rs +++ b/crates/ironrdp-pdu/src/basic_output/surface_commands.rs @@ -163,7 +163,7 @@ impl<'de> PduDecode<'de> for FrameMarkerPdu { } // TS_BITMAP_DATA_EX -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Clone, PartialEq, Eq)] pub struct ExtendedBitmapDataPdu<'a> { pub bpp: u8, pub codec_id: u8, @@ -173,6 +173,19 @@ pub struct ExtendedBitmapDataPdu<'a> { pub data: &'a [u8], } +impl std::fmt::Debug for ExtendedBitmapDataPdu<'_> { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("ExtendedBitmapDataPdu") + .field("bpp", &self.bpp) + .field("codec_id", &self.codec_id) + .field("width", &self.width) + .field("height", &self.height) + .field("header", &self.header) + .field("data_len", &self.data.len()) + .finish() + } +} + impl ExtendedBitmapDataPdu<'_> { const NAME: &'static str = "TS_BITMAP_DATA_EX"; const FIXED_PART_SIZE: usize = 1 /* bpp */ + 1 /* flags */ + 1 /* reserved */ + 1 /* codecId */ + 2 /* width */ + 2 /* height */ + 4 /* len */;