Merge pull request #5376 from kubistika/bugfix/rdpgfx-server-v10.6-PDUs

rdpgfx: Fix GFX v10.6 PDUs parsing and naming according to the spec

diff --cc channels/rdpgfx/client/rdpgfx_main.c
Simple merge

diff --cc channels/rdpgfx/server/rdpgfx_main.c
index 8191826,0d654da..01e043b
--- 1/channels/rdpgfx/server/rdpgfx_main.c
--- 2/channels/rdpgfx/server/rdpgfx_main.c
+++ b/channels/rdpgfx/server/rdpgfx_main.c
@@@ -1063,10 -1062,10 +1063,10 @@@ static UINT rdpgfx_send_map_surface_to_
  }
  
  static UINT rdpgfx_send_map_surface_to_scaled_window_pdu(RdpgfxServerContext* context,
 -        RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* pdu)
 +        const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* pdu)
  {
        wStream* s = rdpgfx_server_single_packet_new(
-                        RDPGFX_CMDID_MAPSURFACETOWINDOW, 18);
+                        RDPGFX_CMDID_MAPSURFACETOWINDOW, 26);
  
        if (!s)
        {
@@@ -1282,10 -1280,10 +1281,10 @@@ static UINT rdpgfx_recv_qoe_frame_ackno
  }
  
  static UINT rdpgfx_send_map_surface_to_scaled_output_pdu(RdpgfxServerContext* context,
 -        RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* pdu)
 +        const RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* pdu)
  {
        wStream* s = rdpgfx_server_single_packet_new(
-                        RDPGFX_CMDID_MAPSURFACETOSCALEDOUTPUT, 12);
+                        RDPGFX_CMDID_MAPSURFACETOSCALEDOUTPUT, 20);
  
        if (!s)
        {