[PATCH xserver] test: Use correct signature for XISetEventMask wrapper

[Peter Hutterer]

On Wed, Mar 08, 2017 at 11:46:27PM +0000, Jon Turney wrote:
> 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>
> ---

I guess that explains the error I saw earlier today :)
pushed, thanks

remote: I: patch #143099 updated using rev 669eb0a65430678fe97de9405e4e42dcb4417ed2.
remote: I: 1 patch(es) updated to state Accepted.
To git+ssh://git.freedesktop.org/git/xorg/xserver
   9232835..669eb0a  master -> master

Cheers,
   Peter

>  test/xi2/protocol-common.h         |  4 ++--
>  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 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;
>  }
> -- 
> 2.8.3
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>