1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
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
|
