Merge branch 'master' into mpx

Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c

Xi/extgrbdev.c

@@ -47,7 +47,6 @@ from the author.
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/Xge.h>
 #include "extnsionst.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
 
@@ -127,10 +126,8 @@ ProcXExtendedGrabDevice(ClientPtr client)
         goto cleanup;
     }
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL) {
-        errval = stuff->deviceid;
-        err = BadDevice;
+    err = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
+    if (err != Success) {
 	goto cleanup;
     }
 
@@ -224,9 +221,7 @@ cleanup:
     }
     else
     {
-        SendErrorToClient(client, IReqCode,
-                          X_ExtendedGrabDevice,
-                          errval, err);
+        return err;
     }
     return Success;
 }