diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-30 15:35:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-30 15:35:17 +0200 |
| commit | 5ebbc3a366287b631775ed3e17537580d380db8a (patch) | |
| tree | f43c3d54e7c0e161c83288d83b22cbd7da49cc96 /xorg-server/Xi | |
| parent | 84e570d071a041f85e2e8b92963d3390d14af5fc (diff) | |
| download | vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.tar.gz vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.tar.bz2 vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.zip | |
fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
xserver commit 94d4e29aedc69431fa9b299ca1b67947173d7a24
xkeyboard-config commit fcb91cb1013cbdd87a6f77533f188d5934f24046
xkbcomp commit 24d18e0a844041ef82441adb16aa18cc4b4814ae
fontconfig commit 071ce44c35733e54cb477cc75810cbe55025b619
mesa commit f7217b99f243738f941a5d009c68387dfadcb50a
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 443ef56c1..9c6c429ed 100644 --- a/xorg-server/Xi/grabdev.c +++ b/xorg-server/Xi/grabdev.c @@ -175,10 +175,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); |