frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Xi: make sure client swapped flag is reset 

Some test cases are recycling the ClientRec between swapped/unwapped runs.
Make sure the Client's swapped flag is always reset in those cases.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-11 16:48:16 +02:00
parent 1dbd46b21b
commit 091c818213
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/xi2/protocol-xigetclientpointer.c
View File

@ -81,6 +81,7 @@ request_XIGetClientPointer(ClientPtr client, xXIGetClientPointerReq * req,
test_data.win = req->win; test_data.win = req->win;
client_request.swapped = FALSE;
rc = ProcXIGetClientPointer(&client_request); rc = ProcXIGetClientPointer(&client_request);
assert(rc == error); assert(rc == error);
@ -95,7 +96,6 @@ request_XIGetClientPointer(ClientPtr client, xXIGetClientPointerReq * req,
if (rc == BadWindow) if (rc == BadWindow)
assert(client_request.errorValue == req->win); assert(client_request.errorValue == req->win);
} }
static void static void

1
test/xi2/protocol-xipassivegrabdevice.c
View File

@ -137,6 +137,7 @@ request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceReq * req,
int mask_len; int mask_len;
client_request.req_len = req->length; client_request.req_len = req->length;
client_request.swapped = FALSE;
rc = ProcXIPassiveGrabDevice(&client_request); rc = ProcXIPassiveGrabDevice(&client_request);
assert(rc == error); assert(rc == error);

1
test/xi2/protocol-xiquerypointer.c
View File

@ -120,6 +120,7 @@ request_XIQueryPointer(ClientPtr client, xXIQueryPointerReq * req, int error)
{ {
int rc; int rc;
client_request.swapped = FALSE;
rc = ProcXIQueryPointer(&client_request); rc = ProcXIQueryPointer(&client_request);
assert(rc == error); assert(rc == error);

3
test/xi2/protocol-xiwarppointer.c
View File

@ -64,6 +64,7 @@ request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq * req, int error)
{ {
int rc; int rc;
client->swapped = FALSE;
rc = ProcXIWarpPointer(client); rc = ProcXIWarpPointer(client);
assert(rc == error); assert(rc == error);
@ -93,8 +94,6 @@ request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq * req, int error)
else if (rc == BadWindow) else if (rc == BadWindow)
assert(client->errorValue == req->dst_win || assert(client->errorValue == req->dst_win ||
client->errorValue == req->src_win); client->errorValue == req->src_win);
client->swapped = FALSE;
} }
static void static void