From 5706005f72d79716fadaabdb6d560bfeb30ff6df Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Feb 2018 02:44:10 +0100 Subject: Lift XFIXES to xorg-xserver-7.1/1.1.0 state (XFIXES 4.0) - non-functional changes only --- nx-X11/programs/Xserver/xfixes/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/xfixes/region.c') diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 18b1d3ff4..4abe9083d 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -1,5 +1,5 @@ /* - * $Id: region.c,v 1.7 2005/07/03 07:37:35 daniels Exp $ + * $Id$ * * Copyright © 2003 Keith Packard * -- cgit v1.2.3 From d59e8d7f43d8a39155cb4d1884cf65b871fd3de6 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 23:59:22 +0100 Subject: Lift XFIXES to xorg-xserver-1.4.2 state --- nx-X11/programs/Xserver/xfixes/region.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'nx-X11/programs/Xserver/xfixes/region.c') diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 4abe9083d..9ac1fae3f 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -217,12 +217,21 @@ ProcXFixesCreateRegionFromGC (ClientPtr client) { RegionPtr pRegion, pClip; GCPtr pGC; +#ifndef NXAGENT_SERVER + int rc; +#endif REQUEST (xXFixesCreateRegionFromGCReq); REQUEST_SIZE_MATCH (xXFixesCreateRegionFromGCReq); LEGAL_NEW_RESOURCE (stuff->region, client); +#ifndef NXAGENT_SERVER + rc = dixLookupGC(&pGC, stuff->gc, client, DixReadAccess); + if (rc != Success) + return rc; +#else SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixReadAccess); +#endif switch (pGC->clientClipType) { case CT_PIXMAP: @@ -615,10 +624,20 @@ ProcXFixesSetGCClipRegion (ClientPtr client) GCPtr pGC; RegionPtr pRegion; XID vals[2]; +#ifndef NXAGENT_SERVER + int rc; +#endif REQUEST(xXFixesSetGCClipRegionReq); REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq); + +#ifndef NXAGENT_SERVER + rc = dixLookupGC(&pGC, stuff->gc, client, DixWriteAccess); + if (rc != Success) + return rc; +#else SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixWriteAccess); +#endif VERIFY_REGION_OR_NONE (pRegion, stuff->region, client, DixReadAccess); if (pRegion) -- cgit v1.2.3 From 35d166b808939a1518c011d0469125b69dc768d7 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Feb 2018 02:56:58 +0100 Subject: Lift XFIXES to xorg-xserver-1.4.2 state - non-functional changes only --- nx-X11/programs/Xserver/xfixes/region.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'nx-X11/programs/Xserver/xfixes/region.c') diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 9ac1fae3f..ba8c62835 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its -- cgit v1.2.3