commit: f27694edc390a3b74d4ee64adcef666cc9b2dfe5 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Apr 27 19:20:49 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Apr 28 16:39:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27694ed
net-misc/freerdp: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/freerdp/files/freerdp-3.12.0-cmake.patch | 22 -- .../files/freerdp-3.4.0-incompatible-pointer.patch | 279 --------------------- .../freerdp/files/freerdp-3.6.3-backports.patch | 224 ----------------- 3 files changed, 525 deletions(-) diff --git a/net-misc/freerdp/files/freerdp-3.12.0-cmake.patch b/net-misc/freerdp/files/freerdp-3.12.0-cmake.patch deleted file mode 100644 index e28d2762c6f4..000000000000 --- a/net-misc/freerdp/files/freerdp-3.12.0-cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/949919 -https://github.com/FreeRDP/FreeRDP/issues/11212 - -From 358c36486f419ee09441cf7d53409c31debb54c9 Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Tue, 18 Feb 2025 20:00:11 +0100 -Subject: [PATCH] [cmake] fix missing include - ---- - cmake/CompilerSanitizerOptions.cmake | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cmake/CompilerSanitizerOptions.cmake b/cmake/CompilerSanitizerOptions.cmake -index b128cd8b7ff6..7c3da6cc2153 100644 ---- a/cmake/CompilerSanitizerOptions.cmake -+++ b/cmake/CompilerSanitizerOptions.cmake -@@ -1,4 +1,5 @@ - include(CMakeDependentOption) -+include(CheckIncludeFiles) - - cmake_dependent_option( - WITH_VALGRIND_MEMCHECK "Compile with valgrind helpers." OFF diff --git a/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch deleted file mode 100644 index 549c813f774b..000000000000 --- a/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch +++ /dev/null @@ -1,279 +0,0 @@ -https://github.com/FreeRDP/FreeRDP/pull/9992 -https://bugs.gentoo.org/921252 - -From 0242240ba7a61945607b835f378ff077e4582780 Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 10:05:30 +0100 -Subject: [PATCH 1/8] [winpr,clipboard] fix incompatible WCHAR pointer - ---- - winpr/libwinpr/clipboard/synthetic_file.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c -index 14219806c76e..e748f8bea399 100644 ---- a/winpr/libwinpr/clipboard/synthetic_file.c -+++ b/winpr/libwinpr/clipboard/synthetic_file.c -@@ -276,7 +276,13 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l - const WCHAR* remote_name, wArrayList* files) - { - BOOL result = FALSE; -- const WCHAR* wildcard = "/\0*\0\0\0"; -+ union -+ { -+ const char* c; -+ const WCHAR* w; -+ } wildcard; -+ const char buffer[4] = "/\0*\0\0\0"; -+ wildcard.c = buffer; - const size_t wildcardLen = 3; - - WINPR_ASSERT(clipboard); -@@ -290,7 +296,7 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l - return FALSE; - - _wcsncat(namebuf, local_name, len); -- _wcsncat(namebuf, wildcard, wildcardLen); -+ _wcsncat(namebuf, wildcard.w, wildcardLen); - - result = do_add_directory_contents_to_list(clipboard, local_name, remote_name, namebuf, files); - - -From b1f60a1d117da2a6775dc12ab7e9b62c95615550 Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 10:07:17 +0100 -Subject: [PATCH 2/8] [winpr,smartcard] fix incompatible PCSC_SCardListReaders - pointer - ---- - winpr/libwinpr/smartcard/smartcard_pcsc.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c -index fb04d5684aa0..c94b4caafe1e 100644 ---- a/winpr/libwinpr/smartcard/smartcard_pcsc.c -+++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c -@@ -992,8 +992,14 @@ static LONG WINAPI PCSC_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGrou - return SCARD_E_NO_MEMORY; - } - -- status = -- PCSC_SCardListReaders_Internal(hContext, mszGroupsA, (LPSTR*)&mszReadersA, pcchReaders); -+ union -+ { -+ LPSTR* ppc; -+ LPSTR pc; -+ } cnv; -+ cnv.ppc = &mszReadersA; -+ -+ status = PCSC_SCardListReaders_Internal(hContext, mszGroupsA, cnv.pc, pcchReaders); - if (status == SCARD_S_SUCCESS) - { - size_t size = 0; - -From 48eaca08048918260d4dca05e9522118657e8210 Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 10:10:39 +0100 -Subject: [PATCH 3/8] [core,license] fix incompatible WCHAR pointer - ---- - libfreerdp/core/license.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c -index 99d4fa25fc84..e6c622a6b087 100644 ---- a/libfreerdp/core/license.c -+++ b/libfreerdp/core/license.c -@@ -2802,18 +2802,25 @@ BOOL license_server_send_request(rdpLicense* license) - return license_set_state(license, LICENSE_STATE_REQUEST); - } - --static BOOL license_set_string(const char* what, const char* value, WCHAR** dst, UINT32* dstLen) -+static BOOL license_set_string(const char* what, const char* value, BYTE** bdst, UINT32* dstLen) - { - WINPR_ASSERT(what); - WINPR_ASSERT(value); -- WINPR_ASSERT(dst); -+ WINPR_ASSERT(bdst); - WINPR_ASSERT(dstLen); - -+ union -+ { -+ WCHAR** w; -+ BYTE** b; -+ } cnv; -+ cnv.b = bdst; -+ - size_t len = 0; -- *dst = (BYTE*)ConvertUtf8ToWCharAlloc(value, &len); -- if (!*dst || (len > UINT32_MAX / sizeof(WCHAR))) -+ *cnv.w = ConvertUtf8ToWCharAlloc(value, &len); -+ if (!*cnv.w || (len > UINT32_MAX / sizeof(WCHAR))) - { -- WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *dst, -+ WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *cnv.w, - len); - return FALSE; - } - -From 0717b4de1549390a3404af823bd36db66772abd2 Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 10:10:59 +0100 -Subject: [PATCH 4/8] [winpr,crt] fix incompatible WCHAR pointer - ---- - winpr/libwinpr/crt/test/TestUnicodeConversion.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c -index a5c4c75e8f71..187a068aedaa 100644 ---- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c -+++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c -@@ -24,10 +24,12 @@ typedef struct - // TODO: The unit tests do not check for valid code points, so always end the test - // strings with a simple ASCII symbol for now. - static const testcase_t unit_testcases[] = { -- { "foo", 3, "f\x00o\x00o\x00\x00\x00", 3 }, -- { "foo", 4, "f\x00o\x00o\x00\x00\x00", 4 }, -+ { "foo", 3, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 3 }, -+ { "foo", 4, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 4 }, - { "βπ ΔΚ₯κ£Έπa", 19, -- "\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00\x00", 9 } -+ (const WCHAR*)"\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00" -+ "\x00", -+ 9 } - }; - - static void create_prefix(char* prefix, size_t prefixlen, size_t buffersize, SSIZE_T rc, - -From cab7b59fccabc0f09d659bd499c03dab7e911ffa Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 10:13:40 +0100 -Subject: [PATCH 5/8] [codec,rfx] explicitly cast return - -cast to avoid compilation issues with incompatible-pointer-types ---- - libfreerdp/codec/rfx.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c -index c83cfd5c1ac3..66ed1e04aea2 100644 ---- a/libfreerdp/codec/rfx.c -+++ b/libfreerdp/codec/rfx.c -@@ -1368,7 +1368,7 @@ const RFX_TILE** rfx_message_get_tiles(const RFX_MESSAGE* message, UINT16* numTi - WINPR_ASSERT(message); - if (numTiles) - *numTiles = message->numTiles; -- return message->tiles; -+ return (const RFX_TILE**)message->tiles; - } - - UINT16 rfx_message_get_tile_count(const RFX_MESSAGE* message) - -From 86966912502a3667c111d35dc9ba577a8b209a6d Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 10:17:29 +0100 -Subject: [PATCH 6/8] [client,common] fix incompatible-pointer-types - -use a union to cast to expected types. ---- - client/common/file.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/client/common/file.c b/client/common/file.c -index feb37967fc5a..39b08f18c916 100644 ---- a/client/common/file.c -+++ b/client/common/file.c -@@ -2299,9 +2299,15 @@ BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSett - if (~file->RedirectLocation) - { - size_t count = 0; -- char** str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count); -- const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, str); -- free(str); -+ union -+ { -+ void* pv; -+ char** str; -+ const char** cstr; -+ } cnv; -+ cnv.str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count); -+ const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, cnv.cstr); -+ free(cnv.pv); - if (!rc) - return FALSE; - } - -From dfdb8a849ef78a6e5d1530489ad7f899c62c9c22 Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 10:18:09 +0100 -Subject: [PATCH 7/8] [channels,drive] fix wrong function usage - -_wcslen is for WCHAR, wcslen for wchar_t ---- - channels/drive/client/drive_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c -index 0fdc2e08ff50..04f8d837fa6b 100644 ---- a/channels/drive/client/drive_main.c -+++ b/channels/drive/client/drive_main.c -@@ -511,7 +511,7 @@ static UINT drive_process_irp_query_volume_information(DRIVE_DEVICE* drive, IRP* - /* http://msdn.microsoft.com/en-us/library/cc232101.aspx */ - const WCHAR* diskType = - InitializeConstWCharFromUtf8("FAT32", LabelBuffer, ARRAYSIZE(LabelBuffer)); -- const size_t diskTypeLen = (wcslen(diskType) + 1) * sizeof(WCHAR); -+ const size_t diskTypeLen = (_wcslen(diskType) + 1) * sizeof(WCHAR); - const size_t length = 12ul + diskTypeLen; - Stream_Write_UINT32(output, length); /* Length */ - - -From 00ec91dc16724f7aad8866b4f988baad4c1216a8 Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 10:25:00 +0100 -Subject: [PATCH 8/8] [server,shadow] cast incompatible pointer - -the context pointer to WTSOpenServerA is intentional, cast to LPSTR to -match definition ---- - server/shadow/shadow_client.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c -index 0fd52363eb6d..f2a5f63cb188 100644 ---- a/server/shadow/shadow_client.c -+++ b/server/shadow/shadow_client.c -@@ -252,7 +252,7 @@ static BOOL shadow_client_context_new(freerdp_peer* peer, rdpContext* context) - goto fail; - - region16_init(&(client->invalidRegion)); -- client->vcm = WTSOpenServerA(peer->context); -+ client->vcm = WTSOpenServerA((LPSTR)peer->context); - - if (!client->vcm || client->vcm == INVALID_HANDLE_VALUE) - goto fail; -From 00f4c9612a924f1b87a7dcdd2a5728d9e9616ee6 Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Mon, 18 Mar 2024 19:57:02 +0100 -Subject: [PATCH] [winpr,clipboard] fix WCHAR buffer size - ---- - winpr/libwinpr/clipboard/synthetic_file.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c -index e748f8bea399..ce70e1efc26e 100644 ---- a/winpr/libwinpr/clipboard/synthetic_file.c -+++ b/winpr/libwinpr/clipboard/synthetic_file.c -@@ -281,9 +281,9 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l - const char* c; - const WCHAR* w; - } wildcard; -- const char buffer[4] = "/\0*\0\0\0"; -+ const char buffer[6] = "/\0*\0\0\0"; - wildcard.c = buffer; -- const size_t wildcardLen = 3; -+ const size_t wildcardLen = ARRAYSIZE(buffer) / sizeof(WCHAR); - - WINPR_ASSERT(clipboard); - WINPR_ASSERT(local_name); diff --git a/net-misc/freerdp/files/freerdp-3.6.3-backports.patch b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch deleted file mode 100644 index 473b27cbab02..000000000000 --- a/net-misc/freerdp/files/freerdp-3.6.3-backports.patch +++ /dev/null @@ -1,224 +0,0 @@ -https://bugs.gentoo.org/936406 -https://github.com/FreeRDP/FreeRDP/pull/10410 - -From 776083234b61224f8e3412c31be406b11509b7db Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Tue, 23 Jul 2024 09:14:04 +0200 -Subject: [PATCH 1/2] [warnings] fix unused-but-set-variable - ---- - channels/parallel/client/parallel_main.c | 4 ++++ - channels/printer/client/printer_main.c | 2 ++ - channels/serial/client/serial_main.c | 4 ++++ - channels/tsmf/client/tsmf_media.c | 2 +- - channels/urbdrc/client/data_transfer.c | 3 +-- - libfreerdp/core/gateway/tsg.c | 3 +-- - libfreerdp/core/heartbeat.c | 3 +-- - libfreerdp/gdi/gfx.c | 7 ++----- - winpr/libwinpr/ncrypt/ncrypt_pkcs11.c | 3 --- - 9 files changed, 16 insertions(+), 15 deletions(-) - -diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c -index ce574b87b084..4be078693870 100644 ---- a/channels/parallel/client/parallel_main.c -+++ b/channels/parallel/client/parallel_main.c -@@ -160,6 +160,8 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) - return ERROR_INVALID_DATA; - Stream_Read_UINT32(irp->input, Length); - Stream_Read_UINT64(irp->input, Offset); -+ (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message -+ * ignored */ - buffer = (BYTE*)calloc(Length, sizeof(BYTE)); - - if (!buffer) -@@ -220,6 +222,8 @@ static UINT parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp) - - Stream_Read_UINT32(irp->input, Length); - Stream_Read_UINT64(irp->input, Offset); -+ (void)Offset; /* [MS-RDPESP] 3.2.5.1.5 Processing a Server Write Request Message -+ * ignore offset */ - if (!Stream_SafeSeek(irp->input, 20)) /* Padding */ - return ERROR_INVALID_DATA; - const void* ptr = Stream_ConstPointer(irp->input); -diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c -index 8d11f9b5ccd3..c458c0fdcfca 100644 ---- a/channels/printer/client/printer_main.c -+++ b/channels/printer/client/printer_main.c -@@ -515,6 +515,8 @@ static UINT printer_process_irp_write(PRINTER_DEVICE* printer_dev, IRP* irp) - return ERROR_INVALID_DATA; - Stream_Read_UINT32(irp->input, Length); - Stream_Read_UINT64(irp->input, Offset); -+ (void)Offset; /* [MS-RDPEPC] 2.2.2.9 Server Printer Write Request (DR_PRN_WRITE_REQ) -+ * reserved for future use, ignore */ - Stream_Seek(irp->input, 20); /* Padding */ - const void* ptr = Stream_ConstPointer(irp->input); - if (!Stream_SafeSeek(irp->input, Length)) -diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c -index 22f799a16ba6..c98a27ea9040 100644 ---- a/channels/serial/client/serial_main.c -+++ b/channels/serial/client/serial_main.c -@@ -241,6 +241,8 @@ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) - - Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */ - Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */ -+ (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message -+ * ignored */ - Stream_Seek(irp->input, 20); /* Padding (20 bytes) */ - buffer = (BYTE*)calloc(Length, sizeof(BYTE)); - -@@ -301,6 +303,8 @@ static UINT serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp) - - Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */ - Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */ -+ (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message -+ * ignored */ - if (!Stream_SafeSeek(irp->input, 20)) /* Padding (20 bytes) */ - return ERROR_INVALID_DATA; - -diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c -index 5f47090ae37b..b20db415944d 100644 ---- a/channels/tsmf/client/tsmf_media.c -+++ b/channels/tsmf/client/tsmf_media.c -@@ -1161,7 +1161,7 @@ BOOL tsmf_stream_flush(TSMF_STREAM* stream) - stream->presentation->audio_end_time = 0; - } - -- return TRUE; -+ return ret; - } - - void _tsmf_presentation_free(void* obj) -diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c -index 56f3267ccc35..5f9a6e0e479e 100644 ---- a/channels/urbdrc/client/data_transfer.c -+++ b/channels/urbdrc/client/data_transfer.c -@@ -1038,7 +1038,6 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_ - BYTE bmRequestType = 0; - UINT16 Value = 0; - UINT16 Index = 0; -- UINT16 Padding = 0; - wStream* out = NULL; - URBDRC_PLUGIN* urbdrc = NULL; - const BOOL noAck = (RequestField & 0x80000000U) != 0; -@@ -1061,7 +1060,7 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_ - Stream_Read_UINT8(s, Request); /** Request */ - Stream_Read_UINT16(s, Value); /** value */ - Stream_Read_UINT16(s, Index); /** index */ -- Stream_Read_UINT16(s, Padding); /** Padding */ -+ Stream_Seek_UINT16(s); /** Padding */ - Stream_Read_UINT32(s, OutputBufferSize); - if (OutputBufferSize > UINT32_MAX - 36) - return ERROR_INVALID_DATA; -diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c -index fdd01089810a..60ccdc5a63c6 100644 ---- a/libfreerdp/core/gateway/tsg.c -+++ b/libfreerdp/core/gateway/tsg.c -@@ -693,14 +693,13 @@ static BOOL tsg_ndr_read_packet_response(wLog* log, wStream* s, UINT32* index, - UINT32 MaxSizeValue = 0; - UINT32 MaxOffsetValue = 0; - UINT32 idleTimeout = 0; -- UINT32 reserved = 0; - - WINPR_ASSERT(response); - - if (!Stream_CheckAndLogRequiredLengthOfSizeWLog(log, s, 2, sizeof(UINT32))) - return FALSE; - Stream_Read_UINT32(s, response->flags); /* Flags (4 bytes) */ -- Stream_Read_UINT32(s, reserved); /* Reserved (4 bytes) */ -+ Stream_Seek_UINT32(s); /* Reserved (4 bytes) */ - - if (response->flags != TSG_PACKET_TYPE_QUARREQUEST) - { -diff --git a/libfreerdp/core/heartbeat.c b/libfreerdp/core/heartbeat.c -index 1fb608962f0a..6a77bd562ceb 100644 ---- a/libfreerdp/core/heartbeat.c -+++ b/libfreerdp/core/heartbeat.c -@@ -25,7 +25,6 @@ - - state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s) - { -- BYTE reserved = 0; - BYTE period = 0; - BYTE count1 = 0; - BYTE count2 = 0; -@@ -38,7 +37,7 @@ state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s) - if (!Stream_CheckAndLogRequiredLength(AUTODETECT_TAG, s, 4)) - return STATE_RUN_FAILED; - -- Stream_Read_UINT8(s, reserved); /* reserved (1 byte) */ -+ Stream_Seek_UINT8(s); /* reserved (1 byte) */ - Stream_Read_UINT8(s, period); /* period (1 byte) */ - Stream_Read_UINT8(s, count1); /* count1 (1 byte) */ - Stream_Read_UINT8(s, count2); /* count2 (1 byte) */ -diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c -index c9016a995e6b..59c7a377f8db 100644 ---- a/libfreerdp/gdi/gfx.c -+++ b/libfreerdp/gdi/gfx.c -@@ -1855,14 +1855,11 @@ BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx, - pcRdpgfxUnmapWindowForSurface unmap, - pcRdpgfxUpdateSurfaceArea update) - { -- rdpContext* context = NULL; -- const rdpSettings* settings = NULL; -- - if (!gdi || !gfx || !gdi->context || !gdi->context->settings) - return FALSE; - -- context = gdi->context; -- settings = gdi->context->settings; -+ rdpContext* context = gdi->context; -+ rdpSettings* settings = context->settings; - - gdi->gfx = gfx; - gfx->custom = (void*)gdi; -diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c -index 5f0a80262a30..74ee99ec3a2c 100644 ---- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c -+++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c -@@ -356,7 +356,6 @@ static void log_(const char* tag, const char* msg, CK_RV rv, CK_ULONG index, CK_ - static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKeysState* state) - { - CK_OBJECT_HANDLE slotObjects[MAX_KEYS_PER_SLOT] = { 0 }; -- const char* step = NULL; - - WINPR_ASSERT(provider); - -@@ -418,7 +417,6 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe - { - // TODO: shall it be fatal ? - loge(TAG, "unable to initiate search", rv, i, state->slots[i]); -- step = "C_FindObjectsInit"; - goto cleanup_FindObjectsInit; - } - -@@ -428,7 +426,6 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe - if (rv != CKR_OK) - { - loge(TAG, "unable to findObjects", rv, i, state->slots[i]); -- step = "C_FindObjects"; - goto cleanup_FindObjects; - } - - -From f22974a95a6b2d647174f4195f2ba4789105afaa Mon Sep 17 00:00:00 2001 -From: akallabeth <[email protected]> -Date: Tue, 23 Jul 2024 09:15:00 +0200 -Subject: [PATCH 2/2] [winpr,utils] include current source dir - ---- - winpr/libwinpr/utils/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/winpr/libwinpr/utils/CMakeLists.txt b/winpr/libwinpr/utils/CMakeLists.txt -index 2c5efb3295a5..6bf40e77b1a6 100644 ---- a/winpr/libwinpr/utils/CMakeLists.txt -+++ b/winpr/libwinpr/utils/CMakeLists.txt -@@ -18,7 +18,7 @@ - include(CheckFunctionExists) - include(CMakeDependentOption) - --set(CMAKE_INCLUDE_CURRENT_DIR ON) -+winpr_include_directory_add(${CMAKE_CURRENT_SOURCE_DIR}) - - option(WITH_LODEPNG "build WinPR with PNG support" OFF) - if (WITH_LODEPNG)
