diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-12-14 17:27:12 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil> | 2006-12-14 17:45:11 -0500 |
| commit | 0cf75e74322e2b6a6efc7acf892e04365fde503b (patch) | |
| tree | 587f91b8e882da5db9ecd268f66205161db0f1e2 /Xext/shm.c | |
| parent | ab1886df73b73360fa3bd7ce8e01affc074cbc8d (diff) | |
Remove instances of macros LOOKUP_DRAWABLE and VERIFY_DRAWABLE.
Diffstat (limited to 'Xext/shm.c')
| -rw-r--r-- | Xext/shm.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/Xext/shm.c b/Xext/shm.c index 0c2299a61..049c746d6 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -606,7 +606,7 @@ ProcPanoramiXShmGetImage(ClientPtr client) DrawablePtr pDraw; xShmGetImageReply xgi; ShmDescPtr shmdesc; - int i, x, y, w, h, format; + int i, x, y, w, h, format, rc; Mask plane = 0, planemask; long lenPer = 0, length, widthBytesLine; Bool isRoot; @@ -627,7 +627,10 @@ ProcPanoramiXShmGetImage(ClientPtr client) if (draw->type == XRT_PIXMAP) return ProcShmGetImage(client); - VERIFY_DRAWABLE(pDraw, stuff->drawable, client); + rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, + DixUnknownAccess); + if (rc != Success) + return rc; VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); @@ -660,8 +663,12 @@ ProcPanoramiXShmGetImage(ClientPtr client) } drawables[0] = pDraw; - for(i = 1; i < PanoramiXNumScreens; i++) - VERIFY_DRAWABLE(drawables[i], draw->info[i].id, client); + for(i = 1; i < PanoramiXNumScreens; i++) { + rc = dixLookupDrawable(drawables+i, draw->info[i].id, client, 0, + DixUnknownAccess); + if (rc != Success) + return rc; + } xgi.visual = wVisual(((WindowPtr)pDraw)); xgi.type = X_Reply; @@ -909,12 +916,12 @@ static int ProcShmGetImage(client) register ClientPtr client; { - register DrawablePtr pDraw; + DrawablePtr pDraw; long lenPer = 0, length; Mask plane = 0; xShmGetImageReply xgi; ShmDescPtr shmdesc; - int n; + int n, rc; REQUEST(xShmGetImageReq); @@ -924,7 +931,10 @@ ProcShmGetImage(client) client->errorValue = stuff->format; return(BadValue); } - VERIFY_DRAWABLE(pDraw, stuff->drawable, client); + rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, + DixUnknownAccess); + if (rc != Success) + return rc; VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); if (pDraw->type == DRAWABLE_WINDOW) { |