From 5d40fb34e7174f38c193556ef8d5a599cac5ed25 Mon Sep 17 00:00:00 2001 From: Martin Fleisz Date: Tue, 28 Nov 2023 14:10:56 +0100 Subject: [PATCH] server: Fix compilation on Windows after recent settings changes --- server/Windows/wf_peer.c | 6 +++--- server/shadow/Win/win_rdp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c index 50e92fb13..4342a3b46 100644 --- a/server/Windows/wf_peer.c +++ b/server/Windows/wf_peer.c @@ -132,9 +132,9 @@ static BOOL wf_peer_post_connect(freerdp_peer* client) freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight), wfi->servscreen_width, wfi->servscreen_height); */ - freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth) = wfi->servscreen_width; - freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight) = wfi->servscreen_height; - if (!freerdp_settings_set_uint32(settings, FreeRDP_ColorDepth, wfi->bitsPerPixel)) + if (!freerdp_settings_set_uint32(settings, FreeRDP_DesktopWidth, wfi->servscreen_width) || + !freerdp_settings_set_uint32(settings, FreeRDP_DesktopHeight, wfi->servscreen_height) || + !freerdp_settings_set_uint32(settings, FreeRDP_ColorDepth, wfi->bitsPerPixel)) return FALSE; WINPR_ASSERT(client->context->update); diff --git a/server/shadow/Win/win_rdp.c b/server/shadow/Win/win_rdp.c index 1d45a9a4a..9d6680087 100644 --- a/server/shadow/Win/win_rdp.c +++ b/server/shadow/Win/win_rdp.c @@ -314,7 +314,7 @@ static BOOL shw_freerdp_client_new(freerdp* instance, rdpContext* context) return FALSE; if (!freerdp_settings_set_bool(settings, FreeRDP_BrushSupportLevel, FALSE)) return FALSE; - ZeroMemory(freerdp_settings_get_pointer_writeable(settings, FreeRDP_OrderSupport), 32); + ZeroMemory(freerdp_settings_get_pointer_writable(settings, FreeRDP_OrderSupport), 32); if (!freerdp_settings_set_bool(settings, FreeRDP_FrameMarkerCommandEnabled, TRUE)) return FALSE; if (!freerdp_settings_set_bool(settings, FreeRDP_SurfaceFrameMarkerEnabled, TRUE))