diff options
Diffstat (limited to 'meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch')
-rw-r--r-- | meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch | 72 |
1 files changed, 72 insertions, 0 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 000000000..62600cdda --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From 130094de3244d5039e463e1142e1ec487c1104ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Armin Novak <armin.novak@thincast.com> | ||
3 | Date: Tue, 22 Feb 2022 12:05:08 +0100 | ||
4 | Subject: [PATCH] Fixed compilation warnings in ainput channel | ||
5 | |||
6 | Upstream-Status: Backport [130094de3 Fixed compilation warnings in ainput channel] | ||
7 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
8 | --- | ||
9 | channels/ainput/server/ainput_main.c | 18 ++++++++++++------ | ||
10 | 1 file changed, 12 insertions(+), 6 deletions(-) | ||
11 | |||
12 | diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c | ||
13 | index bc1737ee1..17d2ec681 100644 | ||
14 | --- a/channels/ainput/server/ainput_main.c | ||
15 | +++ b/channels/ainput/server/ainput_main.c | ||
16 | @@ -192,7 +192,7 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s) | ||
17 | |||
18 | static HANDLE ainput_server_get_channel_handle(ainput_server* ainput) | ||
19 | { | ||
20 | - BYTE* buffer = NULL; | ||
21 | + void* buffer = NULL; | ||
22 | DWORD BytesReturned = 0; | ||
23 | HANDLE ChannelEvent = NULL; | ||
24 | |||
25 | @@ -389,7 +389,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm) | ||
26 | goto fail; | ||
27 | return &ainput->context; | ||
28 | fail: | ||
29 | - ainput_server_context_free(ainput); | ||
30 | + ainput_server_context_free(&ainput->context); | ||
31 | return NULL; | ||
32 | } | ||
33 | |||
34 | @@ -496,17 +496,23 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) | ||
35 | break; | ||
36 | case AINPUT_OPENED: | ||
37 | { | ||
38 | - BYTE* buffer = NULL; | ||
39 | + union | ||
40 | + { | ||
41 | + BYTE* pb; | ||
42 | + void* pv; | ||
43 | + } buffer; | ||
44 | DWORD BytesReturned = 0; | ||
45 | |||
46 | - if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer, | ||
47 | + buffer.pv = NULL; | ||
48 | + | ||
49 | + if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv, | ||
50 | &BytesReturned) != TRUE) | ||
51 | { | ||
52 | WLog_ERR(TAG, "WTSVirtualChannelReady failed,"); | ||
53 | } | ||
54 | else | ||
55 | { | ||
56 | - if (*buffer != 0) | ||
57 | + if (*buffer.pb != 0) | ||
58 | { | ||
59 | error = ainput_server_send_version(ainput); | ||
60 | if (error) | ||
61 | @@ -518,7 +524,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) | ||
62 | else | ||
63 | error = CHANNEL_RC_OK; | ||
64 | } | ||
65 | - WTSFreeMemory(buffer); | ||
66 | + WTSFreeMemory(buffer.pv); | ||
67 | } | ||
68 | break; | ||
69 | case AINPUT_VERSION_SENT: | ||
70 | -- | ||
71 | 2.43.0 | ||
72 | |||