diff options
Diffstat (limited to 'xorg-server/Xi/chgdctl.c')
| -rw-r--r-- | xorg-server/Xi/chgdctl.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c index 6044f6cd6..901a0e419 100644 --- a/xorg-server/Xi/chgdctl.c +++ b/xorg-server/Xi/chgdctl.c @@ -50,8 +50,6 @@ SOFTWARE. * */ -#define NEED_EVENTS /* for inputstr.h */ -#define NEED_REPLIES #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif @@ -144,7 +142,7 @@ ProcXChangeDeviceControl(ClientPtr client) REQUEST(xChangeDeviceControlReq); REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq); - len = stuff->length - (sizeof(xChangeDeviceControlReq) >> 2); + len = stuff->length - bytes_to_int32(sizeof(xChangeDeviceControlReq)); ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess); if (ret != Success) goto out; @@ -157,8 +155,8 @@ ProcXChangeDeviceControl(ClientPtr client) switch (stuff->control) { case DEVICE_RESOLUTION: r = (xDeviceResolutionCtl *) & stuff[1]; - if ((len < (sizeof(xDeviceResolutionCtl) >> 2)) || - (len != (sizeof(xDeviceResolutionCtl) >> 2) + r->num_valuators)) { + if ((len < bytes_to_int32(sizeof(xDeviceResolutionCtl))) || + (len != bytes_to_int32(sizeof(xDeviceResolutionCtl)) + r->num_valuators)) { ret = BadLength; goto out; } @@ -255,9 +253,9 @@ ProcXChangeDeviceControl(ClientPtr client) if (status == Success) { if (e->enable) - EnableDevice(dev); + EnableDevice(dev, TRUE); else - DisableDevice(dev); + DisableDevice(dev, TRUE); ret = Success; } else if (status == DeviceBusy) { rep.status = DeviceBusy; |