andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: Use correct signature for XISetEventMask wrapper

Browse Source 
This looks like it's always been wrong, but didn't matter before the single
test binary changes as the wrapper was only in place for tests which didn't
care about it's effects, so didn't forward to the real implementation. (see
the changes to protocol-xiselectevents.c in 773fc07e)

This fixes the protocol_xigetselectedevents_test for me.  I'm a bit
surprised that passes for anyone at the moment.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Jon Turney 2017-03-08 23:46:27 +00:00 committed by Peter Hutterer
parent 9232835bd1
commit 669eb0a654
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/xi2/protocol-common.h
View File

@ -144,8 +144,8 @@ void init_simple(void);
/* Declarations for various overrides in the test files. */
void __wrap_WriteToClient(ClientPtr client, int len, void *data);
int __wrap_XISetEventMask(DeviceIntPtr dev, WindowPtr win, int len,
unsigned char *mask);
int __wrap_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
int len, unsigned char *mask);
int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client,
Mask access);
int __real_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client,

10
test/xi2/protocol-xiselectevents.c
View File

@ -65,15 +65,15 @@ static unsigned char *data[4096 * 20]; /* the request data buffer */
ClientRec client_window;
int
__real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, int len,
unsigned char *mask);
__real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
int len, unsigned char *mask);
int
__wrap_XISetEventMask(DeviceIntPtr dev, WindowPtr win, int len,
unsigned char *mask)
__wrap_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
int len, unsigned char *mask)
{
if (!enable_XISetEventMask_wrap)
return __real_XISetEventMask(dev, win, len, mask);
return __real_XISetEventMask(dev, win, client, len, mask);
return Success;
}