--- sourceforge.net/trunk/rdesktop/rdp.c 2004/04/16 11:36:29 658 +++ sourceforge.net/trunk/rdesktop/rdp.c 2004/04/26 22:31:22 678 @@ -31,6 +31,9 @@ extern uint16 g_server_rdp_version; extern uint32 g_rdp5_performanceflags; extern int g_server_bpp; +extern int g_width; +extern int g_height; +extern BOOL g_bitmap_cache; uint8 *g_next_packet; uint32 g_rdp_shareid; @@ -368,7 +371,7 @@ s = rdp_init_data(8); out_uint16(s, 0); /* number of fonts */ - out_uint16_le(s, 0x3e); /* unknown */ + out_uint16_le(s, 0); /* pad? */ out_uint16_le(s, seq); /* unknown */ out_uint16_le(s, 0x32); /* entry size */ @@ -416,7 +419,7 @@ out_uint16_le(s, 800); /* Desktop width */ out_uint16_le(s, 600); /* Desktop height */ out_uint16(s, 0); /* Pad */ - out_uint16(s, 0); /* Allow resize */ + out_uint16(s, 1); /* Allow resize */ out_uint16_le(s, g_bitmap_compression ? 1 : 0); /* Support compression */ out_uint16(s, 0); /* Unknown */ out_uint16_le(s, 1); /* Unknown */ @@ -434,7 +437,7 @@ order_caps[0] = 1; /* dest blt */ order_caps[1] = 1; /* pat blt */ order_caps[2] = 1; /* screen blt */ - order_caps[3] = 1; /* required for memblt? */ + order_caps[3] = (g_bitmap_cache ? 1 : 0); /* memblt */ order_caps[8] = 1; /* line */ order_caps[9] = 1; /* line */ order_caps[10] = 1; /* rect */ @@ -613,42 +616,82 @@ sec_send(s, sec_flags); } +/* Process a general capability set */ +static void +rdp_process_general_caps(STREAM s) +{ + uint16 pad2octetsB; /* rdp5 flags? */ + + in_uint8s(s, 10); + in_uint16_le(s, pad2octetsB); + + if (!pad2octetsB) + g_use_rdp5 = False; +} + +/* Process a bitmap capability set */ +static void +rdp_process_bitmap_caps(STREAM s) +{ + uint16 width, height, bpp; + + in_uint16_le(s, bpp); + in_uint8s(s, 6); + + in_uint16_le(s, width); + in_uint16_le(s, height); + + DEBUG(("setting desktop size and bpp to: %dx%dx%d\n", width, height, bpp)); + + /* + * The server may limit bpp and change the size of the desktop (for + * example when shadowing another session). + */ + g_server_bpp = bpp; + g_width = width; + g_height = height; + + ui_resize_window(); +} + /* Respond to a demand active PDU */ static void process_demand_active(STREAM s) { - uint8 type; - uint16 i; - uint16 p_bpp; + int n; + uint8 type, *next; + uint16 len_src_descriptor, len_combined_caps, num_capsets, capset_type, capset_length; in_uint32_le(s, g_rdp_shareid); + in_uint16_le(s, len_src_descriptor); + in_uint16_le(s, len_combined_caps); + in_uint8s(s, len_src_descriptor); + + in_uint16_le(s, num_capsets); + in_uint8s(s, 2); /* pad */ + + DEBUG(("DEMAND_ACTIVE(id=0x%x,num_caps=%d)\n", g_rdp_shareid, num_capsets)); - /* scan for prefered bpp */ - while (s_check_rem(s, 6)) + for (n = 0; n < num_capsets; n++) { - in_uint16_le(s, i); - if (i == RDP_CAPSET_BITMAP) + in_uint16_le(s, capset_type); + in_uint16_le(s, capset_length); + + next = s->p + capset_length - 4; + + switch (capset_type) { - in_uint16_le(s, i); - if (i == RDP_CAPLEN_BITMAP) - { - in_uint16_le(s, p_bpp); - if (p_bpp == 8 || p_bpp == 15 || p_bpp == 16 || p_bpp == 24) - { - if (p_bpp < g_server_bpp) - { - warning("Server limited colour depth to %d bits\n", - p_bpp); - g_server_bpp = p_bpp; - } - break; - } - } - } - } + case RDP_CAPSET_GENERAL: + rdp_process_general_caps(s); + break; + case RDP_CAPSET_BITMAP: + rdp_process_bitmap_caps(s); + break; + } - DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid)); + s->p = next; + } rdp_send_confirm_active(); rdp_send_synchronise(); @@ -658,9 +701,18 @@ rdp_recv(&type); /* RDP_CTL_COOPERATE */ rdp_recv(&type); /* RDP_CTL_GRANT_CONTROL */ rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, ui_get_numlock_state(read_keyboard_state()), 0); - rdp_send_fonts(1); - rdp_send_fonts(2); - rdp_recv(&type); /* RDP_PDU_UNKNOWN 0x28 */ + + if (g_use_rdp5) + { + rdp_send_fonts(3); + } + else + { + rdp_send_fonts(1); + rdp_send_fonts(2); + } + + rdp_recv(&type); /* RDP_PDU_UNKNOWN 0x28 (Fonts?) */ reset_order_state(); } @@ -886,16 +938,28 @@ } +/* Process a disconnect PDU */ +void +process_disconnect_pdu(STREAM s, uint32 * ext_disc_reason) +{ + in_uint32_le(s, *ext_disc_reason); + + DEBUG(("Received disconnect PDU\n")); +} + /* Process data PDU */ -static void -process_data_pdu(STREAM s) +static BOOL +process_data_pdu(STREAM s, uint32 * ext_disc_reason) { uint8 data_pdu_type; uint8 ctype; uint16 clen; - int roff, rlen, len, ret; + int len; +#if 0 + int roff, rlen, ret; static struct stream ns; static signed char *dict = 0; +#endif in_uint8s(s, 6); /* shareid, pad, streamid */ in_uint16(s, len); @@ -936,6 +1000,14 @@ process_update_pdu(s); break; + case RDP_DATA_PDU_CONTROL: + DEBUG(("Received Control PDU\n")); + break; + + case RDP_DATA_PDU_SYNCHRONISE: + DEBUG(("Received Sync PDU\n")); + break; + case RDP_DATA_PDU_POINTER: process_pointer_pdu(s); break; @@ -950,21 +1022,21 @@ break; case RDP_DATA_PDU_DISCONNECT: - /* Normally received when user logs out or disconnects from a - console session on Windows XP and 2003 Server */ - DEBUG(("Received disconnect PDU\n")); - break; + process_disconnect_pdu(s, ext_disc_reason); + return True; default: unimpl("data PDU %d\n", data_pdu_type); } + return False; } /* Process incoming packets */ -BOOL -rdp_main_loop(void) +void +rdp_main_loop(BOOL * deactivated, uint32 * ext_disc_reason) { uint8 type; + BOOL disc = False; /* True when a disconnect PDU was received */ STREAM s; while ((s = rdp_recv(&type)) != NULL) @@ -973,20 +1045,16 @@ { case RDP_PDU_DEMAND_ACTIVE: process_demand_active(s); + *deactivated = False; break; case RDP_PDU_DEACTIVATE: DEBUG(("RDP_PDU_DEACTIVATE\n")); - /* We thought we could detect a clean - shutdown of the session by this - packet, but it seems Windows 2003 - is sending us one of these when we - reconnect to a disconnected session - return True; */ + *deactivated = True; break; case RDP_PDU_DATA: - process_data_pdu(s); + disc = process_data_pdu(s, ext_disc_reason); break; case 0: @@ -995,11 +1063,13 @@ default: unimpl("PDU %d\n", type); } + + if (disc) + { + return; + } } - return True; - /* We want to detect if we got a clean shutdown, but we - can't. Se above. - return False; */ + return; } /* Establish a connection up to the RDP layer */