Replace LookupIDByType() 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:
parent
ffb93533fd
commit
838b958228
|
@ -524,7 +524,9 @@ static DMXScreenInfo *dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
|
||||||
if (noPanoramiXExtension) return NULL;
|
if (noPanoramiXExtension) return NULL;
|
||||||
if (pDrawable->type != DRAWABLE_PIXMAP) return NULL;
|
if (pDrawable->type != DRAWABLE_PIXMAP) return NULL;
|
||||||
|
|
||||||
if (!(pXinPix = (PanoramiXRes *)LookupIDByType(pDrawable->id, XRT_PIXMAP)))
|
if (Success != dixLookupResourceByType((pointer*) &pXinPix,
|
||||||
|
pDrawable->id, XRT_PIXMAP,
|
||||||
|
NullClient, DixUnknownAccess))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
for (i = 1; i < PanoramiXNumScreens; i++) {
|
for (i = 1; i < PanoramiXNumScreens; i++) {
|
||||||
|
|
|
@ -2897,6 +2897,7 @@ int __glXCreateWindow(__GLXclientState *cl, GLbyte *pc)
|
||||||
VisualPtr pVisual;
|
VisualPtr pVisual;
|
||||||
VisualID visId;
|
VisualID visId;
|
||||||
int i, rc;
|
int i, rc;
|
||||||
|
pointer val;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Check if windowId is valid
|
** Check if windowId is valid
|
||||||
|
@ -2962,7 +2963,9 @@ int __glXCreateWindow(__GLXclientState *cl, GLbyte *pc)
|
||||||
/*
|
/*
|
||||||
** Check if there is already a fbconfig associated with this window
|
** Check if there is already a fbconfig associated with this window
|
||||||
*/
|
*/
|
||||||
if ( LookupIDByType(glxwindowId, __glXWindowRes) ) {
|
if (Success == dixLookupResourceByType(&val,
|
||||||
|
glxwindowId, __glXWindowRes,
|
||||||
|
NullClient, DixUnknownAccess)) {
|
||||||
client->errorValue = glxwindowId;
|
client->errorValue = glxwindowId;
|
||||||
return BadAlloc;
|
return BadAlloc;
|
||||||
}
|
}
|
||||||
|
@ -2994,11 +2997,14 @@ int __glXDestroyWindow(__GLXclientState *cl, GLbyte *pc)
|
||||||
ClientPtr client = cl->client;
|
ClientPtr client = cl->client;
|
||||||
xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
|
xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
|
||||||
XID glxwindow = req->glxwindow;
|
XID glxwindow = req->glxwindow;
|
||||||
|
pointer val;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Check if it's a valid GLX window.
|
** Check if it's a valid GLX window.
|
||||||
*/
|
*/
|
||||||
if (!LookupIDByType(glxwindow, __glXWindowRes)) {
|
if (Success != dixLookupResourceByType(&val,
|
||||||
|
glxwindow, __glXWindowRes,
|
||||||
|
NullClient, DixUnknownAccess)) {
|
||||||
client->errorValue = glxwindow;
|
client->errorValue = glxwindow;
|
||||||
return __glXBadDrawable;
|
return __glXBadDrawable;
|
||||||
}
|
}
|
||||||
|
|
|
@ -186,8 +186,12 @@ void __glXFreeGLXWindow(__glXWindow *pGlxWindow)
|
||||||
{
|
{
|
||||||
if (!pGlxWindow->idExists && !pGlxWindow->refcnt) {
|
if (!pGlxWindow->idExists && !pGlxWindow->refcnt) {
|
||||||
WindowPtr pWindow = (WindowPtr) pGlxWindow->pDraw;
|
WindowPtr pWindow = (WindowPtr) pGlxWindow->pDraw;
|
||||||
|
WindowPtr ret;
|
||||||
|
|
||||||
if (LookupIDByType(pWindow->drawable.id, RT_WINDOW) == pWindow) {
|
dixLookupResourceByType((pointer) &ret,
|
||||||
|
pWindow->drawable.id, RT_WINDOW,
|
||||||
|
NullClient, DixUnknownAccess);
|
||||||
|
if (ret == pWindow) {
|
||||||
(*pGlxWindow->pScreen->DestroyWindow)(pWindow);
|
(*pGlxWindow->pScreen->DestroyWindow)(pWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user