diff --git a/crates/ironrdp-client/src/config.rs b/crates/ironrdp-client/src/config.rs index 4cbbcb908..bbf56c0d9 100644 --- a/crates/ironrdp-client/src/config.rs +++ b/crates/ironrdp-client/src/config.rs @@ -415,9 +415,9 @@ impl Config { }, hardware_id: None, license_cache: None, - no_server_pointer: args.no_server_pointer, + enable_server_pointer: !args.no_server_pointer, autologon: args.autologon, - no_audio_playback: false, + enable_audio_playback: true, request_data: None, pointer_software_rendering: false, performance_flags: PerformanceFlags::default(), diff --git a/crates/ironrdp-client/src/rdp.rs b/crates/ironrdp-client/src/rdp.rs index eba13ce5e..769694ddf 100644 --- a/crates/ironrdp-client/src/rdp.rs +++ b/crates/ironrdp-client/src/rdp.rs @@ -613,7 +613,7 @@ async fn active_session( io_channel_id, user_channel_id, desktop_size, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } = connection_activation.state { @@ -625,12 +625,12 @@ async fn active_session( fast_path::ProcessorBuilder { io_channel_id, user_channel_id, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } .build(), ); - active_stage.set_no_server_pointer(no_server_pointer); + active_stage.set_enable_server_pointer(enable_server_pointer); break 'activation_seq; } } diff --git a/crates/ironrdp-connector/src/connection.rs b/crates/ironrdp-connector/src/connection.rs index f8ebba77b..a79d2119c 100644 --- a/crates/ironrdp-connector/src/connection.rs +++ b/crates/ironrdp-connector/src/connection.rs @@ -24,7 +24,7 @@ pub struct ConnectionResult { pub user_channel_id: u16, pub static_channels: StaticChannelSet, pub desktop_size: DesktopSize, - pub no_server_pointer: bool, + pub enable_server_pointer: bool, pub pointer_software_rendering: bool, pub connection_activation: ConnectionActivationSequence, } @@ -550,7 +550,7 @@ impl Sequence for ClientConnector { io_channel_id, user_channel_id, desktop_size, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } => ClientConnectorState::Connected { result: ConnectionResult { @@ -558,7 +558,7 @@ impl Sequence for ClientConnector { user_channel_id, static_channels: mem::take(&mut self.static_channels), desktop_size, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, connection_activation, }, @@ -725,7 +725,7 @@ fn create_client_info_pdu(config: &Config, client_addr: &SocketAddr) -> rdp::Cli flags |= ClientInfoFlags::PASSWORD_IS_SC_PIN; } - if config.no_audio_playback { + if !config.enable_audio_playback { flags |= ClientInfoFlags::NO_AUDIO_PLAYBACK; } diff --git a/crates/ironrdp-connector/src/connection_activation.rs b/crates/ironrdp-connector/src/connection_activation.rs index 22fd814eb..b29585bfd 100644 --- a/crates/ironrdp-connector/src/connection_activation.rs +++ b/crates/ironrdp-connector/src/connection_activation.rs @@ -197,7 +197,7 @@ impl Sequence for ConnectionActivationSequence { io_channel_id, user_channel_id, desktop_size, - no_server_pointer: self.config.no_server_pointer, + enable_server_pointer: self.config.enable_server_pointer, pointer_software_rendering: self.config.pointer_software_rendering, } }; @@ -230,7 +230,7 @@ pub enum ConnectionActivationState { io_channel_id: u16, user_channel_id: u16, desktop_size: DesktopSize, - no_server_pointer: bool, + enable_server_pointer: bool, pointer_software_rendering: bool, }, } diff --git a/crates/ironrdp-connector/src/lib.rs b/crates/ironrdp-connector/src/lib.rs index 6b225eef5..b443f878d 100644 --- a/crates/ironrdp-connector/src/lib.rs +++ b/crates/ironrdp-connector/src/lib.rs @@ -179,14 +179,14 @@ pub struct Config { /// If true, the INFO_AUTOLOGON flag is set in the [`ClientInfoPdu`](ironrdp_pdu::rdp::ClientInfoPdu) pub autologon: bool, /// If true, the INFO_NOAUDIOPLAYBACK flag is set in the [`ClientInfoPdu`](ironrdp_pdu::rdp::ClientInfoPdu) - pub no_audio_playback: bool, + pub enable_audio_playback: bool, + pub performance_flags: PerformanceFlags, pub license_cache: Option>, // FIXME(@CBenoit): these are client-only options, not part of the connector. - pub no_server_pointer: bool, + pub enable_server_pointer: bool, pub pointer_software_rendering: bool, - pub performance_flags: PerformanceFlags, } ironrdp_core::assert_impl!(Config: Send, Sync); diff --git a/crates/ironrdp-session/src/active_stage.rs b/crates/ironrdp-session/src/active_stage.rs index 1c38334dc..a5a9682f8 100644 --- a/crates/ironrdp-session/src/active_stage.rs +++ b/crates/ironrdp-session/src/active_stage.rs @@ -19,7 +19,7 @@ use crate::{fast_path, x224, SessionError, SessionErrorExt as _, SessionResult}; pub struct ActiveStage { x224_processor: x224::Processor, fast_path_processor: fast_path::Processor, - no_server_pointer: bool, + enable_server_pointer: bool, } impl ActiveStage { @@ -34,7 +34,7 @@ impl ActiveStage { let fast_path_processor = fast_path::ProcessorBuilder { io_channel_id: connection_result.io_channel_id, user_channel_id: connection_result.user_channel_id, - no_server_pointer: connection_result.no_server_pointer, + enable_server_pointer: connection_result.enable_server_pointer, pointer_software_rendering: connection_result.pointer_software_rendering, } .build(); @@ -42,7 +42,7 @@ impl ActiveStage { Self { x224_processor, fast_path_processor, - no_server_pointer: connection_result.no_server_pointer, + enable_server_pointer: connection_result.enable_server_pointer, } } @@ -72,7 +72,7 @@ impl ActiveStage { output.push(ActiveStageOutput::ResponseFrame(frame)); // If pointer rendering is disabled - we can skip the rest - if self.no_server_pointer { + if !self.enable_server_pointer { return Ok(output); } @@ -152,8 +152,8 @@ impl ActiveStage { self.fast_path_processor = processor; } - pub fn set_no_server_pointer(&mut self, no_server_pointer: bool) { - self.no_server_pointer = no_server_pointer; + pub fn set_enable_server_pointer(&mut self, enable_server_pointer: bool) { + self.enable_server_pointer = enable_server_pointer; } /// Encodes client-side graceful shutdown request. Note that upon sending this request, diff --git a/crates/ironrdp-session/src/fast_path.rs b/crates/ironrdp-session/src/fast_path.rs index 1baa685d2..9fcf52999 100644 --- a/crates/ironrdp-session/src/fast_path.rs +++ b/crates/ironrdp-session/src/fast_path.rs @@ -35,7 +35,7 @@ pub struct Processor { pointer_cache: PointerCache, use_system_pointer: bool, mouse_pos_update: Option<(u16, u16)>, - no_server_pointer: bool, + enable_server_pointer: bool, pointer_software_rendering: bool, #[cfg(feature = "qoiz")] zdctx: zstd_safe::DCtx<'static>, @@ -176,7 +176,7 @@ impl Processor { processor_updates.push(update_kind); } Ok(FastPathUpdate::Pointer(update)) => { - if self.no_server_pointer { + if !self.enable_server_pointer { return Ok(processor_updates); } @@ -442,7 +442,7 @@ pub struct ProcessorBuilder { pub io_channel_id: u16, pub user_channel_id: u16, /// Ignore server pointer updates. - pub no_server_pointer: bool, + pub enable_server_pointer: bool, /// Use software rendering mode for pointer bitmap generation. When this option is active, /// `UpdateKind::PointerBitmap` will not be generated. Remote pointer will be drawn /// via software rendering on top of the output image. @@ -459,7 +459,7 @@ impl ProcessorBuilder { pointer_cache: PointerCache::default(), use_system_pointer: true, mouse_pos_update: None, - no_server_pointer: self.no_server_pointer, + enable_server_pointer: self.enable_server_pointer, pointer_software_rendering: self.pointer_software_rendering, #[cfg(feature = "qoiz")] zdctx: zstd_safe::DCtx::default(), diff --git a/crates/ironrdp-testsuite-extra/tests/tests.rs b/crates/ironrdp-testsuite-extra/tests/tests.rs index 6c3ec042d..713d6324e 100644 --- a/crates/ironrdp-testsuite-extra/tests/tests.rs +++ b/crates/ironrdp-testsuite-extra/tests/tests.rs @@ -84,7 +84,7 @@ async fn test_deactivation_reactivation() { io_channel_id, user_channel_id, desktop_size, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } = connection_activation.state { @@ -96,12 +96,12 @@ async fn test_deactivation_reactivation() { session::fast_path::ProcessorBuilder { io_channel_id, user_channel_id, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } .build(), ); - stage.set_no_server_pointer(no_server_pointer); + stage.set_enable_server_pointer(enable_server_pointer); break 'activation_seq; } } @@ -297,9 +297,9 @@ fn default_client_config() -> connector::Config { hardware_id: None, request_data: None, autologon: false, - no_audio_playback: false, + enable_audio_playback: true, license_cache: None, - no_server_pointer: true, + enable_server_pointer: true, pointer_software_rendering: true, performance_flags: Default::default(), } diff --git a/crates/ironrdp-web/src/session.rs b/crates/ironrdp-web/src/session.rs index 9613c532e..4b29c58c9 100644 --- a/crates/ironrdp-web/src/session.rs +++ b/crates/ironrdp-web/src/session.rs @@ -726,7 +726,7 @@ impl iron_remote_desktop::Session for Session { io_channel_id, user_channel_id, desktop_size, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } = box_connection_activation.state { @@ -738,12 +738,12 @@ impl iron_remote_desktop::Session for Session { fast_path::ProcessorBuilder { io_channel_id, user_channel_id, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } .build(), ); - active_stage.set_no_server_pointer(no_server_pointer); + active_stage.set_enable_server_pointer(enable_server_pointer); break 'activation_seq; } } @@ -887,9 +887,9 @@ fn build_config( // https://github.com/FreeRDP/FreeRDP/blob/4e24b966c86fdf494a782f0dfcfc43a057a2ea60/libfreerdp/core/settings.c#LL49C34-L49C70 client_dir: "C:\\Windows\\System32\\mstscax.dll".to_owned(), platform: ironrdp::pdu::rdp::capability_sets::MajorPlatformType::UNSPECIFIED, - no_server_pointer: false, + enable_server_pointer: false, autologon: false, - no_audio_playback: true, + enable_audio_playback: false, request_data: None, pointer_software_rendering: false, performance_flags: PerformanceFlags::default(), diff --git a/crates/ironrdp/examples/screenshot.rs b/crates/ironrdp/examples/screenshot.rs index 214079335..12b4143d2 100644 --- a/crates/ironrdp/examples/screenshot.rs +++ b/crates/ironrdp/examples/screenshot.rs @@ -205,11 +205,10 @@ fn build_config(username: String, password: String, domain: Option) -> c #[cfg(target_os = "netbsd")] platform: MajorPlatformType::UNIX, - // Disable custom pointers (there is no user interaction anyway) - no_server_pointer: true, + enable_server_pointer: false, // Disable custom pointers (there is no user interaction anyway). request_data: None, autologon: false, - no_audio_playback: true, + enable_audio_playback: false, pointer_software_rendering: true, performance_flags: PerformanceFlags::default(), desktop_scale_factor: 0, diff --git a/ffi/dotnet/Devolutions.IronRdp.AvaloniaExample/MainWindow.axaml.cs b/ffi/dotnet/Devolutions.IronRdp.AvaloniaExample/MainWindow.axaml.cs index 747f19545..341485271 100644 --- a/ffi/dotnet/Devolutions.IronRdp.AvaloniaExample/MainWindow.axaml.cs +++ b/ffi/dotnet/Devolutions.IronRdp.AvaloniaExample/MainWindow.axaml.cs @@ -427,7 +427,7 @@ private async Task HandleActiveStageOutput(ActiveStageOutputIterator outpu var desktopSize = finalized.GetDesktopSize(); var ioChannelId = finalized.GetIoChannelId(); var userChannelId = finalized.GetUserChannelId(); - var noServerPointer = finalized.GetNoServerPointer(); + var enableServerPointer = finalized.GetEnableServerPointer(); var pointerSoftwareRendering = finalized.GetPointerSoftwareRendering(); _decodedImage = DecodedImage.New(PixelFormat.RgbA32, desktopSize.GetWidth(), @@ -436,11 +436,11 @@ private async Task HandleActiveStageOutput(ActiveStageOutputIterator outpu _activeStage!.SetFastpathProcessor( ioChannelId, userChannelId, - noServerPointer, + enableServerPointer, pointerSoftwareRendering ); - _activeStage.SetNoServerPointer(noServerPointer); + _activeStage.SetEnableServerPointer(enableServerPointer); break; } diff --git a/ffi/dotnet/Devolutions.IronRdp/Generated/ActiveStage.cs b/ffi/dotnet/Devolutions.IronRdp/Generated/ActiveStage.cs index 4de01868c..456876009 100644 --- a/ffi/dotnet/Devolutions.IronRdp/Generated/ActiveStage.cs +++ b/ffi/dotnet/Devolutions.IronRdp/Generated/ActiveStage.cs @@ -15,11 +15,11 @@ public partial class ActiveStage: IDisposable { private unsafe Raw.ActiveStage* _inner; - public bool NoServerPointer + public bool EnableServerPointer { set { - SetNoServerPointer(value); + SetEnableServerPointer(value); } } @@ -265,7 +265,7 @@ public ActiveStageOutputIterator EncodedResize(uint width, uint height) } } - public void SetFastpathProcessor(ushort ioChannelId, ushort userChannelId, bool noServerPointer, bool pointerSoftwareRendering) + public void SetFastpathProcessor(ushort ioChannelId, ushort userChannelId, bool enableServerPointer, bool pointerSoftwareRendering) { unsafe { @@ -273,11 +273,11 @@ public void SetFastpathProcessor(ushort ioChannelId, ushort userChannelId, bool { throw new ObjectDisposedException("ActiveStage"); } - Raw.ActiveStage.SetFastpathProcessor(_inner, ioChannelId, userChannelId, noServerPointer, pointerSoftwareRendering); + Raw.ActiveStage.SetFastpathProcessor(_inner, ioChannelId, userChannelId, enableServerPointer, pointerSoftwareRendering); } } - public void SetNoServerPointer(bool noServerPointer) + public void SetEnableServerPointer(bool enableServerPointer) { unsafe { @@ -285,7 +285,7 @@ public void SetNoServerPointer(bool noServerPointer) { throw new ObjectDisposedException("ActiveStage"); } - Raw.ActiveStage.SetNoServerPointer(_inner, noServerPointer); + Raw.ActiveStage.SetEnableServerPointer(_inner, enableServerPointer); } } diff --git a/ffi/dotnet/Devolutions.IronRdp/Generated/ConfigBuilder.cs b/ffi/dotnet/Devolutions.IronRdp/Generated/ConfigBuilder.cs index c6d5b62a3..13d86c18d 100644 --- a/ffi/dotnet/Devolutions.IronRdp/Generated/ConfigBuilder.cs +++ b/ffi/dotnet/Devolutions.IronRdp/Generated/ConfigBuilder.cs @@ -79,6 +79,14 @@ public bool EnableCredssp } } + public bool EnableServerPointer + { + set + { + SetEnableServerPointer(value); + } + } + public bool EnableTls { set @@ -127,14 +135,6 @@ public KeyboardType KeyboardType } } - public bool NoServerPointer - { - set - { - SetNoServerPointer(value); - } - } - public PerformanceFlags PerformanceFlags { set @@ -418,7 +418,7 @@ public void SetClientDir(string clientDir) } } - public void SetNoServerPointer(bool noServerPointer) + public void SetEnableServerPointer(bool enableServerPointer) { unsafe { @@ -426,7 +426,7 @@ public void SetNoServerPointer(bool noServerPointer) { throw new ObjectDisposedException("ConfigBuilder"); } - Raw.ConfigBuilder.SetNoServerPointer(_inner, noServerPointer); + Raw.ConfigBuilder.SetEnableServerPointer(_inner, enableServerPointer); } } diff --git a/ffi/dotnet/Devolutions.IronRdp/Generated/ConnectionActivationStateFinalized.cs b/ffi/dotnet/Devolutions.IronRdp/Generated/ConnectionActivationStateFinalized.cs index 55dcc4ef7..f140a6c4d 100644 --- a/ffi/dotnet/Devolutions.IronRdp/Generated/ConnectionActivationStateFinalized.cs +++ b/ffi/dotnet/Devolutions.IronRdp/Generated/ConnectionActivationStateFinalized.cs @@ -23,19 +23,19 @@ public DesktopSize DesktopSize } } - public ushort IoChannelId + public bool EnableServerPointer { get { - return GetIoChannelId(); + return GetEnableServerPointer(); } } - public bool NoServerPointer + public ushort IoChannelId { get { - return GetNoServerPointer(); + return GetIoChannelId(); } } @@ -111,7 +111,7 @@ public DesktopSize GetDesktopSize() } } - public bool GetNoServerPointer() + public bool GetEnableServerPointer() { unsafe { @@ -119,7 +119,7 @@ public bool GetNoServerPointer() { throw new ObjectDisposedException("ConnectionActivationStateFinalized"); } - bool retVal = Raw.ConnectionActivationStateFinalized.GetNoServerPointer(_inner); + bool retVal = Raw.ConnectionActivationStateFinalized.GetEnableServerPointer(_inner); return retVal; } } diff --git a/ffi/dotnet/Devolutions.IronRdp/Generated/ConnectionResult.cs b/ffi/dotnet/Devolutions.IronRdp/Generated/ConnectionResult.cs index ce5ea459b..ed9c47791 100644 --- a/ffi/dotnet/Devolutions.IronRdp/Generated/ConnectionResult.cs +++ b/ffi/dotnet/Devolutions.IronRdp/Generated/ConnectionResult.cs @@ -23,19 +23,19 @@ public DesktopSize DesktopSize } } - public ushort IoChannelId + public bool EnableServerPointer { get { - return GetIoChannelId(); + return GetEnableServerPointer(); } } - public bool NoServerPointer + public ushort IoChannelId { get { - return GetNoServerPointer(); + return GetIoChannelId(); } } @@ -130,7 +130,7 @@ public DesktopSize GetDesktopSize() } /// - public bool GetNoServerPointer() + public bool GetEnableServerPointer() { unsafe { @@ -138,7 +138,7 @@ public bool GetNoServerPointer() { throw new ObjectDisposedException("ConnectionResult"); } - Raw.ConnectorResultFfiResultBoolBoxIronRdpError result = Raw.ConnectionResult.GetNoServerPointer(_inner); + Raw.ConnectorResultFfiResultBoolBoxIronRdpError result = Raw.ConnectionResult.GetEnableServerPointer(_inner); if (!result.isOk) { throw new IronRdpException(new IronRdpError(result.Err)); diff --git a/ffi/dotnet/Devolutions.IronRdp/Generated/RawActiveStage.cs b/ffi/dotnet/Devolutions.IronRdp/Generated/RawActiveStage.cs index f7ba8bca5..575a4f559 100644 --- a/ffi/dotnet/Devolutions.IronRdp/Generated/RawActiveStage.cs +++ b/ffi/dotnet/Devolutions.IronRdp/Generated/RawActiveStage.cs @@ -41,10 +41,10 @@ public partial struct ActiveStage public static unsafe extern SessionFfiResultOptBoxActiveStageOutputIteratorBoxIronRdpError EncodedResize(ActiveStage* self, uint width, uint height); [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ActiveStage_set_fastpath_processor", ExactSpelling = true)] - public static unsafe extern void SetFastpathProcessor(ActiveStage* self, ushort ioChannelId, ushort userChannelId, [MarshalAs(UnmanagedType.U1)] bool noServerPointer, [MarshalAs(UnmanagedType.U1)] bool pointerSoftwareRendering); + public static unsafe extern void SetFastpathProcessor(ActiveStage* self, ushort ioChannelId, ushort userChannelId, [MarshalAs(UnmanagedType.U1)] bool enableServerPointer, [MarshalAs(UnmanagedType.U1)] bool pointerSoftwareRendering); - [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ActiveStage_set_no_server_pointer", ExactSpelling = true)] - public static unsafe extern void SetNoServerPointer(ActiveStage* self, [MarshalAs(UnmanagedType.U1)] bool noServerPointer); + [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ActiveStage_set_enable_server_pointer", ExactSpelling = true)] + public static unsafe extern void SetEnableServerPointer(ActiveStage* self, [MarshalAs(UnmanagedType.U1)] bool enableServerPointer); [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ActiveStage_destroy", ExactSpelling = true)] public static unsafe extern void Destroy(ActiveStage* self); diff --git a/ffi/dotnet/Devolutions.IronRdp/Generated/RawConfigBuilder.cs b/ffi/dotnet/Devolutions.IronRdp/Generated/RawConfigBuilder.cs index 223654bee..6314b47af 100644 --- a/ffi/dotnet/Devolutions.IronRdp/Generated/RawConfigBuilder.cs +++ b/ffi/dotnet/Devolutions.IronRdp/Generated/RawConfigBuilder.cs @@ -67,8 +67,8 @@ public partial struct ConfigBuilder [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConfigBuilder_set_client_dir", ExactSpelling = true)] public static unsafe extern void SetClientDir(ConfigBuilder* self, byte* clientDir, nuint clientDirSz); - [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConfigBuilder_set_no_server_pointer", ExactSpelling = true)] - public static unsafe extern void SetNoServerPointer(ConfigBuilder* self, [MarshalAs(UnmanagedType.U1)] bool noServerPointer); + [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConfigBuilder_set_enable_server_pointer", ExactSpelling = true)] + public static unsafe extern void SetEnableServerPointer(ConfigBuilder* self, [MarshalAs(UnmanagedType.U1)] bool enableServerPointer); [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConfigBuilder_set_autologon", ExactSpelling = true)] public static unsafe extern void SetAutologon(ConfigBuilder* self, [MarshalAs(UnmanagedType.U1)] bool autologon); diff --git a/ffi/dotnet/Devolutions.IronRdp/Generated/RawConnectionActivationStateFinalized.cs b/ffi/dotnet/Devolutions.IronRdp/Generated/RawConnectionActivationStateFinalized.cs index e30881452..21284bf89 100644 --- a/ffi/dotnet/Devolutions.IronRdp/Generated/RawConnectionActivationStateFinalized.cs +++ b/ffi/dotnet/Devolutions.IronRdp/Generated/RawConnectionActivationStateFinalized.cs @@ -25,9 +25,9 @@ public partial struct ConnectionActivationStateFinalized [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConnectionActivationStateFinalized_get_desktop_size", ExactSpelling = true)] public static unsafe extern DesktopSize* GetDesktopSize(ConnectionActivationStateFinalized* self); - [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConnectionActivationStateFinalized_get_no_server_pointer", ExactSpelling = true)] + [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConnectionActivationStateFinalized_get_enable_server_pointer", ExactSpelling = true)] [return: MarshalAs(UnmanagedType.U1)] - public static unsafe extern bool GetNoServerPointer(ConnectionActivationStateFinalized* self); + public static unsafe extern bool GetEnableServerPointer(ConnectionActivationStateFinalized* self); [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConnectionActivationStateFinalized_get_pointer_software_rendering", ExactSpelling = true)] [return: MarshalAs(UnmanagedType.U1)] diff --git a/ffi/dotnet/Devolutions.IronRdp/Generated/RawConnectionResult.cs b/ffi/dotnet/Devolutions.IronRdp/Generated/RawConnectionResult.cs index 80c5b25ff..9ee015aa5 100644 --- a/ffi/dotnet/Devolutions.IronRdp/Generated/RawConnectionResult.cs +++ b/ffi/dotnet/Devolutions.IronRdp/Generated/RawConnectionResult.cs @@ -25,8 +25,8 @@ public partial struct ConnectionResult [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConnectionResult_get_desktop_size", ExactSpelling = true)] public static unsafe extern ConnectorResultFfiResultBoxDesktopSizeBoxIronRdpError GetDesktopSize(ConnectionResult* self); - [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConnectionResult_get_no_server_pointer", ExactSpelling = true)] - public static unsafe extern ConnectorResultFfiResultBoolBoxIronRdpError GetNoServerPointer(ConnectionResult* self); + [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConnectionResult_get_enable_server_pointer", ExactSpelling = true)] + public static unsafe extern ConnectorResultFfiResultBoolBoxIronRdpError GetEnableServerPointer(ConnectionResult* self); [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "ConnectionResult_get_pointer_software_rendering", ExactSpelling = true)] public static unsafe extern ConnectorResultFfiResultBoolBoxIronRdpError GetPointerSoftwareRendering(ConnectionResult* self); diff --git a/ffi/src/connector/activation.rs b/ffi/src/connector/activation.rs index 4ce2a3684..076315c6a 100644 --- a/ffi/src/connector/activation.rs +++ b/ffi/src/connector/activation.rs @@ -107,13 +107,13 @@ pub mod ffi { io_channel_id, user_channel_id, desktop_size, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } => Ok(Box::new(ConnectionActivationStateFinalized { io_channel_id: *io_channel_id, user_channel_id: *user_channel_id, desktop_size: *desktop_size, - no_server_pointer: *no_server_pointer, + enable_server_pointer: *enable_server_pointer, pointer_software_rendering: *pointer_software_rendering, })), _ => Err(IncorrectEnumTypeError::on_variant("Finalized") @@ -166,7 +166,7 @@ pub mod ffi { pub io_channel_id: u16, pub user_channel_id: u16, pub desktop_size: ironrdp::connector::DesktopSize, - pub no_server_pointer: bool, + pub enable_server_pointer: bool, pub pointer_software_rendering: bool, } @@ -183,8 +183,8 @@ pub mod ffi { Box::new(DesktopSize(self.desktop_size)) } - pub fn get_no_server_pointer(&self) -> bool { - self.no_server_pointer + pub fn get_enable_server_pointer(&self) -> bool { + self.enable_server_pointer } pub fn get_pointer_software_rendering(&self) -> bool { diff --git a/ffi/src/connector/config.rs b/ffi/src/connector/config.rs index ac49ae3c6..abdfd1ffd 100644 --- a/ffi/src/connector/config.rs +++ b/ffi/src/connector/config.rs @@ -37,7 +37,7 @@ pub mod ffi { pub client_name: Option, pub client_dir: Option, pub platform: Option, - pub no_server_pointer: Option, + pub enable_server_pointer: Option, pub autologon: Option, pub no_audio_playback: Option, pub pointer_software_rendering: Option, @@ -140,8 +140,8 @@ pub mod ffi { self.client_dir = Some(client_dir.to_owned()); } - pub fn set_no_server_pointer(&mut self, no_server_pointer: bool) { - self.no_server_pointer = Some(no_server_pointer); + pub fn set_enable_server_pointer(&mut self, enable_server_pointer: bool) { + self.enable_server_pointer = Some(enable_server_pointer); } pub fn set_autologon(&mut self, autologon: bool) { @@ -191,9 +191,9 @@ pub mod ffi { #[cfg(target_os = "netbsd")] platform: MajorPlatformType::UNIX, - no_server_pointer: self.no_server_pointer.unwrap_or(false), + enable_server_pointer: self.enable_server_pointer.unwrap_or(false), autologon: self.autologon.unwrap_or(false), - no_audio_playback: self.no_audio_playback.unwrap_or(false), + enable_audio_playback: self.no_audio_playback.unwrap_or(true), request_data: None, pointer_software_rendering: self.pointer_software_rendering.unwrap_or(false), performance_flags: self.performance_flags.ok_or("performance flag is missing")?, diff --git a/ffi/src/connector/result.rs b/ffi/src/connector/result.rs index 9d8949777..9a11a6e27 100644 --- a/ffi/src/connector/result.rs +++ b/ffi/src/connector/result.rs @@ -58,12 +58,12 @@ pub mod ffi { ))) } - pub fn get_no_server_pointer(&self) -> Result> { + pub fn get_enable_server_pointer(&self) -> Result> { Ok(self .0 .as_ref() .ok_or_else(|| ValueConsumedError::for_item("ConnectionResult"))? - .no_server_pointer) + .enable_server_pointer) } pub fn get_pointer_software_rendering(&self) -> Result> { diff --git a/ffi/src/session/mod.rs b/ffi/src/session/mod.rs index 901532174..6a6b1fa5b 100644 --- a/ffi/src/session/mod.rs +++ b/ffi/src/session/mod.rs @@ -149,22 +149,22 @@ pub mod ffi { &mut self, io_channel_id: u16, user_channel_id: u16, - no_server_pointer: bool, + enable_server_pointer: bool, pointer_software_rendering: bool, ) { self.0.set_fastpath_processor( ironrdp::session::fast_path::ProcessorBuilder { io_channel_id, user_channel_id, - no_server_pointer, + enable_server_pointer, pointer_software_rendering, } .build(), ); } - pub fn set_no_server_pointer(&mut self, no_server_pointer: bool) { - self.0.set_no_server_pointer(no_server_pointer); + pub fn set_enable_server_pointer(&mut self, enable_server_pointer: bool) { + self.0.set_enable_server_pointer(enable_server_pointer); } }