xf86-video-ati: Branch 'master'

[Eamon Walsh]

 src/radeon_mergedfb.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

New commits:
diff-tree 48ff33a1770f3684cd50184db8f1944a456d9974 (from 120c854f185c1e7711cf0dee19303fdb8894d49d)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Fri Dec 15 17:43:39 2006 -0500

    Convert callers of LookupWindow() to dixLookupWindow().

diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index 820ba4b..51b1720 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -1008,8 +1008,9 @@ RADEONProcXineramaGetState(ClientPtr cli
     register int		n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-    pWin = LookupWindow(stuff->window, client);
-    if(!pWin) return BadWindow;
+    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    if (n != Success)
+	return n;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -1033,8 +1034,9 @@ RADEONProcXineramaGetScreenCount(ClientP
     register int			n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-    pWin = LookupWindow(stuff->window, client);
-    if(!pWin) return BadWindow;
+    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    if (n != Success)
+	return n;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -1058,8 +1060,9 @@ RADEONProcXineramaGetScreenSize(ClientPt
     register int			n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-    pWin = LookupWindow (stuff->window, client);
-    if(!pWin)  return BadWindow;
+    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    if (n != Success)
+	return n;
 
     rep.type = X_Reply;
     rep.length = 0;