Replace SecurityLookupIDByType() with dixLookupResourceByType(), take 2.

These occurrences are a bit harder to catch through a semantic patch,
so process them “manually”.

Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
This commit is contained in:
Cyril Brulebois 2010-11-12 11:36:36 +01:00
parent ac04c1377a
commit 6e8b34b704
2 changed files with 10 additions and 5 deletions

View File

@ -231,8 +231,9 @@ static int ProcDMXForceWindowCreation(ClientPtr client)
PanoramiXRes *win;
int i;
if (!(win = SecurityLookupIDByType(client, stuff->window, XRT_WINDOW,
DixReadAccess)))
if (Success != dixLookupResourceByType((pointer*) &win,
stuff->window, XRT_WINDOW,
client, DixReadAccess))
return -1; /* BadWindow */
FOR_NSCREENS(i) {
@ -506,8 +507,9 @@ static int dmxPopulatePanoramiX(ClientPtr client, Window window,
int count = 0;
DMXWindowAttributesRec attr;
if (!(win = SecurityLookupIDByType(client, window, XRT_WINDOW,
DixReadAccess)))
if (Success != dixLookupResourceByType((pointer*) &win,
window, XRT_WINDOW,
client, DixReadAccess))
return -1; /* BadWindow */
FOR_NSCREENS(i) {

View File

@ -3074,7 +3074,10 @@ int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc)
int nReplyBytes;
req = (xGLXQueryContextInfoEXTReq *)pc;
ctx = (__GLXcontext *) SecurityLookupIDByType(client, req->context, __glXContextRes, DixReadAccess);
dixLookupResourceByType((pointer*) &ctx,
req->context, __glXContextRes,
client, DixReadAccess);
if (!ctx) {
client->errorValue = req->context;
return __glXBadContext;