mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add proper read/write for ordersupportflags et al 

* Add new settings for OrderSupportFlags, OrderSupportFlagsEx,
  TerminalDescriptor and TextANSICodePage
* Add proper read/write routines for the new settings
* Add proper default values for the new settings
This commit is contained in:
akallabeth 2022-10-14 13:39:58 +02:00 committed by akallabeth
parent 7cef0cb8d6
commit 3af13a0fb2
6 changed files with 107 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/freerdp/settings.h
View File

@ -814,6 +814,10 @@ typedef struct
#define FreeRDP_BitmapCacheV3Enabled (2433)
#define FreeRDP_AltSecFrameMarkerSupport (2434)
#define FreeRDP_AllowUnanouncedOrdersFromServer (2435)
#define FreeRDP_OrderSupportFlags (2436)
#define FreeRDP_OrderSupportFlagsEx (2437)
#define FreeRDP_TerminalDescriptor (2438)
#define FreeRDP_TextANSICodePage (2439)
#define FreeRDP_BitmapCacheEnabled (2497)
#define FreeRDP_BitmapCacheVersion (2498)
#define FreeRDP_AllowCacheWaitingList (2499)
@ -1396,7 +1400,11 @@ struct rdp_settings
ALIGN64 BOOL BitmapCacheV3Enabled; /* 2433 */
ALIGN64 BOOL AltSecFrameMarkerSupport; /* 2434 */
ALIGN64 BOOL AllowUnanouncedOrdersFromServer; /* 2435 */
UINT64 padding2497[2497 - 2436]; /* 2436 */
ALIGN64 UINT16 OrderSupportFlags; /* 2436 */
ALIGN64 UINT16 OrderSupportFlagsEx; /* 2437 */
ALIGN64 char* TerminalDescriptor; /* 2438 */
ALIGN64 UINT16 TextANSICodePage; /* 2439 */
UINT64 padding2497[2497 - 2440]; /* 2440 */
/* Bitmap Cache Capabilities */
ALIGN64 BOOL BitmapCacheEnabled; /* 2497 */

30
libfreerdp/common/settings_getters.c
View File

