This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit d59e8d7f43d8a39155cb4d1884cf65b871fd3de6
Author: Ulrich Sibiller <ul...@gmx.de>
Date: Sun Nov 5 23:59:22 2017 +0100
Lift XFIXES to xorg-xserver-1.4.2 state
---
nx-X11/programs/Xserver/xfixes/cursor.c | 9 +++++++++
nx-X11/programs/Xserver/xfixes/region.c | 19 +++++++++++++++++++
nx-X11/programs/Xserver/xfixes/saveset.c | 6 ++++++
nx-X11/programs/Xserver/xfixes/select.c | 9 +++++++++
nx-X11/programs/Xserver/xfixes/xfixes.c | 6 +++---
nx-X11/programs/Xserver/xfixes/xfixesint.h | 3 ---
6 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c
b/nx-X11/programs/Xserver/xfixes/cursor.c
index d372b47..12efbd7 100644
--- a/nx-X11/programs/Xserver/xfixes/cursor.c
+++ b/nx-X11/programs/Xserver/xfixes/cursor.c
@@ -238,12 +238,21 @@ ProcXFixesSelectCursorInput (ClientPtr client)
{
REQUEST (xXFixesSelectCursorInputReq);
WindowPtr pWin;
+#ifndef NXAGENT_SERVER
+ int rc;
+#endif
REQUEST_SIZE_MATCH (xXFixesSelectCursorInputReq);
+#ifndef NXAGENT_SERVER
+ rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+ if (rc != Success)
+ return rc;
+#else
pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client,
DixReadAccess);
if (!pWin)
return(BadWindow);
+#endif
if (stuff->eventMask & ~CursorAllEvents)
{
client->errorValue = stuff->eventMask;
diff --git a/nx-X11/programs/Xserver/xfixes/region.c
b/nx-X11/programs/Xserver/xfixes/region.c
index 4abe908..9ac1fae 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)
diff --git a/nx-X11/programs/Xserver/xfixes/saveset.c
b/nx-X11/programs/Xserver/xfixes/saveset.c
index a992ab3..57d9afc 100644
--- a/nx-X11/programs/Xserver/xfixes/saveset.c
+++ b/nx-X11/programs/Xserver/xfixes/saveset.c
@@ -37,10 +37,16 @@ ProcXFixesChangeSaveSet(ClientPtr client)
REQUEST(xXFixesChangeSaveSetReq);
REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq);
+#ifndef NXAGENT_SERVER
+ result = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+ if (result != Success)
+ return result;
+#else
pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client,
DixReadAccess);
if (!pWin)
return(BadWindow);
+#endif
if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id)))
return BadMatch;
if ((stuff->mode != SetModeInsert) && (stuff->mode != SetModeDelete))
diff --git a/nx-X11/programs/Xserver/xfixes/select.c
b/nx-X11/programs/Xserver/xfixes/select.c
index 98c7102..f05c72c 100644
--- a/nx-X11/programs/Xserver/xfixes/select.c
+++ b/nx-X11/programs/Xserver/xfixes/select.c
@@ -195,12 +195,21 @@ ProcXFixesSelectSelectionInput (ClientPtr client)
{
REQUEST (xXFixesSelectSelectionInputReq);
WindowPtr pWin;
+#ifndef NXAGENT_SERVER
+ int rc;
+#endif
REQUEST_SIZE_MATCH (xXFixesSelectSelectionInputReq);
+#ifndef NXAGENT_SERVER
+ rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+ if (rc != Success)
+ return rc;
+#else
pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client,
DixReadAccess);
if (!pWin)
return(BadWindow);
+#endif
if (stuff->eventMask & ~SelectionAllEvents)
{
client->errorValue = stuff->eventMask;
diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.c
b/nx-X11/programs/Xserver/xfixes/xfixes.c
index c4977b6..7447c58 100644
--- a/nx-X11/programs/Xserver/xfixes/xfixes.c
+++ b/nx-X11/programs/Xserver/xfixes/xfixes.c
@@ -49,10 +49,10 @@
#include "xfixesint.h"
#include "protocol-versions.h"
-unsigned char XFixesReqCode;
+static unsigned char XFixesReqCode;
int XFixesEventBase;
int XFixesErrorBase;
-int XFixesClientPrivateIndex;
+static int XFixesClientPrivateIndex;
static int
ProcXFixesQueryVersion(ClientPtr client)
@@ -162,7 +162,7 @@ SProcXFixesQueryVersion(ClientPtr client)
return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
}
-int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {
+static int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {
/*************** Version 1 ******************/
SProcXFixesQueryVersion,
SProcXFixesChangeSaveSet,
diff --git a/nx-X11/programs/Xserver/xfixes/xfixesint.h
b/nx-X11/programs/Xserver/xfixes/xfixesint.h
index 2e1ac14..17f0dbe 100644
--- a/nx-X11/programs/Xserver/xfixes/xfixesint.h
+++ b/nx-X11/programs/Xserver/xfixes/xfixesint.h
@@ -60,9 +60,7 @@
#include "selection.h"
#include "xfixes.h"
-extern unsigned char XFixesReqCode;
extern int XFixesEventBase;
-extern int XFixesClientPrivateIndex;
typedef struct _XFixesClient {
CARD32 major_version;
@@ -72,7 +70,6 @@ typedef struct _XFixesClient {
#define GetXFixesClient(pClient) ((XFixesClientPtr)
(pClient)->devPrivates[XFixesClientPrivateIndex].ptr)
extern int (*ProcXFixesVector[XFixesNumberRequests])(ClientPtr);
-extern int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr);
/* Initialize extension at server startup time */
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/nx-libs.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
