diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-11-05 22:16:25 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:36:31 +0100 |
| commit | 49607e93f53c7d15c8d18b36763e855ecb42a496 (patch) | |
| tree | d5ba7a097214845b8e4c82b6c56ed4c854f3a49a /nx-X11/programs/Xserver/Xext/panoramiXprocs.c | |
| parent | fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b (diff) | |
| download | nx-libs-49607e93f53c7d15c8d18b36763e855ecb42a496.tar.gz nx-libs-49607e93f53c7d15c8d18b36763e855ecb42a496.tar.bz2 nx-libs-49607e93f53c7d15c8d18b36763e855ecb42a496.zip | |
Lift Xext to xorg 1.4.2
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/panoramiXprocs.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/panoramiXprocs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c index 053213573..ce12bd9fd 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c +++ b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c @@ -572,7 +572,7 @@ int PanoramiXTranslateCoords(ClientPtr client) INT16 x, y; REQUEST(xTranslateCoordsReq); - register WindowPtr pWin, pDst; + WindowPtr pWin, pDst; xTranslateCoordsReply rep; REQUEST_SIZE_MATCH(xTranslateCoordsReq); @@ -1080,8 +1080,8 @@ int PanoramiXCopyArea(ClientPtr client) VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, pGC, client); if (stuff->dstDrawable != stuff->srcDrawable) { SECURITY_VERIFY_DRAWABLE(pSrc, stuff->srcDrawable, client, - DixReadAccess); - if ((pDst->pScreen != pSrc->pScreen) || + DixReadAccess); + if ((pDst->pScreen != pSrc->pScreen) || (pDst->depth != pSrc->depth)) { client->errorValue = stuff->dstDrawable; return (BadMatch); @@ -1186,7 +1186,7 @@ int PanoramiXCopyPlane(ClientPtr client) VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, pGC, client); if (stuff->dstDrawable != stuff->srcDrawable) { SECURITY_VERIFY_DRAWABLE(psrcDraw, stuff->srcDrawable, client, - DixReadAccess); + DixReadAccess); if (pdstDraw->pScreen != psrcDraw->pScreen) { client->errorValue = stuff->dstDrawable; return (BadMatch); |