Revert "Convert callers of LookupWindow() to dixLookupWindow()."
authorEamon Walsh <ewalsh@tycho.nsa.gov>
Mon, 18 Dec 2006 19:05:19 +0000 (14:05 -0500)
committerEamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Mon, 18 Dec 2006 19:05:19 +0000 (14:05 -0500)
This reverts commit 1f298c24fe1dde35f0d77cc34518eb9c2b873fc5.

src/vmwarexinerama.c

index 19ea1bc..204bade 100644 (file)
@@ -115,9 +115,8 @@ VMwareXineramaGetState(ClientPtr client)
     VMWAREPtr pVMWARE;
 
     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;
 
     if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
        return BadMatch;
@@ -168,9 +167,8 @@ VMwareXineramaGetScreenCount(ClientPtr client)
     VMWAREPtr pVMWARE;
 
     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;
 
     if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
        return BadMatch;
@@ -221,9 +219,8 @@ VMwareXineramaGetScreenSize(ClientPtr client)
     VMWAREPtr pVMWARE;
 
     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;
 
     if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
        return BadMatch;