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

Xi: don't swap the status byte in the XIPassiveGrab replies 

Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2011-03-09 10:44:48 +10:00
parent a3f37f3698
commit 60b08e013d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Xi/xipassivegrab.c
View File

@ -43,6 +43,7 @@
#include "exevents.h" #include "exevents.h"
#include "xipassivegrab.h" #include "xipassivegrab.h"
#include "dixgrabs.h" #include "dixgrabs.h"
#include "misc.h"
int int
SProcXIPassiveGrabDevice(ClientPtr client) SProcXIPassiveGrabDevice(ClientPtr client)
@ -87,6 +88,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
GrabParameters param; GrabParameters param;
void *tmp; void *tmp;
int mask_len; int mask_len;
int n;
REQUEST(xXIPassiveGrabDeviceReq); REQUEST(xXIPassiveGrabDeviceReq);
REQUEST_AT_LEAST_SIZE(xXIPassiveGrabDeviceReq); REQUEST_AT_LEAST_SIZE(xXIPassiveGrabDeviceReq);
@ -195,6 +197,9 @@ ProcXIPassiveGrabDevice(ClientPtr client)
info->status = status; info->status = status;
info->modifiers = *modifiers; info->modifiers = *modifiers;
if (client->swapped)
swapl(&info->modifiers, n);
rep.num_modifiers++; rep.num_modifiers++;
rep.length += bytes_to_int32(sizeof(xXIGrabModifierInfo)); rep.length += bytes_to_int32(sizeof(xXIGrabModifierInfo));
} }
@ -202,10 +207,8 @@ ProcXIPassiveGrabDevice(ClientPtr client)
WriteReplyToClient(client, sizeof(rep), &rep); WriteReplyToClient(client, sizeof(rep), &rep);
if (rep.num_modifiers) if (rep.num_modifiers)
{ WriteToClient(client, rep.length * 4, (char*)modifiers_failed);
client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
WriteSwappedDataToClient(client, rep.length * 4, (char*)modifiers_failed);
}
free(modifiers_failed); free(modifiers_failed);
return ret; return ret;
} }