Module Name: xsrc
Committed By: mrg
Date: Sat Aug 22 01:39:01 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/Xext: sync.c
xsrc/external/mit/xorg-server/dist/dix: window.c
Log Message:
merge xorg-server 1.6.3.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/Xext/sync.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/dix/window.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xext/sync.c
diff -u xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.3 xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.4
--- xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.3 Thu Jun 11 02:13:32 2009
+++ xsrc/external/mit/xorg-server/dist/Xext/sync.c Sat Aug 22 01:39:01 2009
@@ -440,7 +440,7 @@
{
if (counter == None)
pCounter = NULL;
- else if (Success != (rc = dixLookupResource((pointer *)&pCounter,
+ else if (Success != (rc = dixLookupResourceByType ((pointer *)&pCounter,
counter, RTCounter, client, DixReadAccess)))
{
client->errorValue = counter;
Index: xsrc/external/mit/xorg-server/dist/dix/window.c
diff -u xsrc/external/mit/xorg-server/dist/dix/window.c:1.4 xsrc/external/mit/xorg-server/dist/dix/window.c:1.5
--- xsrc/external/mit/xorg-server/dist/dix/window.c:1.4 Thu Jun 11 02:13:36 2009
+++ xsrc/external/mit/xorg-server/dist/dix/window.c Sat Aug 22 01:39:01 2009
@@ -1068,7 +1068,7 @@
}
else
{
- rc = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP,
client, DixReadAccess);
if (rc == Success)
{
@@ -1128,7 +1128,7 @@
pixID = pWin->parent->border.pixmap->drawable.id;
}
}
- rc = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP,
client, DixReadAccess);
if (rc == Success)
{
@@ -1290,7 +1290,7 @@
error = BadMatch;
goto PatchUp;
}
- rc = dixLookupResource((pointer *)&pCmap, cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((pointer *)&pCmap, cmap, RT_COLORMAP,
client, DixUseAccess);
if (rc != Success)
{
@@ -1366,7 +1366,7 @@
}
else
{
- rc = dixLookupResource((pointer *)&pCursor, cursorID,
+ rc = dixLookupResourceByType((pointer *)&pCursor, cursorID,
RT_CURSOR, client, DixUseAccess);
if (rc != Success)
{
