diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-30 15:40:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-30 15:40:11 +0200 |
| commit | 22bc825e9931f718cc0564aa55915961abaffce4 (patch) | |
| tree | f53ea31eb5368d3f60860d3e8911fa83a7fd851a /xorg-server/Xi | |
| parent | ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f (diff) | |
| parent | 5ebbc3a366287b631775ed3e17537580d380db8a (diff) | |
| download | vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.tar.gz vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.tar.bz2 vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
Diffstat (limited to 'xorg-server/Xi')
| -rw-r--r-- | xorg-server/Xi/grabdev.c | 5 | ||||
| -rw-r--r-- | xorg-server/Xi/xiallowev.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/xorg-server/Xi/grabdev.c b/xorg-server/Xi/grabdev.c index 52cdb1b7b..0cc7d5c70 100644 --- a/xorg-server/Xi/grabdev.c +++ b/xorg-server/Xi/grabdev.c @@ -174,10 +174,7 @@ CreateMaskFromList(ClientPtr client, XEventClass * list, int count, int device; DeviceIntPtr tdev; - for (i = 0; i < EMASKSIZE; i++) { - mask[i].mask = 0; - mask[i].dev = NULL; - } + memset(mask, 0, EMASKSIZE * sizeof(struct tmask)); for (i = 0; i < count; i++, list++) { device = *list >> 8; diff --git a/xorg-server/Xi/xiallowev.c b/xorg-server/Xi/xiallowev.c index 62a0727b0..ebef23344 100644 --- a/xorg-server/Xi/xiallowev.c +++ b/xorg-server/Xi/xiallowev.c @@ -81,7 +81,7 @@ ProcXIAllowEvents(ClientPtr client) have_xi22 = TRUE; } else { - REQUEST_SIZE_MATCH(xXIAllowEventsReq); + REQUEST_AT_LEAST_SIZE(xXIAllowEventsReq); } ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess); |