libfreerdp-core: update RDP8 virtual channels

diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c
index 0c7fac4..b33ffb0 100644 (file)
--- a/channels/disp/client/disp_main.c
+++ b/channels/disp/client/disp_main.c
@@ -110,9 +110,18 @@ int disp_send_display_control_monitor_layout_pdu(DISP_CHANNEL_CALLBACK* callback
                if (Monitors[index].Width < 200)
                        Monitors[index].Width = 200;
 
+               if (Monitors[index].Width > 8192)
+                       Monitors[index].Width = 8192;
+
+               if (Monitors[index].Width % 2)
+                       Monitors[index].Width++;
+
                if (Monitors[index].Height < 200)
                        Monitors[index].Height = 200;
 
+               if (Monitors[index].Height > 8192)
+                       Monitors[index].Height = 8192;
+
                Stream_Write_UINT32(s, Monitors[index].Flags); /* Flags (4 bytes) */
                Stream_Write_UINT32(s, Monitors[index].Left); /* Left (4 bytes) */
                Stream_Write_UINT32(s, Monitors[index].Top); /* Top (4 bytes) */

diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 7c0d33b..02db02e 100644 (file)
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -682,38 +682,19 @@ int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_ARGUMENT
        }
        CommandLineSwitchCase(arg, "multitouch")
        {
-               char* p[1];
-               int count = 1;
-
                settings->MultiTouchInput = TRUE;
-
-               p[0] = "rdpei";
-               freerdp_client_add_dynamic_channel(settings, count, p);
        }
        CommandLineSwitchCase(arg, "gestures")
        {
-               printf("gestures\n");
                settings->MultiTouchGestures = TRUE;
        }
        CommandLineSwitchCase(arg, "echo")
        {
-               char* p[1];
-               int count;
-
-               count = 1;
-               p[0] = "echo";
-
-               freerdp_client_add_dynamic_channel(settings, count, p);
+               settings->SupportEchoChannel = TRUE;
        }
        CommandLineSwitchCase(arg, "disp")
        {
-               char* p[1];
-               int count;
-
-               count = 1;
-               p[0] = "disp";
-
-               freerdp_client_add_dynamic_channel(settings, count, p);
+               settings->SupportDisplayControl = TRUE;
        }
        CommandLineSwitchCase(arg, "sound")
        {
@@ -2093,6 +2074,17 @@ int freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings)
                freerdp_client_load_static_channel_addin(channels, settings, "rail", settings);
        }
 
+       if (settings->MultiTouchInput)
+       {
+               char* p[1];
+               int count;
+
+               count = 1;
+               p[0] = "rdpei";
+
+               freerdp_client_add_dynamic_channel(settings, count, p);
+       }
+
        if (settings->SupportGraphicsPipeline)
        {
                char* p[1];
@@ -2104,6 +2096,28 @@ int freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings)
                freerdp_client_add_dynamic_channel(settings, count, p);
        }
 
+       if (settings->SupportEchoChannel)
+       {
+               char* p[1];
+               int count;
+
+               count = 1;
+               p[0] = "echo";
+
+               freerdp_client_add_dynamic_channel(settings, count, p);
+       }
+
+       if (settings->SupportDisplayControl)
+       {
+               char* p[1];
+               int count;
+
+               count = 1;
+               p[0] = "disp";
+
+               freerdp_client_add_dynamic_channel(settings, count, p);
+       }
+
        if (settings->DynamicChannelCount)
                settings->SupportDynamicChannels = TRUE;
 

diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h
index 005f28f..a53c14d 100644 (file)
--- a/include/freerdp/settings.h
+++ b/include/freerdp/settings.h
@@ -795,6 +795,10 @@ typedef struct _RDPDR_PARALLEL RDPDR_PARALLEL;
 #define FreeRDP_DynamicChannelCount                            5056
 #define FreeRDP_DynamicChannelArraySize                                5057
 #define FreeRDP_DynamicChannelArray                            5058
+#define FreeRDP_SupportDynamicChannels                         5059
+#define FreeRDP_SupportEchoChannel                             5184
+#define FreeRDP_SupportDisplayControl                          5185
+#define FreeRDP_SupportGeometryTracking                                5186
 
 /**
  * FreeRDP Settings Data Structure
@@ -1369,6 +1373,11 @@ struct rdp_settings
        ALIGN64 BOOL SupportDynamicChannels; /* 5059 */
        UINT64 padding5184[5184 - 5060]; /* 5060 */
 
