X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=rdp.c;h=db74a32c40336fbdd6e8cbe9e9f6f9f27db37931;hp=ff302fbd84737c8aeff707dd6369511da93ea122;hb=d599129218e388c74b42a92a2ff432d28f34fc62;hpb=3877f62cb1eaadc9389341106befc04eded5ae18

diff --git a/rdp.c b/rdp.c
index ff302fb..db74a32 100644
--- a/rdp.c
+++ b/rdp.c
@@ -148,45 +148,24 @@ rdp_in_unistr(STREAM s, char *string, int len)
 	s->p += len;
 }
 
-void rdp_send_bitmap_update(void)
+void rdp_send_bitmap_update(unsigned x, unsigned y, unsigned width, unsigned height, unsigned char *data)
 {
 	STREAM s;
-	static unsigned int x = 1, y = 1;
 
-	x += 2;
-	if (x > 300) {
-		x = 2;
-		y += 2;
-	}
-
-	s = rdp_init_data(11*2 + 2*2*3);
+	s = rdp_init_data(11*2 + width*height*3);
 	out_uint16_le(s, RDP_UPDATE_BITMAP);
 	out_uint16_le(s, 1); // one update
 	out_uint16_le(s, x); // left, top, right, bottom
 	out_uint16_le(s, y);
-	out_uint16_le(s, x+2);
-	out_uint16_le(s, y+2);
-	out_uint16_le(s, 2); // width, height
-	out_uint16_le(s, 2);
+	out_uint16_le(s, x+width);
+	out_uint16_le(s, y+height);
+	out_uint16_le(s, width); // width, height
+	out_uint16_le(s, height);
 	out_uint16_le(s, 24); // bpp
 	out_uint16_le(s, 0); // no compression
-	out_uint16_le(s, 2*2*3); // bufsize
-
-	out_uint8(s, 255);
-	out_uint8(s, 0);
-	out_uint8(s, 0);
-
-	out_uint8(s, 0);
-	out_uint8(s, 255);
-	out_uint8(s, 0);
-
-	out_uint8(s, 0);
-	out_uint8(s, 0);
-	out_uint8(s, 255);
+	out_uint16_le(s, width*height*3); // bufsize
 
-	out_uint8(s, 255);
-	out_uint8(s, 255);
-	out_uint8(s, 255);
+	out_uint8p(s, data, width*height*3);
 	
 	s_mark_end(s);
 	rdp_send_data(s, RDP_DATA_PDU_UPDATE);
@@ -264,11 +243,11 @@ rdp_send_synchronise(void)
 void
 rdp_recv_input(STREAM s, uint32 *time, uint16 *message_type, uint16 *device_flags, uint16 *param1, uint16 *param2)
 {
-	in_uint32_le(s, time);
-	in_uint16_le(s, message_type);
-	in_uint16_le(s, device_flags);
-	in_uint16_le(s, param1);
-	in_uint16_le(s, param2);
+	in_uint32_le(s, *time);
+	in_uint16_le(s, *message_type);
+	in_uint16_le(s, *device_flags);
+	in_uint16_le(s, *param1);
+	in_uint16_le(s, *param2);
 }
 
 /* Disconnect from the RDP layer */