diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-03-08 23:46:27 +0000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-03-09 14:07:58 +1000 |
| commit | 669eb0a65430678fe97de9405e4e42dcb4417ed2 (patch) | |
| tree | 4d210f701a4a52b72cca39bfef17e8a53b400b32 /test | |
| parent | 9232835bd16b6948442f7a4588fb9376782cb814 (diff) | |
test: Use correct signature for XISetEventMask wrapper
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/xi2/protocol-common.h | 4 | ||||
| -rw-r--r-- | test/xi2/protocol-xiselectevents.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h index 7190ef0dd..8490529ad 100644 --- a/test/xi2/protocol-common.h +++ b/test/xi2/protocol-common.h @@ -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, diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c index 686e7d394..f136c23d0 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -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; } |