Resize

Cargo.toml

@@ -23,16 +23,17 @@ codegen-units = 1
 [workspace.dependencies]
 # Note: To use a local IronRDP repository as a crate (for example, ironrdp-cliprdr), define the dependency as follows:
 # ironrdp-cliprdr = { path = "/path/to/local/IronRDP/crates/ironrdp-cliprdr" }
-# This rev hash corresponds to https://github.com/Devolutions/IronRDP/pull/436. It is being merged while that PR is
-# still open in IronRDP in order to get these changes into a release, however it should be updated once that PR is
-# merged. In the meantime, no other IronRDP hash's (without these changes) should be used.
-ironrdp-cliprdr = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
-ironrdp-connector = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
-ironrdp-graphics = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
-ironrdp-pdu = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
-ironrdp-rdpdr = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
-ironrdp-rdpsnd = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
-ironrdp-session = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
-ironrdp-svc = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
-ironrdp-tls = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275", features = ["rustls"]}
-ironrdp-tokio = { git = "https://github.com/Devolutions/IronRDP", rev = "49dab7d8df4bd785bf17fce97ac02beaba0b0275" }
+# This rev hash is for testing purposes only. It should NOT be merged, and should be updated to IronRDP master once
+# https://github.com/Devolutions/IronRDP/pull/430 and https://github.com/Devolutions/IronRDP/pull/436 are merged.
+ironrdp-cliprdr = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-connector = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-displaycontrol = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-dvc = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-graphics = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-pdu = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-rdpdr = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-rdpsnd = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-session = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-svc = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }
+ironrdp-tls = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b", features = ["rustls"]}
+ironrdp-tokio = { git = "https://github.com/Devolutions/IronRDP", rev = "a40adbbe542033e7561722067fc705704783e66b" }

lib/srv/desktop/rdp/rdpclient/Cargo.toml

@@ -21,6 +21,8 @@ ironrdp-rdpdr.workspace = true
 ironrdp-rdpsnd.workspace = true
 ironrdp-session.workspace = true
 ironrdp-svc.workspace = true
+ironrdp-dvc.workspace = true
+ironrdp-displaycontrol.workspace = true
 ironrdp-tls.workspace = true
 ironrdp-tokio.workspace = true
 iso7816 = "0.1.2"
@@ -36,6 +38,8 @@ tokio = { version = "1.37", features = ["full"] }
 tokio-boring = { git = "https://github.com/gravitational/boring", rev="605253d99d5e363e178bcf97e1d4622e33844cd5", optional = true }
 utf16string = "0.2.0"
 uuid = { version = "1.8.0", features = ["v4"] }
+tracing-subscriber = "0.3.17"
+tracing = { version = "0.1", features = ["log-always" ] }
 
 [build-dependencies]
 cbindgen = "0.26.0"

lib/srv/desktop/rdp/rdpclient/client.go

@@ -393,6 +393,15 @@ func (c *Client) startInputStreaming(stopCh chan struct{}) error {
 		c.UpdateClientActivity()
 
 		switch m := msg.(type) {
+		case tdp.ClientScreenSpec:
+			c.cfg.Logger.DebugContext(context.Background(), "Client changed screen size", "width", m.Width, "height", m.Height)
+			if errCode := C.client_write_screen_resize(
+				C.ulong(c.handle),
+				C.uint32_t(m.Width),
+				C.uint32_t(m.Height),
+			); errCode != C.ErrCodeSuccess {
+				return trace.Errorf("ClientScreenSpec: client_write_screen_resize: %v", errCode)
+			}
 		case tdp.MouseMove:
 			mouseX, mouseY = m.X, m.Y
 			if errCode := C.client_write_rdp_pointer(
@@ -694,8 +703,8 @@ func (c *Client) handleRDPFastPathPDU(data []byte) C.CGOErrCode {
 	return C.ErrCodeSuccess
 }
 
-//export cgo_handle_rdp_connection_initialized
-func cgo_handle_rdp_connection_initialized(
+//export cgo_handle_rdp_connection_activated
+func cgo_handle_rdp_connection_activated(
 	handle C.uintptr_t,
 	io_channel_id C.uint16_t,
 	user_channel_id C.uint16_t,
@@ -706,17 +715,17 @@ func cgo_handle_rdp_connection_initialized(
 	if err != nil {
 		return C.ErrCodeFailure
 	}
-	return client.handleRDPConnectionInitialized(io_channel_id, user_channel_id, screen_width, screen_height)
+	return client.handleRDPConnectionActivated(io_channel_id, user_channel_id, screen_width, screen_height)
 }
 
-func (c *Client) handleRDPConnectionInitialized(ioChannelID, userChannelID, screenWidth, screenHeight C.uint16_t) C.CGOErrCode {
-	c.cfg.Logger.DebugContext(context.Background(), "Received RDP channel IDs", "io_channel", ioChannelID, "user_channel", userChannelID)
+func (c *Client) handleRDPConnectionActivated(ioChannelID, userChannelID, screenWidth, screenHeight C.uint16_t) C.CGOErrCode {
+	c.cfg.Logger.DebugContext(context.Background(), "Received RDP channel IDs", "io_channel_id", ioChannelID, "user_channel_id", userChannelID)
 
 	// Note: RDP doesn't always use the resolution we asked for.
 	// This is especially true when we request dimensions that are not a multiple of 4.
 	c.cfg.Logger.DebugContext(context.Background(), "RDP server provided resolution", "width", screenWidth, "height", screenHeight)
 
-	if err := c.cfg.Conn.WriteMessage(tdp.ConnectionInitialized{
+	if err := c.cfg.Conn.WriteMessage(tdp.ConnectionActivated{
 		IOChannelID:   uint16(ioChannelID),
 		UserChannelID: uint16(userChannelID),
 		ScreenWidth:   uint16(screenWidth),