summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2006-12-18 14:05:19 -0500
committerEamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>2006-12-18 14:05:19 -0500
commit188c2b44f0f47093092414f9364a52cc2d5016ad (patch)
treea524fe31c7097bfd7685564b91db830400567524
parent1f298c24fe1dde35f0d77cc34518eb9c2b873fc5 (diff)
Revert "Convert callers of LookupWindow() to dixLookupWindow()."
This reverts commit 1f298c24fe1dde35f0d77cc34518eb9c2b873fc5.
-rw-r--r--src/vmwarexinerama.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/vmwarexinerama.c b/src/vmwarexinerama.c
index 19ea1bc..204bade 100644
--- a/src/vmwarexinerama.c
+++ b/src/vmwarexinerama.c
@@ -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;