diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-12-15 15:50:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil> | 2006-12-15 15:50:46 -0500 |
| commit | 25d5e0a629f82d95bd71daf9a920a70e095b5188 (patch) | |
| tree | dece82b2dbb04f9810f37f8647eb1de1c2a85baa /Xext/shape.c | |
| parent | 04c721854fbf1bd6379c165a53fab2bdc09961c0 (diff) | |
Convert callers of SecurityLookupWindow() to dixLookupWindow().
Diffstat (limited to 'Xext/shape.c')
| -rw-r--r-- | Xext/shape.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Xext/shape.c b/Xext/shape.c index 58e3a69b3..928eeee31 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -419,12 +419,13 @@ ProcShapeMask (client) RegionPtr *destRgn; PixmapPtr pPixmap; CreateDftPtr createDefault; + int rc; REQUEST_SIZE_MATCH (xShapeMaskReq); UpdateCurrentTime(); - pWin = SecurityLookupWindow (stuff->dest, client, DixWriteAccess); - if (!pWin) - return BadWindow; + rc = dixLookupWindow(&pWin, stuff->dest, client, DixWriteAccess); + if (rc != Success) + return rc; switch (stuff->destKind) { case ShapeBounding: createDefault = CreateBoundingShape; @@ -822,11 +823,12 @@ ProcShapeSelectInput (client) WindowPtr pWin; ShapeEventPtr pShapeEvent, pNewShapeEvent, *pHead; XID clientResource; + int rc; REQUEST_SIZE_MATCH (xShapeSelectInputReq); - pWin = SecurityLookupWindow (stuff->window, client, DixWriteAccess); - if (!pWin) - return BadWindow; + rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess); + if (rc != Success) + return rc; pHead = (ShapeEventPtr *)SecurityLookupIDByType(client, pWin->drawable.id, EventType, DixWriteAccess); switch (stuff->enable) { |