libxrdp: change xrdp_rdp_send_unknown1 hack to xrdp_rdp_send_fontmap,
relying on docs.
This commit is contained in:
parent
bc4fd1afba
commit
638843526a
@ -25,33 +25,6 @@
|
||||
#include <freerdp/codec/rfx.h>
|
||||
#endif
|
||||
|
||||
/* some compilers need unsigned char to avoid warnings */
|
||||
static tui8 g_unknown1[172] =
|
||||
{
|
||||
0xff, 0x02, 0xb6, 0x00, 0x28, 0x00, 0x00, 0x00,
|
||||
0x27, 0x00, 0x27, 0x00, 0x03, 0x00, 0x04, 0x00,
|
||||
0x00, 0x00, 0x26, 0x00, 0x01, 0x00, 0x1e, 0x00,
|
||||
0x02, 0x00, 0x1f, 0x00, 0x03, 0x00, 0x1d, 0x00,
|
||||
0x04, 0x00, 0x27, 0x00, 0x05, 0x00, 0x0b, 0x00,
|
||||
0x06, 0x00, 0x28, 0x00, 0x08, 0x00, 0x21, 0x00,
|
||||
0x09, 0x00, 0x20, 0x00, 0x0a, 0x00, 0x22, 0x00,
|
||||
0x0b, 0x00, 0x25, 0x00, 0x0c, 0x00, 0x24, 0x00,
|
||||
0x0d, 0x00, 0x23, 0x00, 0x0e, 0x00, 0x19, 0x00,
|
||||
0x0f, 0x00, 0x16, 0x00, 0x10, 0x00, 0x15, 0x00,
|
||||
0x11, 0x00, 0x1c, 0x00, 0x12, 0x00, 0x1b, 0x00,
|
||||
0x13, 0x00, 0x1a, 0x00, 0x14, 0x00, 0x17, 0x00,
|
||||
0x15, 0x00, 0x18, 0x00, 0x16, 0x00, 0x0e, 0x00,
|
||||
0x18, 0x00, 0x0c, 0x00, 0x19, 0x00, 0x0d, 0x00,
|
||||
0x1a, 0x00, 0x12, 0x00, 0x1b, 0x00, 0x14, 0x00,
|
||||
0x1f, 0x00, 0x13, 0x00, 0x20, 0x00, 0x00, 0x00,
|
||||
0x21, 0x00, 0x0a, 0x00, 0x22, 0x00, 0x06, 0x00,
|
||||
0x23, 0x00, 0x07, 0x00, 0x24, 0x00, 0x08, 0x00,
|
||||
0x25, 0x00, 0x09, 0x00, 0x26, 0x00, 0x04, 0x00,
|
||||
0x27, 0x00, 0x03, 0x00, 0x28, 0x00, 0x02, 0x00,
|
||||
0x29, 0x00, 0x01, 0x00, 0x2a, 0x00, 0x05, 0x00,
|
||||
0x2b, 0x00, 0x2a, 0x00
|
||||
};
|
||||
|
||||
/* some compilers need unsigned char to avoid warnings */
|
||||
/*
|
||||
static tui8 g_unknown2[8] =
|
||||
@ -1575,7 +1548,7 @@ xrdp_rdp_process_screen_update(struct xrdp_rdp *self, struct stream *s)
|
||||
|
||||
/*****************************************************************************/
|
||||
static int APP_CC
|
||||
xrdp_rdp_send_unknown1(struct xrdp_rdp *self)
|
||||
xrdp_rdp_send_fontmap(struct xrdp_rdp *self)
|
||||
{
|
||||
struct stream *s;
|
||||
|
||||
@ -1588,7 +1561,11 @@ xrdp_rdp_send_unknown1(struct xrdp_rdp *self)
|
||||
return 1;
|
||||
}
|
||||
|
||||
out_uint8a(s, g_unknown1, 172);
|
||||
out_uint16_le(s, 0); /* numberEntries */
|
||||
out_uint16_le(s, 0); /* totalNumEntries */
|
||||
out_uint16_le(s, 0x3); /* mapFlags (sequence flags) */
|
||||
out_uint16_le(s, 0x4); /* entrySize */
|
||||
|
||||
s_mark_end(s);
|
||||
|
||||
if (xrdp_rdp_send_data(self, s, 0x28) != 0)
|
||||
@ -1655,15 +1632,15 @@ xrdp_rdp_process_data_font(struct xrdp_rdp *self, struct stream *s)
|
||||
if (seq == 2 || seq == 3) /* after second font message, we are up and */
|
||||
{
|
||||
/* running */
|
||||
DEBUG(("sending unknown1"));
|
||||
xrdp_rdp_send_unknown1(self);
|
||||
DEBUG(("sending fontmap"));
|
||||
xrdp_rdp_send_fontmap(self);
|
||||
|
||||
/* TODO: Monitor Layout PDU should send to client after demand active pdu
|
||||
* MOVE THAT CALL
|
||||
*/
|
||||
DEBUG(("sending monitor layout pdu"));
|
||||
if (self->client_info.monitorCount > 0 && self->client_info.multimon == 1)
|
||||
{
|
||||
DEBUG(("sending monitor layout pdu"));
|
||||
if (xrdp_rdp_send_monitorlayout(self) != 0)
|
||||
{
|
||||
g_writeln("Problem with monitor layout packet!!!");
|
||||
|
Loading…
Reference in New Issue
Block a user