+       ALIGN64 BOOL SupportEchoChannel; /* 5184 */
+       ALIGN64 BOOL SupportDisplayControl; /* 5185 */
+       ALIGN64 BOOL SupportGeometryTracking; /* 5186 */
+       UINT64 padding5312[5312 - 5187]; /* 5187 */
+
        /**
         * WARNING: End of ABI stable zone!
         *

diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c
index f20699b..e886e46 100644 (file)
--- a/libfreerdp/core/settings.c
+++ b/libfreerdp/core/settings.c
@@ -454,11 +454,11 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
        UINT32 index;
        rdpSettings* _settings;
 
-       _settings = (rdpSettings*) malloc(sizeof(rdpSettings));
+       _settings = (rdpSettings*) calloc(1, sizeof(rdpSettings));
 
        if (_settings)
        {
-               ZeroMemory(_settings, sizeof(rdpSettings));
+               CopyMemory(_settings, settings, sizeof(rdpSettings));
 
                /**
                  * Generated Code
@@ -471,8 +471,8 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
                _settings->Password = _strdup(settings->Password); /* 22 */
                _settings->Domain = _strdup(settings->Domain); /* 23 */
                _settings->PasswordHash = _strdup(settings->PasswordHash); /* 24 */
-               //_settings->ClientHostname = _strdup(settings->ClientHostname); /* 134 */
-               //_settings->ClientProductId = _strdup(settings->ClientProductId); /* 135 */
+               _settings->ClientHostname = NULL; /* 134 */
+               _settings->ClientProductId = NULL; /* 135 */
                _settings->AlternateShell = _strdup(settings->AlternateShell); /* 640 */
                _settings->ShellWorkingDirectory = _strdup(settings->ShellWorkingDirectory); /* 641 */
                _settings->ClientAddress = _strdup(settings->ClientAddress); /* 769 */
@@ -513,226 +513,6 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
                _settings->ImeFileName = _strdup(settings->ImeFileName); /* 2628 */
                _settings->DrivesToRedirect = _strdup(settings->DrivesToRedirect); /* 4290 */
 
