xserver: Branch 'master'

[Peter Hutterer]

 test/xi2/protocol-common.h         |    4 ++--
 test/xi2/protocol-xiselectevents.c |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 669eb0a65430678fe97de9405e4e42dcb4417ed2
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Mar 8 23:46:27 2017 +0000

    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 at dronecode.org.uk>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
index 7190ef0..8490529 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 686e7d3..f136c23 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;
 }