From 81f3b4070b70483d6da4f7587e52a64ac69c8ca0 Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Mon, 18 Dec 2006 14:06:15 -0500 Subject: Revert "Convert callers of LookupWindow() to dixLookupWindow()." This reverts commit 48ff33a1770f3684cd50184db8f1944a456d9974. --- src/radeon_mergedfb.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/radeon_mergedfb.c') diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c index 51b1720..820ba4b 100644 --- a/src/radeon_mergedfb.c +++ b/src/radeon_mergedfb.c @@ -1008,9 +1008,8 @@ RADEONProcXineramaGetState(ClientPtr client) register int n; REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); - n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess); - if (n != Success) - return n; + pWin = LookupWindow(stuff->window, client); + if(!pWin) return BadWindow; rep.type = X_Reply; rep.length = 0; @@ -1034,9 +1033,8 @@ RADEONProcXineramaGetScreenCount(ClientPtr client) register int n; REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); - n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess); - if (n != Success) - return n; + pWin = LookupWindow(stuff->window, client); + if(!pWin) return BadWindow; rep.type = X_Reply; rep.length = 0; @@ -1060,9 +1058,8 @@ RADEONProcXineramaGetScreenSize(ClientPtr client) register int n; REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); - n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess); - if (n != Success) - return n; + pWin = LookupWindow (stuff->window, client); + if(!pWin) return BadWindow; rep.type = X_Reply; rep.length = 0; -- cgit v1.2.3