-               /* UINT32 values */
-
-               _settings->ShareId = settings->ShareId; /* 17 */
-               _settings->PduSource = settings->PduSource; /* 18 */
-               _settings->ServerPort = settings->ServerPort; /* 19 */
-               _settings->RdpVersion = settings->RdpVersion; /* 128 */
-               _settings->DesktopWidth = settings->DesktopWidth; /* 129 */
-               _settings->DesktopHeight = settings->DesktopHeight; /* 130 */
-               _settings->ColorDepth = settings->ColorDepth; /* 131 */
-               _settings->ConnectionType = settings->ConnectionType; /* 132 */
-               _settings->ClientBuild = settings->ClientBuild; /* 133 */
-               _settings->EarlyCapabilityFlags = settings->EarlyCapabilityFlags; /* 136 */
-               _settings->EncryptionMethods = settings->EncryptionMethods; /* 193 */
-               _settings->ExtEncryptionMethods = settings->ExtEncryptionMethods; /* 194 */
-               _settings->EncryptionLevel = settings->EncryptionLevel; /* 195 */
-               _settings->ServerRandomLength = settings->ServerRandomLength; /* 197 */
-               _settings->ServerCertificateLength = settings->ServerCertificateLength; /* 199 */
-               _settings->ClientRandomLength = settings->ClientRandomLength; /* 201 */
-               _settings->ChannelCount = settings->ChannelCount; /* 256 */
-               _settings->ChannelDefArraySize = settings->ChannelDefArraySize; /* 257 */
-               _settings->ClusterInfoFlags = settings->ClusterInfoFlags; /* 320 */
-               _settings->RedirectedSessionId = settings->RedirectedSessionId; /* 321 */
-               _settings->MonitorDefArraySize = settings->MonitorDefArraySize; /* 385 */
-               _settings->DesktopPosX = settings->DesktopPosX; /* 390 */
-               _settings->DesktopPosY = settings->DesktopPosY; /* 391 */
-               _settings->NumMonitorIds = settings->NumMonitorIds; /* 394 */
-               _settings->MultitransportFlags = settings->MultitransportFlags; /* 512 */
-               _settings->CompressionLevel = settings->CompressionLevel; /* 721 */
-               _settings->AutoReconnectMaxRetries = settings->AutoReconnectMaxRetries; /* 833 */
-               _settings->PerformanceFlags = settings->PerformanceFlags; /* 960 */
-               _settings->RequestedProtocols = settings->RequestedProtocols; /* 1093 */
-               _settings->SelectedProtocol = settings->SelectedProtocol; /* 1094 */
-               _settings->NegotiationFlags = settings->NegotiationFlags; /* 1095 */
-               _settings->CookieMaxLength = settings->CookieMaxLength; /* 1153 */
-               _settings->PreconnectionId = settings->PreconnectionId; /* 1154 */
-               _settings->RedirectionFlags = settings->RedirectionFlags; /* 1216 */
-               _settings->LoadBalanceInfoLength = settings->LoadBalanceInfoLength; /* 1218 */
-               _settings->RedirectionPasswordLength = settings->RedirectionPasswordLength; /* 1224 */
-               _settings->RedirectionTsvUrlLength = settings->RedirectionTsvUrlLength; /* 1230 */
-               _settings->TargetNetAddressCount = settings->TargetNetAddressCount; /* 1231 */
-               _settings->Password51Length = settings->Password51Length; /* 1281 */
-               _settings->PercentScreen = settings->PercentScreen; /* 1538 */
-               _settings->GatewayUsageMethod = settings->GatewayUsageMethod; /* 1984 */
-               _settings->GatewayPort = settings->GatewayPort; /* 1985 */
-               _settings->GatewayCredentialsSource = settings->GatewayCredentialsSource; /* 1990 */
-               _settings->RemoteApplicationExpandCmdLine = settings->RemoteApplicationExpandCmdLine; /* 2119 */
-               _settings->RemoteApplicationExpandWorkingDir = settings->RemoteApplicationExpandWorkingDir; /* 2120 */
-               _settings->RemoteAppNumIconCaches = settings->RemoteAppNumIconCaches; /* 2122 */
-               _settings->RemoteAppNumIconCacheEntries = settings->RemoteAppNumIconCacheEntries; /* 2123 */
-               _settings->ReceivedCapabilitiesSize = settings->ReceivedCapabilitiesSize; /* 2241 */
-               _settings->OsMajorType = settings->OsMajorType; /* 2304 */
-               _settings->OsMinorType = settings->OsMinorType; /* 2305 */
-               _settings->BitmapCacheVersion = settings->BitmapCacheVersion; /* 2498 */
-               _settings->BitmapCacheV2NumCells = settings->BitmapCacheV2NumCells; /* 2501 */
-               _settings->PointerCacheSize = settings->PointerCacheSize; /* 2561 */
-               _settings->KeyboardLayout = settings->KeyboardLayout; /* 2624 */
-               _settings->KeyboardType = settings->KeyboardType; /* 2625 */
-               _settings->KeyboardSubType = settings->KeyboardSubType; /* 2626 */
-               _settings->KeyboardFunctionKey = settings->KeyboardFunctionKey; /* 2627 */
-               _settings->KeyboardHook = settings->KeyboardHook; /* 2633 */
-               _settings->BrushSupportLevel = settings->BrushSupportLevel; /* 2688 */
-               _settings->GlyphSupportLevel = settings->GlyphSupportLevel; /* 2752 */
-               _settings->OffscreenSupportLevel = settings->OffscreenSupportLevel; /* 2816 */
-               _settings->OffscreenCacheSize = settings->OffscreenCacheSize; /* 2817 */
-               _settings->OffscreenCacheEntries = settings->OffscreenCacheEntries; /* 2818 */
-               _settings->VirtualChannelCompressionFlags = settings->VirtualChannelCompressionFlags; /* 2880 */
-               _settings->VirtualChannelChunkSize = settings->VirtualChannelChunkSize; /* 2881 */
-               _settings->MultifragMaxRequestSize = settings->MultifragMaxRequestSize; /* 3328 */
-               _settings->LargePointerFlag = settings->LargePointerFlag; /* 3392 */
-               _settings->CompDeskSupportLevel = settings->CompDeskSupportLevel; /* 3456 */
-               _settings->RemoteFxCodecId = settings->RemoteFxCodecId; /* 3650 */
-               _settings->RemoteFxCodecMode = settings->RemoteFxCodecMode; /* 3651 */
-               _settings->RemoteFxCaptureFlags = settings->RemoteFxCaptureFlags; /* 3653 */
-               _settings->NSCodecId = settings->NSCodecId; /* 3713 */
-               _settings->FrameAcknowledge = settings->FrameAcknowledge; /* 3714 */
-               _settings->NSCodecColorLossLevel = settings->NSCodecColorLossLevel; /* 3715 */
-               _settings->JpegCodecId = settings->JpegCodecId; /* 3777 */
-               _settings->JpegQuality = settings->JpegQuality; /* 3778 */
-               _settings->BitmapCacheV3CodecId = settings->BitmapCacheV3CodecId; /* 3904 */
-               _settings->DrawNineGridCacheSize = settings->DrawNineGridCacheSize; /* 3969 */
-               _settings->DrawNineGridCacheEntries = settings->DrawNineGridCacheEntries; /* 3970 */
-               _settings->DeviceCount = settings->DeviceCount; /* 4161 */
-               _settings->DeviceArraySize = settings->DeviceArraySize; /* 4162 */
-               _settings->StaticChannelCount = settings->StaticChannelCount; /* 4928 */
-               _settings->StaticChannelArraySize = settings->StaticChannelArraySize; /* 4929 */
-               _settings->DynamicChannelCount = settings->DynamicChannelCount; /* 5056 */
-               _settings->DynamicChannelArraySize = settings->DynamicChannelArraySize; /* 5057 */
-
-               /* BOOL values */
-
-               _settings->ServerMode = settings->ServerMode; /* 16 */
-               _settings->WaitForOutputBufferFlush = settings->WaitForOutputBufferFlush; /* 25 */
-               _settings->NetworkAutoDetect = settings->NetworkAutoDetect; /* 137 */
-               _settings->SupportAsymetricKeys = settings->SupportAsymetricKeys; /* 138 */
-               _settings->SupportErrorInfoPdu = settings->SupportErrorInfoPdu; /* 139 */
-               _settings->SupportStatusInfoPdu = settings->SupportStatusInfoPdu; /* 140 */
-               _settings->SupportMonitorLayoutPdu = settings->SupportMonitorLayoutPdu; /* 141 */
-               _settings->SupportGraphicsPipeline = settings->SupportGraphicsPipeline; /* 142 */
-               _settings->SupportDynamicTimeZone = settings->SupportDynamicTimeZone; /* 143 */
-               _settings->DisableEncryption = settings->DisableEncryption; /* 192 */
-               _settings->ConsoleSession = settings->ConsoleSession; /* 322 */
-               _settings->SpanMonitors = settings->SpanMonitors; /* 387 */
-               _settings->UseMultimon = settings->UseMultimon; /* 388 */
-               _settings->ForceMultimon = settings->ForceMultimon; /* 389 */
-               _settings->ListMonitors = settings->ListMonitors; /* 392 */
-               _settings->AutoLogonEnabled = settings->AutoLogonEnabled; /* 704 */
-               _settings->CompressionEnabled = settings->CompressionEnabled; /* 705 */
-               _settings->DisableCtrlAltDel = settings->DisableCtrlAltDel; /* 706 */
-               _settings->EnableWindowsKey = settings->EnableWindowsKey; /* 707 */
-               _settings->MaximizeShell = settings->MaximizeShell; /* 708 */
-               _settings->LogonNotify = settings->LogonNotify; /* 709 */
-               _settings->LogonErrors = settings->LogonErrors; /* 710 */
-               _settings->MouseAttached = settings->MouseAttached; /* 711 */
-               _settings->MouseHasWheel = settings->MouseHasWheel; /* 712 */
-               _settings->RemoteConsoleAudio = settings->RemoteConsoleAudio; /* 713 */
-               _settings->AudioPlayback = settings->AudioPlayback; /* 714 */
-               _settings->AudioCapture = settings->AudioCapture; /* 715 */
-               _settings->VideoDisable = settings->VideoDisable; /* 716 */
-               _settings->PasswordIsSmartcardPin = settings->PasswordIsSmartcardPin; /* 717 */
-               _settings->UsingSavedCredentials = settings->UsingSavedCredentials; /* 718 */
-               _settings->ForceEncryptedCsPdu = settings->ForceEncryptedCsPdu; /* 719 */
-               _settings->HiDefRemoteApp = settings->HiDefRemoteApp; /* 720 */
-               _settings->IPv6Enabled = settings->IPv6Enabled; /* 768 */
-               _settings->AutoReconnectionEnabled = settings->AutoReconnectionEnabled; /* 832 */
-               _settings->DynamicDaylightTimeDisabled = settings->DynamicDaylightTimeDisabled; /* 898 */
-               _settings->AllowFontSmoothing = settings->AllowFontSmoothing; /* 961 */
-               _settings->DisableWallpaper = settings->DisableWallpaper; /* 962 */
-               _settings->DisableFullWindowDrag = settings->DisableFullWindowDrag; /* 963 */
-               _settings->DisableMenuAnims = settings->DisableMenuAnims; /* 964 */
-               _settings->DisableThemes = settings->DisableThemes; /* 965 */
-               _settings->DisableCursorShadow = settings->DisableCursorShadow; /* 966 */
-               _settings->DisableCursorBlinking = settings->DisableCursorBlinking; /* 967 */
-               _settings->AllowDesktopComposition = settings->AllowDesktopComposition; /* 968 */
-               _settings->RemoteAssistanceMode = settings->RemoteAssistanceMode; /* 1024 */
-               _settings->TlsSecurity = settings->TlsSecurity; /* 1088 */
-               _settings->NlaSecurity = settings->NlaSecurity; /* 1089 */
-               _settings->RdpSecurity = settings->RdpSecurity; /* 1090 */
-               _settings->ExtSecurity = settings->ExtSecurity; /* 1091 */
-               _settings->Authentication = settings->Authentication; /* 1092 */
-               _settings->NegotiateSecurityLayer = settings->NegotiateSecurityLayer; /* 1096 */
-               _settings->RestrictedAdminModeRequired = settings->RestrictedAdminModeRequired; /* 1097 */
-               _settings->DisableCredentialsDelegation = settings->DisableCredentialsDelegation; /* 1099 */
-               _settings->AuthenticationLevel = settings->AuthenticationLevel; /* 1100 */
-               _settings->MstscCookieMode = settings->MstscCookieMode; /* 1152 */
-               _settings->SendPreconnectionPdu = settings->SendPreconnectionPdu; /* 1156 */
-               _settings->IgnoreCertificate = settings->IgnoreCertificate; /* 1408 */
-               _settings->ExternalCertificateManagement = settings->ExternalCertificateManagement; /* 1415 */
-               _settings->Workarea = settings->Workarea; /* 1536 */
-               _settings->Fullscreen = settings->Fullscreen; /* 1537 */
-               _settings->GrabKeyboard = settings->GrabKeyboard; /* 1539 */
-               _settings->Decorations = settings->Decorations; /* 1540 */
-               _settings->MouseMotion = settings->MouseMotion; /* 1541 */
-               _settings->AsyncInput = settings->AsyncInput; /* 1544 */
-               _settings->AsyncUpdate = settings->AsyncUpdate; /* 1545 */
-               _settings->AsyncChannels = settings->AsyncChannels; /* 1546 */
-               _settings->AsyncTransport = settings->AsyncTransport; /* 1547 */
-               _settings->ToggleFullscreen = settings->ToggleFullscreen; /* 1548 */
-               _settings->EmbeddedWindow = settings->EmbeddedWindow; /* 1550 */
-               _settings->SmartSizing = settings->SmartSizing; /* 1551 */
-               _settings->SoftwareGdi = settings->SoftwareGdi; /* 1601 */
-               _settings->LocalConnection = settings->LocalConnection; /* 1602 */
-               _settings->AuthenticationOnly = settings->AuthenticationOnly; /* 1603 */
-               _settings->CredentialsFromStdin = settings->CredentialsFromStdin; /* 1604 */
-               _settings->DumpRemoteFx = settings->DumpRemoteFx; /* 1856 */
-               _settings->PlayRemoteFx = settings->PlayRemoteFx; /* 1857 */
-               _settings->GatewayUseSameCredentials = settings->GatewayUseSameCredentials; /* 1991 */
-               _settings->GatewayEnabled = settings->GatewayEnabled; /* 1992 */
-               _settings->GatewayBypassLocal = settings->GatewayBypassLocal; /* 1993 */
-               _settings->RemoteApplicationMode = settings->RemoteApplicationMode; /* 2112 */
-               _settings->DisableRemoteAppCapsCheck = settings->DisableRemoteAppCapsCheck; /* 2121 */
-               _settings->RemoteAppLanguageBarSupported = settings->RemoteAppLanguageBarSupported; /* 2124 */
-               _settings->RefreshRect = settings->RefreshRect; /* 2306 */
-               _settings->SuppressOutput = settings->SuppressOutput; /* 2307 */
-               _settings->FastPathOutput = settings->FastPathOutput; /* 2308 */
-               _settings->SaltedChecksum = settings->SaltedChecksum; /* 2309 */
-               _settings->LongCredentialsSupported = settings->LongCredentialsSupported; /* 2310 */
-               _settings->NoBitmapCompressionHeader = settings->NoBitmapCompressionHeader; /* 2311 */
-               _settings->BitmapCompressionDisabled = settings->BitmapCompressionDisabled; /* 2312 */
-               _settings->DesktopResize = settings->DesktopResize; /* 2368 */
-               _settings->DrawAllowDynamicColorFidelity = settings->DrawAllowDynamicColorFidelity; /* 2369 */
-               _settings->DrawAllowColorSubsampling = settings->DrawAllowColorSubsampling; /* 2370 */
-               _settings->DrawAllowSkipAlpha = settings->DrawAllowSkipAlpha; /* 2371 */
-               _settings->BitmapCacheV3Enabled = settings->BitmapCacheV3Enabled; /* 2433 */
-               _settings->AltSecFrameMarkerSupport = settings->AltSecFrameMarkerSupport; /* 2434 */
-               _settings->BitmapCacheEnabled = settings->BitmapCacheEnabled; /* 2497 */
-               _settings->AllowCacheWaitingList = settings->AllowCacheWaitingList; /* 2499 */
-               _settings->BitmapCachePersistEnabled = settings->BitmapCachePersistEnabled; /* 2500 */
-               _settings->ColorPointerFlag = settings->ColorPointerFlag; /* 2560 */
-               _settings->UnicodeInput = settings->UnicodeInput; /* 2629 */
-               _settings->FastPathInput = settings->FastPathInput; /* 2630 */
-               _settings->MultiTouchInput = settings->MultiTouchInput; /* 2631 */
-               _settings->MultiTouchGestures = settings->MultiTouchGestures; /* 2632 */
-               _settings->SoundBeepsEnabled = settings->SoundBeepsEnabled; /* 2944 */
-               _settings->SurfaceCommandsEnabled = settings->SurfaceCommandsEnabled; /* 3520 */
-               _settings->FrameMarkerCommandEnabled = settings->FrameMarkerCommandEnabled; /* 3521 */
-               _settings->SurfaceFrameMarkerEnabled = settings->SurfaceFrameMarkerEnabled; /* 3522 */
-               _settings->RemoteFxOnly = settings->RemoteFxOnly; /* 3648 */
-               _settings->RemoteFxCodec = settings->RemoteFxCodec; /* 3649 */
-               _settings->RemoteFxImageCodec = settings->RemoteFxImageCodec; /* 3652 */
-               _settings->NSCodec = settings->NSCodec; /* 3712 */
-               _settings->NSCodecAllowSubsampling = settings->NSCodecAllowSubsampling; /* 3716 */
-               _settings->NSCodecAllowDynamicColorFidelity = settings->NSCodecAllowDynamicColorFidelity; /* 3717 */
-               _settings->JpegCodec = settings->JpegCodec; /* 3776 */
-               _settings->GfxThinClient = settings->GfxThinClient; /* 3840 */
-               _settings->GfxSmallCache = settings->GfxSmallCache; /* 3841 */
-               _settings->GfxProgressive = settings->GfxProgressive; /* 3842 */
-               _settings->GfxProgressiveV2 = settings->GfxProgressiveV2; /* 3843 */
-               _settings->GfxH264 = settings->GfxH264; /* 3844 */
-               _settings->DrawNineGridEnabled = settings->DrawNineGridEnabled; /* 3968 */
-               _settings->DrawGdiPlusEnabled = settings->DrawGdiPlusEnabled; /* 4032 */
-               _settings->DrawGdiPlusCacheEnabled = settings->DrawGdiPlusCacheEnabled; /* 4033 */
-               _settings->DeviceRedirection = settings->DeviceRedirection; /* 4160 */
-               _settings->RedirectDrives = settings->RedirectDrives; /* 4288 */
-               _settings->RedirectHomeDrive = settings->RedirectHomeDrive; /* 4289 */
-               _settings->RedirectSmartCards = settings->RedirectSmartCards; /* 4416 */
-               _settings->RedirectPrinters = settings->RedirectPrinters; /* 4544 */
-               _settings->RedirectSerialPorts = settings->RedirectSerialPorts; /* 4672 */
-               _settings->RedirectParallelPorts = settings->RedirectParallelPorts; /* 4673 */
-               _settings->RedirectClipboard = settings->RedirectClipboard; /* 4800 */
-
                /**
                  * Manual Code
                  */