mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[channels,rdpei] add variadic argument calls

Browse Source
This commit is contained in:
Armin Novak 2023-06-22 16:04:34 +02:00 committed by akallabeth
parent 93423eaf11
commit d6ae30e7fa
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1121,6 +1121,13 @@ static UINT rdpei_touch_raw_event(RdpeiClientContext* context, INT32 externalId,
return rc; return rc;
} }
static UINT rdpei_touch_raw_event_va(RdpeiClientContext* context, INT32 externalId, INT32 x,
INT32 y, INT32* contactId, UINT32 flags, UINT32 fieldFlags,
va_list args)
{
return rdpei_touch_process(context, externalId, flags, x, y, contactId, fieldFlags, args);
}
static RDPINPUT_PEN_CONTACT_POINT* rdpei_pen_contact(RDPEI_PLUGIN* rdpei, INT32 externalId, static RDPINPUT_PEN_CONTACT_POINT* rdpei_pen_contact(RDPEI_PLUGIN* rdpei, INT32 externalId,
BOOL active) BOOL active)
{ {
@ -1232,7 +1239,7 @@ static UINT rdpei_pen_begin(RdpeiClientContext* context, INT32 externalId, UINT3
error = rdpei_pen_process(context, externalId, error = rdpei_pen_process(context, externalId,
RDPINPUT_CONTACT_FLAG_DOWN | RDPINPUT_CONTACT_FLAG_INRANGE | RDPINPUT_CONTACT_FLAG_DOWN | RDPINPUT_CONTACT_FLAG_INRANGE |
RDPINPUT_CONTACT_FLAG_INCONTACT, RDPINPUT_CONTACT_FLAG_INCONTACT,
fieldFlags, x, y, FALSE, ap); fieldFlags, x, y, TRUE, ap);
va_end(ap); va_end(ap);
return error; return error;
@ -1343,11 +1350,20 @@ static UINT rdpei_pen_raw_event(RdpeiClientContext* context, INT32 externalId, U
va_list ap; va_list ap;
va_start(ap, y); va_start(ap, y);
error = rdpei_pen_process(context, externalId, contactFlags, fieldFlags, FALSE, x, y, ap); const BOOL begin = contactFlags & RDPINPUT_CONTACT_FLAG_DOWN;
error = rdpei_pen_process(context, externalId, contactFlags, fieldFlags, begin, x, y, ap);
va_end(ap); va_end(ap);
return error; return error;
} }
static UINT rdpei_pen_raw_event_va(RdpeiClientContext* context, INT32 externalId,
UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y,
va_list args)
{
const BOOL begin = contactFlags & RDPINPUT_CONTACT_FLAG_DOWN;
return rdpei_pen_process(context, externalId, contactFlags, fieldFlags, begin, x, y, args);
}
static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdpSettings* settings) static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdpSettings* settings)
{ {
RdpeiClientContext* context; RdpeiClientContext* context;
@ -1388,6 +1404,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdp
context->TouchEnd = rdpei_touch_end; context->TouchEnd = rdpei_touch_end;
context->TouchCancel = rdpei_touch_cancel; context->TouchCancel = rdpei_touch_cancel;
context->TouchRawEvent = rdpei_touch_raw_event; context->TouchRawEvent = rdpei_touch_raw_event;
context->TouchRawEventVA = rdpei_touch_raw_event_va;
context->AddPen = rdpei_add_pen; context->AddPen = rdpei_add_pen;
context->PenBegin = rdpei_pen_begin; context->PenBegin = rdpei_pen_begin;
context->PenUpdate = rdpei_pen_update; context->PenUpdate = rdpei_pen_update;
@ -1396,6 +1413,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdp
context->PenHoverUpdate = rdpei_pen_hover_update; context->PenHoverUpdate = rdpei_pen_hover_update;
context->PenHoverCancel = rdpei_pen_hover_cancel; context->PenHoverCancel = rdpei_pen_hover_cancel;
context->PenRawEvent = rdpei_pen_raw_event; context->PenRawEvent = rdpei_pen_raw_event;
context->PenRawEventVA = rdpei_pen_raw_event_va;
rdpei->context = context; rdpei->context = context;
rdpei->base.iface.pInterface = (void*)context; rdpei->base.iface.pInterface = (void*)context;

9
include/freerdp/client/rdpei.h
View File

@ -46,15 +46,22 @@ extern "C"
typedef UINT (*pcRdpeiTouchRawEvent)(RdpeiClientContext* context, INT32 externalId, INT32 x, typedef UINT (*pcRdpeiTouchRawEvent)(RdpeiClientContext* context, INT32 externalId, INT32 x,
INT32 y, INT32* contactId, UINT32 contactFlags, INT32 y, INT32* contactId, UINT32 contactFlags,
UINT32 fieldFlags, ...); UINT32 fieldFlags, ...);
typedef UINT (*pcRdpeiTouchRawEventVA)(RdpeiClientContext* context, INT32 externalId, INT32 x,
INT32 y, INT32* contactId, UINT32 contactFlags,
UINT32 fieldFlags, va_list args);
typedef UINT (*pcRdpeiAddPen)(RdpeiClientContext* context, INT32 externalId, typedef UINT (*pcRdpeiAddPen)(RdpeiClientContext* context, INT32 externalId,
const RDPINPUT_PEN_CONTACT* contact); const RDPINPUT_PEN_CONTACT* contact);
typedef UINT (*pcRdpeiPen)(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags, typedef UINT (*pcRdpeiPen)(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags,
INT32 x, INT32 y, ...); INT32 x, INT32 y, ...);
typedef UINT (*pcRdpeiPenRawEvent)(RdpeiClientContext* context, INT32 externalId, typedef UINT (*pcRdpeiPenRawEvent)(RdpeiClientContext* context, INT32 externalId,
UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y, UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y,
...); ...);
typedef UINT (*pcRdpeiPenRawEventVA)(RdpeiClientContext* context, INT32 externalId,
UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y,
va_list args);
typedef UINT (*pcRdpeiSuspendTouch)(RdpeiClientContext* context); typedef UINT (*pcRdpeiSuspendTouch)(RdpeiClientContext* context);
typedef UINT (*pcRdpeiResumeTouch)(RdpeiClientContext* context); typedef UINT (*pcRdpeiResumeTouch)(RdpeiClientContext* context);
@ -87,9 +94,11 @@ extern "C"
pcRdpeiTouchEvent TouchCancel; pcRdpeiTouchEvent TouchCancel;
pcRdpeiTouchRawEvent TouchRawEvent; pcRdpeiTouchRawEvent TouchRawEvent;
pcRdpeiTouchRawEventVA TouchRawEventVA;
pcRdpeiPen PenCancel; pcRdpeiPen PenCancel;
pcRdpeiPenRawEvent PenRawEvent; pcRdpeiPenRawEvent PenRawEvent;
pcRdpeiPenRawEventVA PenRawEventVA;
UINT32 clientFeaturesMask; UINT32 clientFeaturesMask;
}; };