@ -1300,6 +1300,12 @@ UINT16 freerdp_settings_get_uint16(const rdpSettings* settings, size_t id)
case FreeRDP_DesktopOrientation:
return settings->DesktopOrientation;
case FreeRDP_OrderSupportFlags:
return settings->OrderSupportFlags;
case FreeRDP_OrderSupportFlagsEx:
return settings->OrderSupportFlagsEx;
case FreeRDP_ProxyPort:
return settings->ProxyPort;
@ -1309,6 +1315,9 @@ UINT16 freerdp_settings_get_uint16(const rdpSettings* settings, size_t id)
case FreeRDP_TLSMinVersion:
return settings->TLSMinVersion;
case FreeRDP_TextANSICodePage:
return settings->TextANSICodePage;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
freerdp_settings_get_name_for_key(id),
@ -1356,6 +1365,14 @@ BOOL freerdp_settings_set_uint16(rdpSettings* settings, size_t id, UINT16 val)
settings->DesktopOrientation = cnv.c;
break;
case FreeRDP_OrderSupportFlags:
settings->OrderSupportFlags = cnv.c;
break;
case FreeRDP_OrderSupportFlagsEx:
settings->OrderSupportFlagsEx = cnv.c;
break;
case FreeRDP_ProxyPort:
settings->ProxyPort = cnv.c;
break;
@ -1368,6 +1385,10 @@ BOOL freerdp_settings_set_uint16(rdpSettings* settings, size_t id, UINT16 val)
settings->TLSMinVersion = cnv.c;
break;
case FreeRDP_TextANSICodePage:
settings->TextANSICodePage = cnv.c;
break;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
freerdp_settings_get_name_for_key(id),
@ -2660,6 +2681,9 @@ const char* freerdp_settings_get_string(const rdpSettings* settings, size_t id)
case FreeRDP_TargetNetAddress:
return settings->TargetNetAddress;
case FreeRDP_TerminalDescriptor:
return settings->TerminalDescriptor;
case FreeRDP_TlsSecretsFile:
return settings->TlsSecretsFile;
@ -2932,6 +2956,9 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, size_t id)
case FreeRDP_TargetNetAddress:
return settings->TargetNetAddress;
case FreeRDP_TerminalDescriptor:
return settings->TerminalDescriptor;
case FreeRDP_TlsSecretsFile:
return settings->TlsSecretsFile;
@ -3214,6 +3241,9 @@ BOOL freerdp_settings_set_string_(rdpSettings* settings, size_t id, const char*
case FreeRDP_TargetNetAddress:
return update_string(&settings->TargetNetAddress, cnv.cc, len, cleanup);
case FreeRDP_TerminalDescriptor:
return update_string(&settings->TerminalDescriptor, cnv.cc, len, cleanup);
case FreeRDP_TlsSecretsFile:
return update_string(&settings->TlsSecretsFile, cnv.cc, len, cleanup);

4
libfreerdp/common/settings_str.c
View File

@ -249,9 +249,12 @@ static const struct settings_str_entry settings_map[] = {
{ FreeRDP_CapsUpdateCapabilityFlag, FREERDP_SETTINGS_TYPE_UINT16,
"FreeRDP_CapsUpdateCapabilityFlag" },
{ FreeRDP_DesktopOrientation, FREERDP_SETTINGS_TYPE_UINT16, "FreeRDP_DesktopOrientation" },
{ FreeRDP_OrderSupportFlags, FREERDP_SETTINGS_TYPE_UINT16, "FreeRDP_OrderSupportFlags" },
{ FreeRDP_OrderSupportFlagsEx, FREERDP_SETTINGS_TYPE_UINT16, "FreeRDP_OrderSupportFlagsEx" },
{ FreeRDP_ProxyPort, FREERDP_SETTINGS_TYPE_UINT16, "FreeRDP_ProxyPort" },
{ FreeRDP_TLSMaxVersion, FREERDP_SETTINGS_TYPE_UINT16, "FreeRDP_TLSMaxVersion" },
{ FreeRDP_TLSMinVersion, FREERDP_SETTINGS_TYPE_UINT16, "FreeRDP_TLSMinVersion" },
{ FreeRDP_TextANSICodePage, FREERDP_SETTINGS_TYPE_UINT16, "FreeRDP_TextANSICodePage" },
{ FreeRDP_AcceptedCertLength, FREERDP_SETTINGS_TYPE_UINT32, "FreeRDP_AcceptedCertLength" },
{ FreeRDP_AuthenticationLevel, FREERDP_SETTINGS_TYPE_UINT32, "FreeRDP_AuthenticationLevel" },
{ FreeRDP_AutoReconnectMaxRetries, FREERDP_SETTINGS_TYPE_UINT32,
@ -506,6 +509,7 @@ static const struct settings_str_entry settings_map[] = {
{ FreeRDP_SmartcardPrivateKey, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_SmartcardPrivateKey" },
{ FreeRDP_SspiModule, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_SspiModule" },
{ FreeRDP_TargetNetAddress, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_TargetNetAddress" },
{ FreeRDP_TerminalDescriptor, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_TerminalDescriptor" },
{ FreeRDP_TlsSecretsFile, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_TlsSecretsFile" },
{ FreeRDP_TransportDumpFile, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_TransportDumpFile" },
{ FreeRDP_UserSpecifiedServerName, FREERDP_SETTINGS_TYPE_STRING,

107
libfreerdp/core/capabilities.c
View File

@ -531,9 +531,6 @@ static BOOL rdp_apply_order_capability_set(rdpSettings* settings, const rdpSetti
WINPR_ASSERT(src);
int i;
UINT16 orderFlags;
BYTE orderSupport[32];
UINT16 orderSupportExFlags;
BOOL BitmapCacheV3Enabled = FALSE;
BOOL FrameMarkerCommandEnabled = FALSE;
@ -543,16 +540,16 @@ static BOOL rdp_apply_order_capability_set(rdpSettings* settings, const rdpSetti
settings->OrderSupport[i] = FALSE;
}
if (orderFlags & ORDER_FLAGS_EXTRA_SUPPORT)
if (settings->OrderSupportFlags & ORDER_FLAGS_EXTRA_SUPPORT)
{
if (orderSupportExFlags & CACHE_BITMAP_V3_SUPPORT)
if (settings->OrderSupportFlagsEx & CACHE_BITMAP_V3_SUPPORT)
BitmapCacheV3Enabled = TRUE;
if (orderSupportExFlags & ALTSEC_FRAME_MARKER_SUPPORT)
if (settings->OrderSupportFlagsEx & ALTSEC_FRAME_MARKER_SUPPORT)
FrameMarkerCommandEnabled = TRUE;
}
if (settings->BitmapCacheV3Enabled)
if (BitmapCacheV3Enabled)
{
settings->BitmapCacheV3Enabled = src->BitmapCacheV3Enabled;
settings->BitmapCacheVersion = src->BitmapCacheVersion;
@ -576,41 +573,44 @@ static BOOL rdp_apply_order_capability_set(rdpSettings* settings, const rdpSetti
static BOOL rdp_read_order_capability_set(wStream* s, rdpSettings* settings)
{
int i;
UINT16 orderFlags;
BYTE orderSupport[32];
UINT16 orderSupportExFlags;
size_t i;
char terminalDescriptor[17] = { 0 };
BYTE orderSupport[32] = { 0 };
BOOL BitmapCacheV3Enabled = FALSE;
BOOL FrameMarkerCommandEnabled = FALSE;
WINPR_ASSERT(settings);
if (!Stream_CheckAndLogRequiredLength(TAG, s, 84))
return FALSE;
Stream_Seek(s, 16); /* terminalDescriptor (16 bytes) */
Stream_Seek_UINT32(s); /* pad4OctetsA (4 bytes) */
Stream_Seek_UINT16(s); /* desktopSaveXGranularity (2 bytes) */
Stream_Seek_UINT16(s); /* desktopSaveYGranularity (2 bytes) */
Stream_Seek_UINT16(s); /* pad2OctetsA (2 bytes) */
Stream_Seek_UINT16(s); /* maximumOrderLevel (2 bytes) */
Stream_Seek_UINT16(s); /* numberFonts (2 bytes) */
Stream_Read_UINT16(s, orderFlags); /* orderFlags (2 bytes) */
Stream_Read(s, orderSupport, 32); /* orderSupport (32 bytes) */
Stream_Seek_UINT16(s); /* textFlags (2 bytes) */
Stream_Read_UINT16(s, orderSupportExFlags); /* orderSupportExFlags (2 bytes) */
Stream_Seek_UINT32(s); /* pad4OctetsB (4 bytes) */
Stream_Seek_UINT32(s); /* desktopSaveSize (4 bytes) */
Stream_Seek_UINT16(s); /* pad2OctetsC (2 bytes) */
Stream_Seek_UINT16(s); /* pad2OctetsD (2 bytes) */
Stream_Seek_UINT16(s); /* textANSICodePage (2 bytes) */
Stream_Seek_UINT16(s); /* pad2OctetsE (2 bytes) */
Stream_Read(s, terminalDescriptor, 16); /* terminalDescriptor (16 bytes) */
Stream_Seek_UINT32(s); /* pad4OctetsA (4 bytes) */
Stream_Seek_UINT16(s); /* desktopSaveXGranularity (2 bytes) */
Stream_Seek_UINT16(s); /* desktopSaveYGranularity (2 bytes) */
Stream_Seek_UINT16(s); /* pad2OctetsA (2 bytes) */
Stream_Seek_UINT16(s); /* maximumOrderLevel (2 bytes) */
Stream_Seek_UINT16(s); /* numberFonts (2 bytes) */
Stream_Read_UINT16(s, settings->OrderSupportFlags); /* orderFlags (2 bytes) */
Stream_Read(s, orderSupport, 32); /* orderSupport (32 bytes) */
Stream_Seek_UINT16(s); /* textFlags (2 bytes) */
Stream_Read_UINT16(s, settings->OrderSupportFlagsEx); /* orderSupportExFlags (2 bytes) */
Stream_Seek_UINT32(s); /* pad4OctetsB (4 bytes) */
Stream_Seek_UINT32(s); /* desktopSaveSize (4 bytes) */
Stream_Seek_UINT16(s); /* pad2OctetsC (2 bytes) */
Stream_Seek_UINT16(s); /* pad2OctetsD (2 bytes) */
Stream_Read_UINT16(s, settings->TextANSICodePage); /* textANSICodePage (2 bytes) */
Stream_Seek_UINT16(s); /* pad2OctetsE (2 bytes) */
for (i = 0; i < 32; i++)
if (!freerdp_settings_set_string(settings, FreeRDP_TerminalDescriptor, terminalDescriptor))
return FALSE;
for (i = 0; i < ARRAYSIZE(orderSupport); i++)
settings->OrderSupport[i] = orderSupport[i];
if (orderFlags & ORDER_FLAGS_EXTRA_SUPPORT)
if (settings->OrderSupportFlags & ORDER_FLAGS_EXTRA_SUPPORT)
{
BitmapCacheV3Enabled = orderSupportExFlags & CACHE_BITMAP_V3_SUPPORT;
FrameMarkerCommandEnabled = orderSupportExFlags & ALTSEC_FRAME_MARKER_SUPPORT;
BitmapCacheV3Enabled = settings->OrderSupportFlagsEx & CACHE_BITMAP_V3_SUPPORT;
FrameMarkerCommandEnabled = settings->OrderSupportFlagsEx & ALTSEC_FRAME_MARKER_SUPPORT;
}
settings->BitmapCacheV3Enabled = BitmapCacheV3Enabled;
@ -634,20 +634,18 @@ static BOOL rdp_write_order_capability_set(wStream* s, const rdpSettings* settin
size_t header;
UINT16 orderFlags;
UINT16 orderSupportExFlags;
UINT16 textANSICodePage = 0;
char terminalDescriptor[16] = { 0 };
WINPR_ASSERT(settings);
if (!Stream_EnsureRemainingCapacity(s, 64))
return FALSE;
header = rdp_capability_set_start(s);
if (header > UINT16_MAX)
return FALSE;
/* see [MSDN-CP]: http://msdn.microsoft.com/en-us/library/dd317756 */
if (!settings->ServerMode)
textANSICodePage = CP_UTF8; /* Unicode (UTF-8) */
orderSupportExFlags = 0;
orderFlags = NEGOTIATE_ORDER_SUPPORT | ZERO_BOUNDS_DELTA_SUPPORT | COLOR_INDEX_SUPPORT;
orderSupportExFlags = settings->OrderSupportFlagsEx;
orderFlags = settings->OrderSupportFlags;
if (settings->BitmapCacheV3Enabled)
{
@ -661,7 +659,14 @@ static BOOL rdp_write_order_capability_set(wStream* s, const rdpSettings* settin
orderFlags |= ORDER_FLAGS_EXTRA_SUPPORT;
}
Stream_Zero(s, 16); /* terminalDescriptor (16 bytes) */
const char* dsc = freerdp_settings_get_string(settings, FreeRDP_TerminalDescriptor);
if (dsc)
{
const size_t len = strnlen(dsc, ARRAYSIZE(terminalDescriptor));
strncpy(terminalDescriptor, dsc, len);
}
Stream_Write(s, terminalDescriptor,
sizeof(terminalDescriptor)); /* terminalDescriptor (16 bytes) */
Stream_Write_UINT32(s, 0); /* pad4OctetsA (4 bytes) */
Stream_Write_UINT16(s, 1); /* desktopSaveXGranularity (2 bytes) */
Stream_Write_UINT16(s, 20); /* desktopSaveYGranularity (2 bytes) */
@ -676,7 +681,7 @@ static BOOL rdp_write_order_capability_set(wStream* s, const rdpSettings* settin
Stream_Write_UINT32(s, 230400); /* desktopSaveSize (4 bytes) */
Stream_Write_UINT16(s, 0); /* pad2OctetsC (2 bytes) */
Stream_Write_UINT16(s, 0); /* pad2OctetsD (2 bytes) */
Stream_Write_UINT16(s, textANSICodePage); /* textANSICodePage (2 bytes) */
Stream_Write_UINT16(s, settings->TextANSICodePage); /* textANSICodePage (2 bytes) */
Stream_Write_UINT16(s, 0); /* pad2OctetsE (2 bytes) */
return rdp_capability_set_finish(s, (UINT16)header, CAPSET_TYPE_ORDER);
}
@ -1714,9 +1719,9 @@ static BOOL rdp_read_glyph_cache_capability_set(wStream* s, rdpSettings* setting
/* glyphCache (40 bytes) */
for (x = 0; x < 10; x++)
rdp_read_cache_definition(s, &(settings->GlyphCache[x])); /* glyphCache0 (4 bytes) */
rdp_read_cache_definition(s, settings->FragCache); /* fragCache (4 bytes) */
Stream_Read_UINT16(s, settings->GlyphSupportLevel); /* glyphSupportLevel (2 bytes) */
Stream_Seek_UINT16(s); /* pad2Octets (2 bytes) */
rdp_read_cache_definition(s, settings->FragCache); /* fragCache (4 bytes) */
Stream_Read_UINT16(s, settings->GlyphSupportLevel); /* glyphSupportLevel (2 bytes) */
Stream_Seek_UINT16(s); /* pad2Octets (2 bytes) */
return TRUE;
}
@ -1743,8 +1748,8 @@ static BOOL rdp_write_glyph_cache_capability_set(wStream* s, const rdpSettings*
for (x = 0; x < 10; x++)
rdp_write_cache_definition(s, &(settings->GlyphCache[x])); /* glyphCache0 (4 bytes) */
rdp_write_cache_definition(s, settings->FragCache); /* fragCache (4 bytes) */
Stream_Write_UINT16(s, (UINT16)settings->GlyphSupportLevel); /* glyphSupportLevel (2 bytes) */
Stream_Write_UINT16(s, 0); /* pad2Octets (2 bytes) */
Stream_Write_UINT16(s, (UINT16)settings->GlyphSupportLevel); /* glyphSupportLevel (2 bytes) */
Stream_Write_UINT16(s, 0); /* pad2Octets (2 bytes) */
return rdp_capability_set_finish(s, (UINT16)header, CAPSET_TYPE_GLYPH_CACHE);
}
@ -1946,9 +1951,9 @@ static BOOL rdp_write_bitmap_cache_host_support_capability_set(wStream* s,
header = rdp_capability_set_start(s);
if (header > UINT16_MAX)
return FALSE;
Stream_Write_UINT8(s, cacheVersion); /* cacheVersion (1 byte) */
Stream_Write_UINT8(s, 0); /* pad1 (1 byte) */
Stream_Write_UINT16(s, 0); /* pad2 (2 bytes) */
Stream_Write_UINT8(s, cacheVersion); /* cacheVersion (1 byte) */
Stream_Write_UINT8(s, 0); /* pad1 (1 byte) */
Stream_Write_UINT16(s, 0); /* pad2 (2 bytes) */
return rdp_capability_set_finish(s, (UINT16)header, CAPSET_TYPE_BITMAP_CACHE_HOST_SUPPORT);
}
@ -2060,7 +2065,7 @@ static BOOL rdp_read_bitmap_cache_v2_capability_set(wStream* s, rdpSettings* set
cacheFlags & PERSISTENT_KEYS_EXPECTED_FLAG))
return FALSE;
Stream_Seek_UINT8(s); /* pad2 (1 byte) */
Stream_Seek_UINT8(s); /* pad2 (1 byte) */
Stream_Read_UINT8(s, settings->BitmapCacheV2NumCells); /* numCellCaches (1 byte) */
for (x = 0; x < 5; x++)
{
@ -2069,7 +2074,7 @@ static BOOL rdp_read_bitmap_cache_v2_capability_set(wStream* s, rdpSettings* set
if (!rdp_read_bitmap_cache_cell_info(s, info))
return FALSE;
}
Stream_Seek(s, 12); /* pad3 (12 bytes) */
Stream_Seek(s, 12); /* pad3 (12 bytes) */
return TRUE;
}
@ -2224,7 +2229,7 @@ static BOOL rdp_write_virtual_channel_capability_set(wStream* s, const rdpSettin
return FALSE;
Stream_Write_UINT32(s, settings->VirtualChannelCompressionFlags); /* flags (4 bytes) */
Stream_Write_UINT32(s, settings->VirtualChannelChunkSize); /* VCChunkSize (4 bytes) */
Stream_Write_UINT32(s, settings->VirtualChannelChunkSize); /* VCChunkSize (4 bytes) */
return rdp_capability_set_finish(s, header, CAPSET_TYPE_VIRTUAL_CHANNEL);
}

4
libfreerdp/core/settings.c
View File

@ -357,6 +357,10 @@ rdpSettings* freerdp_settings_new(DWORD flags)
RAIL_LEVEL_SERVER_TO_CLIENT_IME_SYNC_SUPPORTED |
RAIL_LEVEL_HIDE_MINIMIZED_APPS_SUPPORTED | RAIL_LEVEL_WINDOW_CLOAKING_SUPPORTED |
RAIL_LEVEL_HANDSHAKE_EX_SUPPORTED) ||
!freerdp_settings_set_uint16(settings, FreeRDP_TextANSICodePage, CP_UTF8) ||
!freerdp_settings_set_uint16(settings, FreeRDP_OrderSupportFlags,
NEGOTIATE_ORDER_SUPPORT | ZERO_BOUNDS_DELTA_SUPPORT |
COLOR_INDEX_SUPPORT) ||
!freerdp_settings_set_bool(settings, FreeRDP_SupportHeartbeatPdu, TRUE) ||
!freerdp_settings_set_bool(settings, FreeRDP_ServerMode,
(flags & FREERDP_SETTINGS_SERVER_MODE) ? TRUE : FALSE) ||

4
libfreerdp/core/test/settings_property_lists.h
View File

@ -186,9 +186,12 @@ static const size_t uint16_list_indices[] = {
FreeRDP_CapsRemoteUnshareFlag,
FreeRDP_CapsUpdateCapabilityFlag,
FreeRDP_DesktopOrientation,
FreeRDP_OrderSupportFlags,
FreeRDP_OrderSupportFlagsEx,
FreeRDP_ProxyPort,
FreeRDP_TLSMaxVersion,
FreeRDP_TLSMinVersion,
FreeRDP_TextANSICodePage,
};
#define have_uint32_list_indices
@ -406,6 +409,7 @@ static const size_t string_list_indices[] = {
FreeRDP_SmartcardPrivateKey,
FreeRDP_SspiModule,
FreeRDP_TargetNetAddress,
FreeRDP_TerminalDescriptor,
FreeRDP_TlsSecretsFile,
FreeRDP_TransportDumpFile,
FreeRDP_UserSpecifiedServerName,