mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed va_arg uninitialized warnings

This commit is contained in:
Armin Novak 2021-06-16 14:33:26 +02:00 committed by akallabeth
parent 9e94f1dace
commit 3cf90a4572
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
channels/rdpei/client/rdpei_main.c
View File

@ -1177,11 +1177,13 @@ static UINT rdpei_touch_process(RdpeiClientContext* context, INT32 externalId, U
static UINT rdpei_touch_begin(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, static UINT rdpei_touch_begin(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y,
INT32* contactId) INT32* contactId)
{ {
va_list ap; UINT rc;
return rdpei_touch_process(context, externalId, va_list ap = { 0 };
RDPINPUT_CONTACT_FLAG_DOWN | RDPINPUT_CONTACT_FLAG_INRANGE | rc = rdpei_touch_process(context, externalId,
RDPINPUT_CONTACT_FLAG_INCONTACT, RDPINPUT_CONTACT_FLAG_DOWN | RDPINPUT_CONTACT_FLAG_INRANGE |
x, y, contactId, 0, ap); RDPINPUT_CONTACT_FLAG_INCONTACT,
x, y, contactId, 0, ap);
return rc;
} }
/** /**
@ -1192,11 +1194,13 @@ static UINT rdpei_touch_begin(RdpeiClientContext* context, INT32 externalId, INT
static UINT rdpei_touch_update(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, static UINT rdpei_touch_update(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y,
INT32* contactId) INT32* contactId)
{ {
va_list ap; UINT rc;
return rdpei_touch_process(context, externalId, va_list ap = { 0 };
RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE | rc = rdpei_touch_process(context, externalId,
RDPINPUT_CONTACT_FLAG_INCONTACT, RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE |
x, y, contactId, 0, ap); RDPINPUT_CONTACT_FLAG_INCONTACT,
x, y, contactId, 0, ap);
return rc;
} }
/** /**
@ -1207,15 +1211,17 @@ static UINT rdpei_touch_update(RdpeiClientContext* context, INT32 externalId, IN
static UINT rdpei_touch_end(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, static UINT rdpei_touch_end(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y,
INT32* contactId) INT32* contactId)
{ {
va_list ap; UINT error;
UINT error = rdpei_touch_process(context, externalId, va_list ap = { 0 };
RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE | error = rdpei_touch_process(context, externalId,
RDPINPUT_CONTACT_FLAG_INCONTACT, RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE |
x, y, contactId, 0, ap); RDPINPUT_CONTACT_FLAG_INCONTACT,
x, y, contactId, 0, ap);
if (error != CHANNEL_RC_OK) if (error != CHANNEL_RC_OK)
return error; return error;
return rdpei_touch_process(context, externalId, RDPINPUT_CONTACT_FLAG_UP, x, y, contactId, 0, error =
ap); rdpei_touch_process(context, externalId, RDPINPUT_CONTACT_FLAG_UP, x, y, contactId, 0, ap);
return error;
} }
/** /**
@ -1226,10 +1232,12 @@ static UINT rdpei_touch_end(RdpeiClientContext* context, INT32 externalId, INT32
static UINT rdpei_touch_cancel(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, static UINT rdpei_touch_cancel(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y,
INT32* contactId) INT32* contactId)
{ {
va_list ap; UINT rc;
return rdpei_touch_process(context, externalId, va_list ap = { 0 };
RDPINPUT_CONTACT_FLAG_UP | RDPINPUT_CONTACT_FLAG_CANCELED, x, y, rc = rdpei_touch_process(context, externalId,
contactId, 0, ap); RDPINPUT_CONTACT_FLAG_UP | RDPINPUT_CONTACT_FLAG_CANCELED, x, y,
contactId, 0, ap);
return rc;
} }
static UINT rdpei_touch_raw_event(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, static UINT rdpei_touch_raw_event(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y,
@ -1398,10 +1406,14 @@ static UINT rdpei_pen_end(RdpeiClientContext* context, INT32 externalId, UINT32
RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE | RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE |
RDPINPUT_CONTACT_FLAG_INCONTACT, RDPINPUT_CONTACT_FLAG_INCONTACT,
fieldFlags, x, y, ap); fieldFlags, x, y, ap);
va_end(ap);
if (error == CHANNEL_RC_OK) if (error == CHANNEL_RC_OK)
{
va_start(ap, y);
error = error =
rdpei_pen_process(context, externalId, RDPINPUT_CONTACT_FLAG_UP, fieldFlags, x, y, ap); rdpei_pen_process(context, externalId, RDPINPUT_CONTACT_FLAG_UP, fieldFlags, x, y, ap);
va_end(ap); va_end(ap);
}
return error; return error;
} }