2 files changed, 74 insertions, 1 deletions

diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch
new file mode 100644
index 0000000000..62600cddab
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch
@@ -0,0 +1,72 @@
+From 130094de3244d5039e463e1142e1ec487c1104ef Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Tue, 22 Feb 2022 12:05:08 +0100
+Subject: [PATCH] Fixed compilation warnings in ainput channel
+
+Upstream-Status: Backport [130094de3 Fixed compilation warnings in ainput channel]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ channels/ainput/server/ainput_main.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c
+index bc1737ee1..17d2ec681 100644
+--- a/channels/ainput/server/ainput_main.c
++++ b/channels/ainput/server/ainput_main.c
+@@ -192,7 +192,7 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s)
+ 
+ static HANDLE ainput_server_get_channel_handle(ainput_server* ainput)
+ {
+-       BYTE* buffer = NULL;
++       void* buffer = NULL;
+        DWORD BytesReturned = 0;
+        HANDLE ChannelEvent = NULL;
+ 
+@@ -389,7 +389,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm)
+                goto fail;
+        return &ainput->context;
+ fail:
+-       ainput_server_context_free(ainput);
++       ainput_server_context_free(&ainput->context);
+        return NULL;
+ }
+ 
+@@ -496,17 +496,23 @@ UINT ainput_server_context_poll_int(ainput_server_context* context)
+                        break;
+                case AINPUT_OPENED:
+                {
+-                       BYTE* buffer = NULL;
++                       union
++                       {
++                               BYTE* pb;
++                               void* pv;
++                       } buffer;
+                        DWORD BytesReturned = 0;
+ 
+-                       if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer,
++                       buffer.pv = NULL;
++
++                       if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv,
+                                                   &BytesReturned) != TRUE)
+                        {
+                                WLog_ERR(TAG, "WTSVirtualChannelReady failed,");
+                        }
+                        else
+                        {
+-                               if (*buffer != 0)
++                               if (*buffer.pb != 0)
+                                {
+                                        error = ainput_server_send_version(ainput);
+                                        if (error)
+@@ -518,7 +524,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context)
+                                else
+                                        error = CHANNEL_RC_OK;
+                        }
+-                       WTSFreeMemory(buffer);
++                       WTSFreeMemory(buffer.pv);
+                }
+                break;
+                case AINPUT_VERSION_SENT:
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
index 37a28bfecf..ee4d4530d6 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
@@ -13,12 +13,13 @@ inherit pkgconfig cmake gitpkgv
 PE = "1"
 PKGV = "${GITPKGVTAG}"
 
-SRCREV = "7f6cc93c21d7f0faad6daacca06f494f29ce882c"
+SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
            file://winpr-makecert-Build-with-install-RPATH.patch \
            file://0001-Fixed-compilation-warnings.patch \
            file://0001-Fix-const-qualifier-error.patch \
            file://0002-Do-not-install-tools-a-CMake-targets.patch \
+           file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \
            "
 
 S = "${WORKDIR}/git"