xserver: Branch 'master'

[Adam Jackson]

 test/xi2/protocol-xiquerypointer.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6acd0d098add5a14f23d326ac6ee8cebab14b86a
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Aug 17 10:32:28 2016 -0400

    test: Remember to swap the window argument to XIQueryPointer
    
    Before 5c69cb60 this wouldn't matter, because ProcXIQueryPointer
    manually emitted its own error before (bogusly) returning Success to the
    main loop. Since these tests only look at the return value of the
    dispatch function we'd think things succeeded even when we'd generated
    an error.
    
    With that fixed, the test code's failure to swap the window id would
    make dixLookupWindow (rightly) throw BadWindow.
    
    Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c
index c0421f6..2bf18fa 100644
--- a/test/xi2/protocol-xiquerypointer.c
+++ b/test/xi2/protocol-xiquerypointer.c
@@ -140,6 +140,7 @@ request_XIQueryPointer(ClientPtr client, xXIQueryPointerReq * req, int error)
 
     client_request.swapped = TRUE;
     swaps(&req->deviceid);
+    swapl(&req->win);
     swaps(&req->length);
     rc = SProcXIQueryPointer(&client_request);
     assert(rc == error);