Xext/security.c

@@ -24,9 +24,19 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
+
+#include <X11/Xmd.h>
+#include <X11/extensions/securproto.h>
+#include <X11/Xfuncproto.h>
+
+#include "dix/dix_priv.h"
+#include "dix/registry_priv.h"
+#include "include/extinit_priv.h"
+#include "os/audit.h"
+#include "os/auth.h"
+#include "os/client_priv.h"
+#include "os/osdep.h"
 
 #include "scrnintstr.h"
 #include "inputstr.h"
@@ -34,13 +44,13 @@ in this Software without prior written authorization from The Open Group.
 #include "propertyst.h"
 #include "colormapst.h"
 #include "privates.h"
-#include "registry.h"
 #include "xacestr.h"
 #include "securitysrv.h"
-#include <X11/extensions/securproto.h>
 #include "extinit.h"
 #include "protocol-versions.h"
 
+Bool noSecurityExtension = FALSE;
+
 /* Extension stuff */
 static int SecurityErrorBase;   /* first Security error number */
 static int SecurityEventBase;   /* first Security event number */
@@ -147,7 +157,7 @@ SecurityLabelInitial(void)
 /*
  * Looks up a request name
  */
-static _X_INLINE const char *
+static inline const char *
 SecurityLookupRequestName(ClientPtr client)
 {
     return LookupRequestName(client->majorOp, client->minorOp);
@@ -198,7 +208,7 @@ SecurityDeleteAuthorization(void *value, XID id)
             .authId = pAuth->id
         };
         WriteEventsToClient(rClient(pEventClient), 1, (xEvent *) &are);
-        FreeResource(pEventClient->resource, RT_NONE);
+        FreeResource(pEventClient->resource, X11_RESTYPE_NONE);
     }
 
     /* kill all clients using this auth */
@@ -304,7 +314,7 @@ SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, void *pval)
                                                    pAuth->secondsRemaining);
     }
     else {
-        FreeResource(pAuth->id, RT_NONE);
+        FreeResource(pAuth->id, X11_RESTYPE_NONE);
         return 0;
     }
 }                               /* SecurityAuthorizationExpired */
@@ -368,7 +378,7 @@ SecurityEventSelectForAuthorization(SecurityAuthorizationPtr pAuth,
          pEventClient; pEventClient = pEventClient->next) {
         if (SameClient(pEventClient, client)) {
             if (mask == 0)
-                FreeResource(pEventClient->resource, RT_NONE);
+                FreeResource(pEventClient->resource, X11_RESTYPE_NONE);
             else
                 pEventClient->mask = mask;
             return Success;
@@ -580,7 +590,7 @@ ProcSecurityRevokeAuthorization(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    FreeResource(stuff->authId, RT_NONE);
+    FreeResource(stuff->authId, X11_RESTYPE_NONE);
     return Success;
 }                               /* ProcSecurityRevokeAuthorization */
 
@@ -605,8 +615,6 @@ static int _X_COLD
 SProcSecurityQueryVersion(ClientPtr client)
 {
     REQUEST(xSecurityQueryVersionReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSecurityQueryVersionReq);
     swaps(&stuff->majorVersion);
     swaps(&stuff->minorVersion);
@@ -620,8 +628,6 @@ SProcSecurityGenerateAuthorization(ClientPtr client)
     CARD32 *values;
     unsigned long nvalues;
     int values_offset;
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xSecurityGenerateAuthorizationReq);
     swaps(&stuff->nbytesAuthProto);
     swaps(&stuff->nbytesAuthData);
@@ -629,10 +635,10 @@ SProcSecurityGenerateAuthorization(ClientPtr client)
     values_offset = bytes_to_int32(stuff->nbytesAuthProto) +
         bytes_to_int32(stuff->nbytesAuthData);
     if (values_offset >
-        stuff->length - bytes_to_int32(sz_xSecurityGenerateAuthorizationReq))
+        client->req_len - bytes_to_int32(sz_xSecurityGenerateAuthorizationReq))
         return BadLength;
     values = (CARD32 *) (&stuff[1]) + values_offset;
-    nvalues = (((CARD32 *) stuff) + stuff->length) - values;
+    nvalues = (((CARD32 *) stuff) + client->req_len) - values;
     SwapLongs(values, nvalues);
     return ProcSecurityGenerateAuthorization(client);
 }                               /* SProcSecurityGenerateAuthorization */
@@ -641,8 +647,6 @@ static int _X_COLD
 SProcSecurityRevokeAuthorization(ClientPtr client)
 {
     REQUEST(xSecurityRevokeAuthorizationReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq);
     swapl(&stuff->authId);
     return ProcSecurityRevokeAuthorization(client);
@@ -747,12 +751,12 @@ SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
 
     /* disable background None for untrusted windows */
-    if ((requested & DixCreateAccess) && (rec->rtype == RT_WINDOW))
+    if ((requested & DixCreateAccess) && (rec->rtype == X11_RESTYPE_WINDOW))
         if (subj->haveState && subj->trustLevel != XSecurityClientTrusted)
             ((WindowPtr) rec->res)->forcedBG = TRUE;
 
     /* additional permissions for specific resource types */
-    if (rec->rtype == RT_WINDOW)
+    if (rec->rtype == X11_RESTYPE_WINDOW)
         allowed |= SecurityWindowExtraMask;
 
     /* special checks for server-owned resources */
@@ -761,7 +765,7 @@ SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
             /* additional operations allowed on root windows */
             allowed |= SecurityRootWindowExtraMask;
 
-        else if (rec->rtype == RT_COLORMAP)
+        else if (rec->rtype == X11_RESTYPE_COLORMAP)
             /* allow access to default colormaps */
             allowed = requested;
 

Xext/securitysrv.h

@@ -30,27 +30,8 @@ from The Open Group.
 #ifndef _SECURITY_SRV_H
 #define _SECURITY_SRV_H
 
-/* Allow client side portions of <X11/extensions/security.h> to compile */
-#ifndef Status
-#define Status int
-#define NEED_UNDEF_Status
-#endif
-#ifndef Display
-#define Display void
-#define NEED_UNDEF_Display
-#endif
-
 #include <X11/extensions/secur.h>
 
-#ifdef NEED_UNDEF_Status
-#undef Status
-#undef NEED_UNDEF_Status
-#endif
-#ifdef NEED_UNDEF_Display
-#undef Display
-#undef NEED_UNDEF_Display
-#endif
-
 #include "input.h"              /* for DeviceIntPtr */
 #include "property.h"           /* for PropertyPtr */
 #include "pixmap.h"             /* for DrawablePtr */

Xext/shape.c

@@ -24,14 +24,16 @@ in this Software without prior written authorization from The Open Group.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdlib.h>
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/shapeproto.h>
+
+#include "dix/dix_priv.h"
+#include "dix/gc_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -41,12 +43,13 @@ in this Software without prior written authorization from The Open Group.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/shapeproto.h>
 #include "regionstr.h"
 #include "gcstruct.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
 
+Bool noShapeExtension = FALSE;
+
 typedef RegionPtr (*CreateDftPtr) (WindowPtr    /* pWin */
     );
 
@@ -64,10 +67,10 @@ static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ ,
  * externally by the Xfixes extension and are now defined in window.h
  */
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 
 static int ShapeEventBase = 0;
 static RESTYPE ClientType, ShapeEventType;      /* resource types for event masks */
@@ -224,24 +227,16 @@ ProcShapeQueryVersion(ClientPtr client)
     return Success;
 }
 
-/*****************
- * ProcShapeRectangles
- *
- *****************/
-
 static int
-ProcShapeRectangles(ClientPtr client)
+ShapeRectangles(ClientPtr client, xShapeRectanglesReq *stuff)
 {
     WindowPtr pWin;
-
-    REQUEST(xShapeRectanglesReq);
     xRectangle *prects;
     int nrects, ctype, rc;
     RegionPtr srcRgn;
     RegionPtr *destRgn;
     CreateDftPtr createDefault;
 
-    REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq);
     UpdateCurrentTime();
     rc = dixLookupWindow(&pWin, stuff->dest, client, DixSetAttrAccess);
     if (rc != Success)
@@ -265,7 +260,7 @@ ProcShapeRectangles(ClientPtr client)
         client->errorValue = stuff->ordering;
         return BadValue;
     }
-    nrects = ((stuff->length << 2) - sizeof(xShapeRectanglesReq));
+    nrects = ((client->req_len << 2) - sizeof(xShapeRectanglesReq));
     if (nrects & 4)
         return BadLength;
     nrects >>= 3;
@@ -296,16 +291,19 @@ ProcShapeRectangles(ClientPtr client)
                          stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef PANORAMIX
 static int
-ProcPanoramiXShapeRectangles(ClientPtr client)
+ProcShapeRectangles(ClientPtr client)
 {
     REQUEST(xShapeRectanglesReq);
+    REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq);
+
+#ifdef XINERAMA
+    if (noPanoramiXExtension)
+        return ShapeRectangles(client, stuff);
+
     PanoramiXRes *win;
     int j, result;
 
-    REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq);
-
     result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
                                      client, DixWriteAccess);
     if (result != Success)
@@ -313,32 +311,27 @@ ProcPanoramiXShapeRectangles(ClientPtr client)
 
     FOR_NSCREENS(j) {
         stuff->dest = win->info[j].id;
-        result = ProcShapeRectangles(client);
+        result = ShapeRectangles(client, stuff);
         if (result != Success)
             break;
     }
     return result;
-}
+#else
+    return ShapeRectangles(client);
 #endif
-
-/**************
- * ProcShapeMask
- **************/
+}
 
 static int
-ProcShapeMask(ClientPtr client)
+ShapeMask(ClientPtr client, xShapeMaskReq *stuff)
 {
     WindowPtr pWin;
     ScreenPtr pScreen;
-
-    REQUEST(xShapeMaskReq);
     RegionPtr srcRgn;
     RegionPtr *destRgn;
     PixmapPtr pPixmap;
     CreateDftPtr createDefault;
     int rc;
 
-    REQUEST_SIZE_MATCH(xShapeMaskReq);
     UpdateCurrentTime();
     rc = dixLookupWindow(&pWin, stuff->dest, client, DixSetAttrAccess);
     if (rc != Success)
@@ -362,7 +355,7 @@ ProcShapeMask(ClientPtr client)
         srcRgn = 0;
     else {
         rc = dixLookupResourceByType((void **) &pPixmap, stuff->src,
-                                     RT_PIXMAP, client, DixReadAccess);
+                                     X11_RESTYPE_PIXMAP, client, DixReadAccess);
         if (rc != Success)
             return rc;
         if (pPixmap->drawable.pScreen != pScreen ||
@@ -394,16 +387,19 @@ ProcShapeMask(ClientPtr client)
                          stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef PANORAMIX
 static int
-ProcPanoramiXShapeMask(ClientPtr client)
+ProcShapeMask(ClientPtr client)
 {
     REQUEST(xShapeMaskReq);
+    REQUEST_SIZE_MATCH(xShapeMaskReq);
+
+#ifdef XINERAMA
+    if (noPanoramiXExtension)
+        return ShapeMask(client, stuff);
+
     PanoramiXRes *win, *pmap;
     int j, result;
 
-    REQUEST_SIZE_MATCH(xShapeMaskReq);
-
     result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
                                      client, DixWriteAccess);
     if (result != Success)
@@ -422,24 +418,20 @@ ProcPanoramiXShapeMask(ClientPtr client)
         stuff->dest = win->info[j].id;
         if (pmap)
             stuff->src = pmap->info[j].id;
-        result = ProcShapeMask(client);
+        result = ShapeMask(client, stuff);
         if (result != Success)
             break;
     }
     return result;
-}
+#else
+    return ShapeMask(client, stuff);
 #endif
-
-/************
- * ProcShapeCombine
- ************/
+}
 
 static int
-ProcShapeCombine(ClientPtr client)
+ShapeCombine(ClientPtr client, xShapeCombineReq *stuff)
 {
     WindowPtr pSrcWin, pDestWin;
-
-    REQUEST(xShapeCombineReq);
     RegionPtr srcRgn;
     RegionPtr *destRgn;
     CreateDftPtr createDefault;
@@ -447,7 +439,6 @@ ProcShapeCombine(ClientPtr client)
     RegionPtr tmp;
     int rc;
 
-    REQUEST_SIZE_MATCH(xShapeCombineReq);
     UpdateCurrentTime();
     rc = dixLookupWindow(&pDestWin, stuff->dest, client, DixSetAttrAccess);
     if (rc != Success)
@@ -522,16 +513,19 @@ ProcShapeCombine(ClientPtr client)
                          stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef PANORAMIX
 static int
-ProcPanoramiXShapeCombine(ClientPtr client)
+ProcShapeCombine(ClientPtr client)
 {
     REQUEST(xShapeCombineReq);
+    REQUEST_AT_LEAST_SIZE(xShapeCombineReq);
+
+#ifdef XINERAMA
+    if (noPanoramiXExtension)
+        return ShapeCombine(client, stuff);
+
     PanoramiXRes *win, *win2;
     int j, result;
 
-    REQUEST_AT_LEAST_SIZE(xShapeCombineReq);
-
     result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
                                      client, DixWriteAccess);
     if (result != Success)
@@ -545,28 +539,23 @@ ProcPanoramiXShapeCombine(ClientPtr client)
     FOR_NSCREENS(j) {
         stuff->dest = win->info[j].id;
         stuff->src = win2->info[j].id;
-        result = ProcShapeCombine(client);
+        result = ShapeCombine(client, stuff);
         if (result != Success)
             break;
     }
     return result;
-}
+#else
+    return ShapeCombine(client, stuff);
 #endif
-
-/*************
- * ProcShapeOffset
- *************/
+}
 
 static int
-ProcShapeOffset(ClientPtr client)
+ShapeOffset(ClientPtr client, xShapeOffsetReq *stuff)
 {
     WindowPtr pWin;
-
-    REQUEST(xShapeOffsetReq);
     RegionPtr srcRgn;
     int rc;
 
-    REQUEST_SIZE_MATCH(xShapeOffsetReq);
     UpdateCurrentTime();
     rc = dixLookupWindow(&pWin, stuff->dest, client, DixSetAttrAccess);
     if (rc != Success)
@@ -593,15 +582,18 @@ ProcShapeOffset(ClientPtr client)
     return Success;
 }
 
-#ifdef PANORAMIX
 static int
-ProcPanoramiXShapeOffset(ClientPtr client)
+ProcShapeOffset(ClientPtr client)
 {
     REQUEST(xShapeOffsetReq);
+    REQUEST_AT_LEAST_SIZE(xShapeOffsetReq);
+
+#ifdef XINERAMA
     PanoramiXRes *win;
     int j, result;
 
-    REQUEST_AT_LEAST_SIZE(xShapeOffsetReq);
+    if (noPanoramiXExtension)
+        return ShapeOffset(client, stuff);
 
     result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
                                      client, DixWriteAccess);
@@ -610,13 +602,15 @@ ProcPanoramiXShapeOffset(ClientPtr client)
 
     FOR_NSCREENS(j) {
         stuff->dest = win->info[j].id;
-        result = ProcShapeOffset(client);
+        result = ShapeOffset(client, stuff);
         if (result != Success)
             break;
     }
     return result;
-}
+#else
+    return ShapeOffset(client, stuff);
 #endif
+}
 
 static int
 ProcShapeQueryExtents(ClientPtr client)
@@ -783,7 +777,7 @@ ProcShapeSelectInput(ClientPtr client)
             if (!pHead ||
                 !AddResource(pWin->drawable.id, ShapeEventType,
                              (void *) pHead)) {
-                FreeResource(clientResource, RT_NONE);
+                FreeResource(clientResource, X11_RESTYPE_NONE);
                 return BadAlloc;
             }
             *pHead = 0;
@@ -1034,33 +1028,13 @@ ProcShapeDispatch(ClientPtr client)
     case X_ShapeQueryVersion:
         return ProcShapeQueryVersion(client);
     case X_ShapeRectangles:
-#ifdef PANORAMIX
-        if (!noPanoramiXExtension)
-            return ProcPanoramiXShapeRectangles(client);
-        else
-#endif
-            return ProcShapeRectangles(client);
+        return ProcShapeRectangles(client);
     case X_ShapeMask:
-#ifdef PANORAMIX
-        if (!noPanoramiXExtension)
-            return ProcPanoramiXShapeMask(client);
-        else
-#endif
-            return ProcShapeMask(client);
+        return ProcShapeMask(client);
     case X_ShapeCombine:
-#ifdef PANORAMIX
-        if (!noPanoramiXExtension)
-            return ProcPanoramiXShapeCombine(client);
-        else
-#endif
-            return ProcShapeCombine(client);
+        return ProcShapeCombine(client);
     case X_ShapeOffset:
-#ifdef PANORAMIX
-        if (!noPanoramiXExtension)
-            return ProcPanoramiXShapeOffset(client);
-        else
-#endif
-            return ProcShapeOffset(client);
+        return ProcShapeOffset(client);
     case X_ShapeQueryExtents:
         return ProcShapeQueryExtents(client);
     case X_ShapeSelectInput:
@@ -1089,21 +1063,10 @@ SShapeNotifyEvent(xShapeNotifyEvent * from, xShapeNotifyEvent * to)
     to->shaped = from->shaped;
 }
 
-static int _X_COLD
-SProcShapeQueryVersion(ClientPtr client)
-{
-    REQUEST(xShapeQueryVersionReq);
-
-    swaps(&stuff->length);
-    return ProcShapeQueryVersion(client);
-}
-
 static int _X_COLD
 SProcShapeRectangles(ClientPtr client)
 {
     REQUEST(xShapeRectanglesReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq);
     swapl(&stuff->dest);
     swaps(&stuff->xOff);
@@ -1116,8 +1079,6 @@ static int _X_COLD
 SProcShapeMask(ClientPtr client)
 {
     REQUEST(xShapeMaskReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShapeMaskReq);
     swapl(&stuff->dest);
     swaps(&stuff->xOff);
@@ -1130,8 +1091,6 @@ static int _X_COLD
 SProcShapeCombine(ClientPtr client)
 {
     REQUEST(xShapeCombineReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShapeCombineReq);
     swapl(&stuff->dest);
     swaps(&stuff->xOff);
@@ -1144,8 +1103,6 @@ static int _X_COLD
 SProcShapeOffset(ClientPtr client)
 {
     REQUEST(xShapeOffsetReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShapeOffsetReq);
     swapl(&stuff->dest);
     swaps(&stuff->xOff);
@@ -1157,8 +1114,6 @@ static int _X_COLD
 SProcShapeQueryExtents(ClientPtr client)
 {
     REQUEST(xShapeQueryExtentsReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShapeQueryExtentsReq);
     swapl(&stuff->window);
     return ProcShapeQueryExtents(client);
@@ -1168,8 +1123,6 @@ static int _X_COLD
 SProcShapeSelectInput(ClientPtr client)
 {
     REQUEST(xShapeSelectInputReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShapeSelectInputReq);
     swapl(&stuff->window);
     return ProcShapeSelectInput(client);
@@ -1179,8 +1132,6 @@ static int _X_COLD
 SProcShapeInputSelected(ClientPtr client)
 {
     REQUEST(xShapeInputSelectedReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShapeInputSelectedReq);
     swapl(&stuff->window);
     return ProcShapeInputSelected(client);
@@ -1190,7 +1141,6 @@ static int _X_COLD
 SProcShapeGetRectangles(ClientPtr client)
 {
     REQUEST(xShapeGetRectanglesReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShapeGetRectanglesReq);
     swapl(&stuff->window);
     return ProcShapeGetRectangles(client);
@@ -1202,7 +1152,7 @@ SProcShapeDispatch(ClientPtr client)
     REQUEST(xReq);
     switch (stuff->data) {
     case X_ShapeQueryVersion:
-        return SProcShapeQueryVersion(client);
+        return ProcShapeQueryVersion(client);
     case X_ShapeRectangles:
         return SProcShapeRectangles(client);
     case X_ShapeMask:

Xext/shm.c

@@ -28,24 +28,29 @@ in this Software without prior written authorization from The Open Group.
 
 #define SHM
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#ifdef HAVE_MEMFD_CREATE
 #include <sys/mman.h>
-#endif
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/shmproto.h>
+#include <X11/Xfuncproto.h>
+
+#include "dix/dix_priv.h"
+#include "os/auth.h"
+#include "os/busfault.h"
+#include "os/client_priv.h"
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "os.h"
-#include "dixstruct.h"
+#include "dixstruct_priv.h"
 #include "resource.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -55,11 +60,8 @@ in this Software without prior written authorization from The Open Group.
 #include "servermd.h"
 #include "shmint.h"
 #include "xace.h"
-#include <X11/extensions/shmproto.h>
-#include <X11/Xfuncproto.h>
-#include <sys/mman.h>
+#include "extinit_priv.h"
 #include "protocol-versions.h"
-#include "busfault.h"
 
 /* Needed for Solaris cross-zone shared memory extension */
 #ifdef HAVE_SHMCTL64
@@ -88,12 +90,10 @@ in this Software without prior written authorization from The Open Group.
 #define SHMPERM_MODE(p)		p->mode
 #endif
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
-
-#include "extinit.h"
+#endif /* XINERAMA */
 
 typedef struct _ShmScrPrivateRec {
     CloseScreenProcPtr CloseScreen;
@@ -101,6 +101,8 @@ typedef struct _ShmScrPrivateRec {
     DestroyPixmapProcPtr destroyPixmap;
 } ShmScrPrivateRec;
 
+Bool noMITShmExtension = FALSE;
+
 static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
 static int ShmDetachSegment(void *value, XID shmseg);
 static void ShmResetProc(ExtensionEntry *extEntry);
@@ -251,13 +253,14 @@ ShmDestroyPixmap(PixmapPtr pPixmap)
     ScreenPtr pScreen = pPixmap->drawable.pScreen;
     ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
     void *shmdesc = NULL;
-    Bool ret;
+    Bool ret = TRUE;
 
     if (pPixmap->refcnt == 1)
         shmdesc = dixLookupPrivate(&pPixmap->devPrivates, shmPixmapPrivateKey);
 
     pScreen->DestroyPixmap = screen_priv->destroyPixmap;
-    ret = (*pScreen->DestroyPixmap) (pPixmap);
+    if (pScreen->DestroyPixmap)
+        ret = pScreen->DestroyPixmap(pPixmap);
     screen_priv->destroyPixmap = pScreen->DestroyPixmap;
     pScreen->DestroyPixmap = ShmDestroyPixmap;
 
@@ -459,7 +462,7 @@ ProcShmDetach(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xShmDetachReq);
     VERIFY_SHMSEG(stuff->shmseg, shmdesc, client);
-    FreeResource(stuff->shmseg, RT_NONE);
+    FreeResource(stuff->shmseg, X11_RESTYPE_NONE);
     return Success;
 }
 
@@ -481,8 +484,8 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
                                          PixmapBytePad(w, depth), data);
         if (!pPixmap)
             return;
-        pGC->ops->CopyArea((DrawablePtr) pPixmap, dst, pGC, sx, sy, sw, sh, dx,
-                           dy);
+        (void) pGC->ops->CopyArea((DrawablePtr) pPixmap, dst, pGC,
+                                  sx, sy, sw, sh, dx, dy);
         FreeScratchPixmapHeader(pPixmap);
     }
     else {
@@ -509,7 +512,7 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
         else
             (void) (*pGC->ops->CopyArea) (&pPixmap->drawable, dst, pGC, 0, 0,
                                           sw, sh, dx, dy);
-        (*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap);
+        dixDestroyPixmap(pPixmap, 0);
     }
 }
 
@@ -731,7 +734,7 @@ ProcShmGetImage(ClientPtr client)
     return Success;
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 static int
 ProcPanoramiXShmPutImage(ClientPtr client)
 {
@@ -996,17 +999,17 @@ ProcPanoramiXShmCreatePixmap(ClientPtr client)
                                                        stuff->offset);
 
         if (pMap) {
-            result = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid,
-                              RT_PIXMAP, pMap, RT_NONE, NULL, DixCreateAccess);
+            result = XaceHookResourceAccess(client, stuff->pid,
+                              X11_RESTYPE_PIXMAP, pMap, X11_RESTYPE_NONE, NULL, DixCreateAccess);
             if (result != Success) {
-                pDraw->pScreen->DestroyPixmap(pMap);
+                dixDestroyPixmap(pMap, 0);
                 break;
             }
             dixSetPrivate(&pMap->devPrivates, shmPixmapPrivateKey, shmdesc);
             shmdesc->refcnt++;
             pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
             pMap->drawable.id = newPix->info[j].id;
-            if (!AddResource(newPix->info[j].id, RT_PIXMAP, (void *) pMap)) {
+            if (!AddResource(newPix->info[j].id, X11_RESTYPE_PIXMAP, (void *) pMap)) {
                 result = BadAlloc;
                 break;
             }
@@ -1019,7 +1022,7 @@ ProcPanoramiXShmCreatePixmap(ClientPtr client)
 
     if (result != Success) {
         while (j--)
-            FreeResource(newPix->info[j].id, RT_NONE);
+            FreeResource(newPix->info[j].id, X11_RESTYPE_NONE);
         free(newPix);
     }
     else
@@ -1027,7 +1030,7 @@ ProcPanoramiXShmCreatePixmap(ClientPtr client)
 
     return result;
 }
-#endif
+#endif /* XINERAMA */
 
 static PixmapPtr
 fbShmCreatePixmap(ScreenPtr pScreen,
@@ -1043,7 +1046,7 @@ fbShmCreatePixmap(ScreenPtr pScreen,
                                          BitsPerPixel(depth),
                                          PixmapBytePad(width, depth),
                                          (void *) addr)) {
-        (*pScreen->DestroyPixmap) (pPixmap);
+        dixDestroyPixmap(pPixmap, 0);
         return NullPixmap;
     }
     return pPixmap;
@@ -1111,17 +1114,17 @@ ProcShmCreatePixmap(ClientPtr client)
                                                    shmdesc->addr +
                                                    stuff->offset);
     if (pMap) {
-        rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,
-                      pMap, RT_NONE, NULL, DixCreateAccess);
+        rc = XaceHookResourceAccess(client, stuff->pid, X11_RESTYPE_PIXMAP,
+                      pMap, X11_RESTYPE_NONE, NULL, DixCreateAccess);
         if (rc != Success) {
-            pDraw->pScreen->DestroyPixmap(pMap);
+            dixDestroyPixmap(pMap, 0);
             return rc;
         }
         dixSetPrivate(&pMap->devPrivates, shmPixmapPrivateKey, shmdesc);
         shmdesc->refcnt++;
         pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
         pMap->drawable.id = stuff->pid;
-        if (AddResource(stuff->pid, RT_PIXMAP, (void *) pMap)) {
+        if (AddResource(stuff->pid, X11_RESTYPE_PIXMAP, (void *) pMap)) {
             return Success;
         }
     }
@@ -1139,7 +1142,7 @@ ShmBusfaultNotify(void *context)
            (unsigned int) shmdesc->resource);
     busfault_unregister(shmdesc->busfault);
     shmdesc->busfault = NULL;
-    FreeResource (shmdesc->resource, RT_NONE);
+    FreeResource (shmdesc->resource, X11_RESTYPE_NONE);
 }
 
 static int
@@ -1321,7 +1324,7 @@ ProcShmCreateSegment(ClientPtr client)
     }
 
     if (WriteFdToClient(client, fd, TRUE) < 0) {
-        FreeResource(stuff->shmseg, RT_NONE);
+        FreeResource(stuff->shmseg, X11_RESTYPE_NONE);
         close(fd);
         return BadAlloc;
     }
@@ -1347,22 +1350,22 @@ ProcShmDispatch(ClientPtr client)
     case X_ShmDetach:
         return ProcShmDetach(client);
     case X_ShmPutImage:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShmPutImage(client);
-#endif
+#endif /* XINERAMA */
         return ProcShmPutImage(client);
     case X_ShmGetImage:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShmGetImage(client);
-#endif
+#endif /* XINERAMA */
         return ProcShmGetImage(client);
     case X_ShmCreatePixmap:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShmCreatePixmap(client);
-#endif
+#endif /* XINERAMA */
         return ProcShmCreatePixmap(client);
 #ifdef SHM_FD_PASSING
     case X_ShmAttachFd:
@@ -1387,20 +1390,10 @@ SShmCompletionEvent(xShmCompletionEvent * from, xShmCompletionEvent * to)
     cpswapl(from->offset, to->offset);
 }
 
-static int _X_COLD
-SProcShmQueryVersion(ClientPtr client)
-{
-    REQUEST(xShmQueryVersionReq);
-
-    swaps(&stuff->length);
-    return ProcShmQueryVersion(client);
-}
-
 static int _X_COLD
 SProcShmAttach(ClientPtr client)
 {
     REQUEST(xShmAttachReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmAttachReq);
     swapl(&stuff->shmseg);
     swapl(&stuff->shmid);
@@ -1411,7 +1404,6 @@ static int _X_COLD
 SProcShmDetach(ClientPtr client)
 {
     REQUEST(xShmDetachReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmDetachReq);
     swapl(&stuff->shmseg);
     return ProcShmDetach(client);
@@ -1421,7 +1413,6 @@ static int _X_COLD
 SProcShmPutImage(ClientPtr client)
 {
     REQUEST(xShmPutImageReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmPutImageReq);
     swapl(&stuff->drawable);
     swapl(&stuff->gc);
@@ -1442,7 +1433,6 @@ static int _X_COLD
 SProcShmGetImage(ClientPtr client)
 {
     REQUEST(xShmGetImageReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmGetImageReq);
     swapl(&stuff->drawable);
     swaps(&stuff->x);
@@ -1459,7 +1449,6 @@ static int _X_COLD
 SProcShmCreatePixmap(ClientPtr client)
 {
     REQUEST(xShmCreatePixmapReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
     swapl(&stuff->pid);
     swapl(&stuff->drawable);
@@ -1476,7 +1465,6 @@ SProcShmAttachFd(ClientPtr client)
 {
     REQUEST(xShmAttachFdReq);
     SetReqFds(client, 1);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmAttachFdReq);
     swapl(&stuff->shmseg);
     return ProcShmAttachFd(client);
@@ -1486,7 +1474,6 @@ static int _X_COLD
 SProcShmCreateSegment(ClientPtr client)
 {
     REQUEST(xShmCreateSegmentReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmCreateSegmentReq);
     swapl(&stuff->shmseg);
     swapl(&stuff->size);
@@ -1500,7 +1487,7 @@ SProcShmDispatch(ClientPtr client)
     REQUEST(xReq);
 
     if (stuff->data == X_ShmQueryVersion)
-        return SProcShmQueryVersion(client);
+        return ProcShmQueryVersion(client);
 
     if (!client->local)
         return BadRequest;

Xext/sleepuntil.c

@@ -27,9 +27,7 @@ in this Software without prior written authorization from The Open Group.
 
 /* dixsleep.c - implement millisecond timeouts for X clients */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "sleepuntil.h"
 #include <X11/X.h>
@@ -166,7 +164,7 @@ SertafiedBlockHandler(void *data, void *wt)
         pNext = pReq->next;
         if (CompareTimeStamps(pReq->revive, now) == LATER)
             break;
-        FreeResource(pReq->id, RT_NONE);
+        FreeResource(pReq->id, X11_RESTYPE_NONE);
 
         /* AttendClient() may have been called via the resource delete
          * function so a client may have input to be processed and so
@@ -195,7 +193,7 @@ SertafiedWakeupHandler(void *data, int i)
         pNext = pReq->next;
         if (CompareTimeStamps(pReq->revive, now) == LATER)
             break;
-        FreeResource(pReq->id, RT_NONE);
+        FreeResource(pReq->id, X11_RESTYPE_NONE);
     }
     if (!pPending) {
         RemoveBlockAndWakeupHandlers(SertafiedBlockHandler,

Xext/sync.c

@@ -49,34 +49,36 @@ PERFORMANCE OF THIS SOFTWARE.
 
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
-
+#include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xmd.h>
+#include <X11/extensions/syncproto.h>
+
+#include "dix/dix_priv.h"
+#include "os/bug_priv.h"
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "os.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "pixmapstr.h"
 #include "resource.h"
-#include "opaque.h"
-#include <X11/extensions/syncproto.h>
 #include "syncsrv.h"
 #include "syncsdk.h"
 #include "protocol-versions.h"
 #include "inputstr.h"
+#include "misync_priv.h"
 
-#include <stdio.h>
 #if !defined(WIN32)
 #include <sys/time.h>
 #endif
 
-#include "extinit.h"
+#include "extinit_priv.h"
 
 /*
  * Local Global Variables
@@ -199,8 +201,8 @@ SyncAddTriggerToSyncObject(SyncTrigger * pTrigger)
             return Success;
     }
 
-    if (!(pCur = malloc(sizeof(SyncTriggerList))))
-        return BadAlloc;
+    /* Failure is not an option, it's succeed or burst! */
+    pCur = XNFalloc(sizeof(SyncTriggerList));
 
     pCur->pTrigger = pTrigger;
     pCur->next = pTrigger->pSync->pTriglist;
@@ -310,6 +312,35 @@ SyncCheckTriggerFence(SyncTrigger * pTrigger, int64_t unused)
     return (pFence == NULL || pFence->funcs.CheckTriggered(pFence));
 }
 
+static inline Bool
+checked_int64_add(int64_t *out, int64_t a, int64_t b)
+{
+    /* Do the potentially overflowing math as uint64_t, as signed
+     * integers in C are undefined on overflow (and the compiler may
+     * optimize out our overflow check below, otherwise)
+     */
+    int64_t result = (uint64_t)a + (uint64_t)b;
+    /* signed addition overflows if operands have the same sign, and
+     * the sign of the result doesn't match the sign of the inputs.
+     */
+    Bool overflow = (a < 0) == (b < 0) && (a < 0) != (result < 0);
+
+    *out = result;
+
+    return overflow;
+}
+
+static inline Bool
+checked_int64_subtract(int64_t *out, int64_t a, int64_t b)
+{
+    int64_t result = (uint64_t)a - (uint64_t)b;
+    Bool overflow = (a < 0) != (b < 0) && (a < 0) != (result < 0);
+
+    *out = result;
+
+    return overflow;
+}
+
 static int
 SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
                 RESTYPE resType, Mask changes)
@@ -329,11 +360,6 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
             client->errorValue = syncObject;
             return rc;
         }
-        if (pSync != pTrigger->pSync) { /* new counter for trigger */
-            SyncDeleteTriggerFromSyncObject(pTrigger);
-            pTrigger->pSync = pSync;
-            newSyncObject = TRUE;
-        }
     }
 
     /* if system counter, ask it what the current value is */
@@ -355,6 +381,24 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
         }
     }
 
+    if (changes & (XSyncCAValueType | XSyncCAValue)) {
+        if (pTrigger->value_type == XSyncAbsolute)
+            pTrigger->test_value = pTrigger->wait_value;
+        else {                  /* relative */
+            Bool overflow;
+
+            if (pCounter == NULL)
+                return BadMatch;
+
+            overflow = checked_int64_add(&pTrigger->test_value,
+                                         pCounter->value, pTrigger->wait_value);
+            if (overflow) {
+                client->errorValue = pTrigger->wait_value >> 32;
+                return BadValue;
+            }
+        }
+    }
+
     if (changes & XSyncCATestType) {
 
         if (pSync && SYNC_FENCE == pSync->type) {
@@ -383,21 +427,11 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
         }
     }
 
-    if (changes & (XSyncCAValueType | XSyncCAValue)) {
-        if (pTrigger->value_type == XSyncAbsolute)
-            pTrigger->test_value = pTrigger->wait_value;
-        else {                  /* relative */
-            Bool overflow;
-
-            if (pCounter == NULL)
-                return BadMatch;
-
-            overflow = checked_int64_add(&pTrigger->test_value,
-                                         pCounter->value, pTrigger->wait_value);
-            if (overflow) {
-                client->errorValue = pTrigger->wait_value >> 32;
-                return BadValue;
-            }
+    if (changes & XSyncCACounter) {
+        if (pSync != pTrigger->pSync) { /* new counter for trigger */
+            SyncDeleteTriggerFromSyncObject(pTrigger);
+            pTrigger->pSync = pSync;
+            newSyncObject = TRUE;
         }
     }
 
@@ -405,8 +439,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
      *  a new counter on a trigger
      */
     if (newSyncObject) {
-        if ((rc = SyncAddTriggerToSyncObject(pTrigger)) != Success)
-            return rc;
+        SyncAddTriggerToSyncObject(pTrigger);
     }
     else if (pCounter && IsSystemCounter(pCounter)) {
         SyncComputeBracketValues(pCounter);
@@ -693,7 +726,7 @@ SyncAwaitTriggerFired(SyncTrigger * pTrigger)
     /* unblock the client */
     AttendClient(pAwaitUnion->header.client);
     /* delete the await */
-    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
+    FreeResource(pAwaitUnion->header.delete_id, X11_RESTYPE_NONE);
 }
 
 static int64_t
@@ -748,7 +781,7 @@ SyncEventSelectForAlarm(SyncAlarm * pAlarm, ClientPtr client, Bool wantevents)
              * nothing, since it's already got them.
              */
             if (!wantevents) {
-                FreeResource(pClients->delete_id, RT_NONE);
+                FreeResource(pClients->delete_id, X11_RESTYPE_NONE);
             }
             return Success;
         }
@@ -797,8 +830,14 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm * pAlarm, Mask mask,
     int status;
     XSyncCounter counter;
     Mask origmask = mask;
+    SyncTrigger trigger;
+    Bool select_events_changed = FALSE;
+    Bool select_events_value = FALSE;
+    int64_t delta;
 
-    counter = pAlarm->trigger.pSync ? pAlarm->trigger.pSync->id : None;
+    trigger = pAlarm->trigger;
+    delta = pAlarm->delta;
+    counter = trigger.pSync ? trigger.pSync->id : None;
 
     while (mask) {
         int index2 = lowbit(mask);
@@ -814,24 +853,24 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm * pAlarm, Mask mask,
         case XSyncCAValueType:
             mask &= ~XSyncCAValueType;
             /* sanity check in SyncInitTrigger */
-            pAlarm->trigger.value_type = *values++;
+            trigger.value_type = *values++;
             break;
 
         case XSyncCAValue:
             mask &= ~XSyncCAValue;
-            pAlarm->trigger.wait_value = ((int64_t)values[0] << 32) | values[1];
+            trigger.wait_value = ((int64_t)values[0] << 32) | values[1];
             values += 2;
             break;
 
         case XSyncCATestType:
             mask &= ~XSyncCATestType;
             /* sanity check in SyncInitTrigger */
-            pAlarm->trigger.test_type = *values++;
+            trigger.test_type = *values++;
             break;
 
         case XSyncCADelta:
             mask &= ~XSyncCADelta;
-            pAlarm->delta = ((int64_t)values[0] << 32) | values[1];
+            delta = ((int64_t)values[0] << 32) | values[1];
             values += 2;
             break;
 
@@ -841,10 +880,8 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm * pAlarm, Mask mask,
                 client->errorValue = *values;
                 return BadValue;
             }
-            status = SyncEventSelectForAlarm(pAlarm, client,
-                                             (Bool) (*values++));
-            if (status != Success)
-                return status;
+            select_events_value = (Bool) (*values++);
+            select_events_changed = TRUE;
             break;
 
         default:
@@ -853,25 +890,33 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm * pAlarm, Mask mask,
         }
     }
 
+    if (select_events_changed) {
+        status = SyncEventSelectForAlarm(pAlarm, client, select_events_value);
+        if (status != Success)
+            return status;
+    }
+
     /* "If the test-type is PositiveComparison or PositiveTransition
      *  and delta is less than zero, or if the test-type is
      *  NegativeComparison or NegativeTransition and delta is
      *  greater than zero, a Match error is generated."
      */
     if (origmask & (XSyncCADelta | XSyncCATestType)) {
-        if ((((pAlarm->trigger.test_type == XSyncPositiveComparison) ||
-              (pAlarm->trigger.test_type == XSyncPositiveTransition))
-             && pAlarm->delta < 0)
+        if ((((trigger.test_type == XSyncPositiveComparison) ||
+              (trigger.test_type == XSyncPositiveTransition))
+             && delta < 0)
             ||
-            (((pAlarm->trigger.test_type == XSyncNegativeComparison) ||
-              (pAlarm->trigger.test_type == XSyncNegativeTransition))
-             && pAlarm->delta > 0)
+            (((trigger.test_type == XSyncNegativeComparison) ||
+              (trigger.test_type == XSyncNegativeTransition))
+             && delta > 0)
             ) {
             return BadMatch;
         }
     }
 
     /* postpone this until now, when we're sure nothing else can go wrong */
+    pAlarm->delta = delta;
+    pAlarm->trigger = trigger;
     if ((status = SyncInitTrigger(client, &pAlarm->trigger, counter, RTCounter,
                                   origmask & XSyncCAAllTrigger)) != Success)
         return status;
@@ -931,7 +976,7 @@ SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL
 
     status = miSyncInitFenceFromFD(pDraw, pFence, fd, initially_triggered);
     if (status != Success) {
-        FreeResource(pFence->sync.id, RT_NONE);
+        FreeResource(pFence->sync.id, X11_RESTYPE_NONE);
         return status;
     }
 
@@ -989,7 +1034,7 @@ SyncCreateSystemCounter(const char *name,
 
         psci = malloc(sizeof(SysCounterInfo));
         if (!psci) {
-            FreeResource(pCounter->sync.id, RT_NONE);
+            FreeResource(pCounter->sync.id, X11_RESTYPE_NONE);
             return pCounter;
         }
         pCounter->pSysCounterInfo = psci;
@@ -1012,7 +1057,7 @@ SyncDestroySystemCounter(void *pSysCounter)
 {
     SyncCounter *pCounter = (SyncCounter *) pSysCounter;
 
-    FreeResource(pCounter->sync.id, RT_NONE);
+    FreeResource(pCounter->sync.id, X11_RESTYPE_NONE);
 }
 
 static void
@@ -1125,7 +1170,7 @@ FreeAlarm(void *addr, XID id)
     /* delete event selections */
 
     while (pAlarm->pEventClients)
-        FreeResource(pAlarm->pEventClients->delete_id, RT_NONE);
+        FreeResource(pAlarm->pEventClients->delete_id, X11_RESTYPE_NONE);
 
     SyncDeleteTriggerFromSyncObject(&pAlarm->trigger);
 
@@ -1490,7 +1535,7 @@ ProcSyncDestroyCounter(ClientPtr client)
         client->errorValue = stuff->counter;
         return BadAccess;
     }
-    FreeResource(pCounter->sync.id, RT_NONE);
+    FreeResource(pCounter->sync.id, X11_RESTYPE_NONE);
     return Success;
 }
 
@@ -1591,7 +1636,7 @@ ProcSyncAwait(ClientPtr client)
             /*  this should take care of removing any triggers created by
              *  this request that have already been registered on sync objects
              */
-            FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
+            FreeResource(pAwaitUnion->header.delete_id, X11_RESTYPE_NONE);
             client->errorValue = pProtocolWaitConds->counter;
             return SyncErrorBase + XSyncBadCounter;
         }
@@ -1611,7 +1656,7 @@ ProcSyncAwait(ClientPtr client)
             /*  this should take care of removing any triggers created by
              *  this request that have already been registered on sync objects
              */
-            FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
+            FreeResource(pAwaitUnion->header.delete_id, X11_RESTYPE_NONE);
             return status;
         }
         /* this is not a mistake -- same function works for both cases */
@@ -1742,7 +1787,7 @@ ProcSyncCreateAlarm(ClientPtr client)
 
         if (!SyncCheckWarnIsCounter(pTrigger->pSync,
                                     WARN_INVALID_COUNTER_ALARM)) {
-            FreeResource(stuff->id, RT_NONE);
+            FreeResource(stuff->id, X11_RESTYPE_NONE);
             return BadAlloc;
         }
 
@@ -1873,7 +1918,7 @@ ProcSyncDestroyAlarm(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    FreeResource(stuff->alarm, RT_NONE);
+    FreeResource(stuff->alarm, X11_RESTYPE_NONE);
     return Success;
 }
 
@@ -1978,7 +2023,7 @@ ProcSyncDestroyFence(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    FreeResource(stuff->fid, RT_NONE);
+    FreeResource(stuff->fid, X11_RESTYPE_NONE);
     return Success;
 }
 
@@ -2056,7 +2101,7 @@ ProcSyncAwaitFence(ClientPtr client)
             /*  this should take care of removing any triggers created by
              *  this request that have already been registered on sync objects
              */
-            FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
+            FreeResource(pAwaitUnion->header.delete_id, X11_RESTYPE_NONE);
             client->errorValue = *pProtocolFences;
             return SyncErrorBase + XSyncBadFence;
         }
@@ -2075,7 +2120,7 @@ ProcSyncAwaitFence(ClientPtr client)
             /*  this should take care of removing any triggers created by
              *  this request that have already been registered on sync objects
              */
-            FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
+            FreeResource(pAwaitUnion->header.delete_id, X11_RESTYPE_NONE);
             return status;
         }
         /* this is not a mistake -- same function works for both cases */
@@ -2150,31 +2195,10 @@ ProcSyncDispatch(ClientPtr client)
  * Boring Swapping stuff ...
  */
 
-static int _X_COLD
-SProcSyncInitialize(ClientPtr client)
-{
-    REQUEST(xSyncInitializeReq);
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xSyncInitializeReq);
-
-    return ProcSyncInitialize(client);
-}
-
-static int _X_COLD
-SProcSyncListSystemCounters(ClientPtr client)
-{
-    REQUEST(xSyncListSystemCountersReq);
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xSyncListSystemCountersReq);
-
-    return ProcSyncListSystemCounters(client);
-}
-
 static int _X_COLD
 SProcSyncCreateCounter(ClientPtr client)
 {
     REQUEST(xSyncCreateCounterReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncCreateCounterReq);
     swapl(&stuff->cid);
     swapl(&stuff->initial_value_lo);
@@ -2187,7 +2211,6 @@ static int _X_COLD
 SProcSyncSetCounter(ClientPtr client)
 {
     REQUEST(xSyncSetCounterReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncSetCounterReq);
     swapl(&stuff->cid);
     swapl(&stuff->value_lo);
@@ -2200,7 +2223,6 @@ static int _X_COLD
 SProcSyncChangeCounter(ClientPtr client)
 {
     REQUEST(xSyncChangeCounterReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncChangeCounterReq);
     swapl(&stuff->cid);
     swapl(&stuff->value_lo);
@@ -2213,7 +2235,6 @@ static int _X_COLD
 SProcSyncQueryCounter(ClientPtr client)
 {
     REQUEST(xSyncQueryCounterReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncQueryCounterReq);
     swapl(&stuff->counter);
 
@@ -2224,7 +2245,6 @@ static int _X_COLD
 SProcSyncDestroyCounter(ClientPtr client)
 {
     REQUEST(xSyncDestroyCounterReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncDestroyCounterReq);
     swapl(&stuff->counter);
 
@@ -2235,7 +2255,6 @@ static int _X_COLD
 SProcSyncAwait(ClientPtr client)
 {
     REQUEST(xSyncAwaitReq);
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xSyncAwaitReq);
     SwapRestL(stuff);
 
@@ -2246,7 +2265,6 @@ static int _X_COLD
 SProcSyncCreateAlarm(ClientPtr client)
 {
     REQUEST(xSyncCreateAlarmReq);
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq);
     swapl(&stuff->id);
     swapl(&stuff->valueMask);
@@ -2259,7 +2277,6 @@ static int _X_COLD
 SProcSyncChangeAlarm(ClientPtr client)
 {
     REQUEST(xSyncChangeAlarmReq);
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);
     swapl(&stuff->alarm);
     swapl(&stuff->valueMask);
@@ -2271,7 +2288,6 @@ static int _X_COLD
 SProcSyncQueryAlarm(ClientPtr client)
 {
     REQUEST(xSyncQueryAlarmReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncQueryAlarmReq);
     swapl(&stuff->alarm);
 
@@ -2282,7 +2298,6 @@ static int _X_COLD
 SProcSyncDestroyAlarm(ClientPtr client)
 {
     REQUEST(xSyncDestroyAlarmReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq);
     swapl(&stuff->alarm);
 
@@ -2293,7 +2308,6 @@ static int _X_COLD
 SProcSyncSetPriority(ClientPtr client)
 {
     REQUEST(xSyncSetPriorityReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncSetPriorityReq);
     swapl(&stuff->id);
     swapl(&stuff->priority);
@@ -2305,7 +2319,6 @@ static int _X_COLD
 SProcSyncGetPriority(ClientPtr client)
 {
     REQUEST(xSyncGetPriorityReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncGetPriorityReq);
     swapl(&stuff->id);
 
@@ -2316,8 +2329,8 @@ static int _X_COLD
 SProcSyncCreateFence(ClientPtr client)
 {
     REQUEST(xSyncCreateFenceReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncCreateFenceReq);
+    swapl(&stuff->d);
     swapl(&stuff->fid);
 
     return ProcSyncCreateFence(client);
@@ -2327,7 +2340,6 @@ static int _X_COLD
 SProcSyncTriggerFence(ClientPtr client)
 {
     REQUEST(xSyncTriggerFenceReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncTriggerFenceReq);
     swapl(&stuff->fid);
 
@@ -2338,7 +2350,6 @@ static int _X_COLD
 SProcSyncResetFence(ClientPtr client)
 {
     REQUEST(xSyncResetFenceReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncResetFenceReq);
     swapl(&stuff->fid);
 
@@ -2349,7 +2360,6 @@ static int _X_COLD
 SProcSyncDestroyFence(ClientPtr client)
 {
     REQUEST(xSyncDestroyFenceReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncDestroyFenceReq);
     swapl(&stuff->fid);
 
@@ -2360,7 +2370,6 @@ static int _X_COLD
 SProcSyncQueryFence(ClientPtr client)
 {
     REQUEST(xSyncQueryFenceReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncQueryFenceReq);
     swapl(&stuff->fid);
 
@@ -2371,7 +2380,6 @@ static int _X_COLD
 SProcSyncAwaitFence(ClientPtr client)
 {
     REQUEST(xSyncAwaitFenceReq);
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xSyncAwaitFenceReq);
     SwapRestL(stuff);
 
@@ -2385,9 +2393,9 @@ SProcSyncDispatch(ClientPtr client)
 
     switch (stuff->data) {
     case X_SyncInitialize:
-        return SProcSyncInitialize(client);
+        return ProcSyncInitialize(client);
     case X_SyncListSystemCounters:
-        return SProcSyncListSystemCounters(client);
+        return ProcSyncListSystemCounters(client);
     case X_SyncCreateCounter:
         return SProcSyncCreateCounter(client);
     case X_SyncSetCounter:

Xext/vidmode.c

@@ -29,9 +29,7 @@ from Kaleb S. KEITHLEY
 */
 /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #ifdef XF86VIDMODE
 
@@ -471,7 +469,7 @@ ProcVidModeAddModeLine(ClientPtr client)
     if (ver < 2) {
         /* convert from old format */
         stuff = &newstuff;
-        stuff->length = oldstuff->length;
+        stuff->length = client->req_len;
         stuff->screen = oldstuff->screen;
         stuff->dotclock = oldstuff->dotclock;
         stuff->hdisplay = oldstuff->hdisplay;
@@ -641,7 +639,7 @@ ProcVidModeDeleteModeLine(ClientPtr client)
     if (ver < 2) {
         /* convert from old format */
         stuff = &newstuff;
-        stuff->length = oldstuff->length;
+        stuff->length = client->req_len;
         stuff->screen = oldstuff->screen;
         stuff->dotclock = oldstuff->dotclock;
         stuff->hdisplay = oldstuff->hdisplay;
@@ -670,7 +668,7 @@ ProcVidModeDeleteModeLine(ClientPtr client)
                "len = %d, length = %d\n",
                (unsigned long) client->req_len,
                (int) sizeof(xXF86VidModeDeleteModeLineReq) >> 2,
-               (unsigned long) stuff->privsize, len, stuff->length);
+               (unsigned long) stuff->privsize, len, client->req_len);
         return BadLength;
     }
 
@@ -765,7 +763,7 @@ ProcVidModeModModeLine(ClientPtr client)
     if (ver < 2) {
         /* convert from old format */
         stuff = &newstuff;
-        stuff->length = oldstuff->length;
+        stuff->length = client->req_len;
         stuff->screen = oldstuff->screen;
         stuff->hdisplay = oldstuff->hdisplay;
         stuff->hsyncstart = oldstuff->hsyncstart;
@@ -899,7 +897,7 @@ ProcVidModeValidateModeLine(ClientPtr client)
     if (ver < 2) {
         /* convert from old format */
         stuff = &newstuff;
-        stuff->length = oldstuff->length;
+        stuff->length = client->req_len;
         stuff->screen = oldstuff->screen;
         stuff->dotclock = oldstuff->dotclock;
         stuff->hdisplay = oldstuff->hdisplay;
@@ -1052,7 +1050,7 @@ ProcVidModeSwitchToMode(ClientPtr client)
     if (ver < 2) {
         /* convert from old format */
         stuff = &newstuff;
-        stuff->length = oldstuff->length;
+        stuff->length = client->req_len;
         stuff->screen = oldstuff->screen;
         stuff->dotclock = oldstuff->dotclock;
         stuff->hdisplay = oldstuff->hdisplay;
@@ -1703,19 +1701,10 @@ ProcVidModeDispatch(ClientPtr client)
     }
 }
 
-static int _X_COLD
-SProcVidModeQueryVersion(ClientPtr client)
-{
-    REQUEST(xXF86VidModeQueryVersionReq);
-    swaps(&stuff->length);
-    return ProcVidModeQueryVersion(client);
-}
-
 static int _X_COLD
 SProcVidModeGetModeLine(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetModeLineReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
     swaps(&stuff->screen);
     return ProcVidModeGetModeLine(client);
@@ -1725,7 +1714,6 @@ static int _X_COLD
 SProcVidModeGetAllModeLines(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetAllModeLinesReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
     swaps(&stuff->screen);
     return ProcVidModeGetAllModeLines(client);
@@ -1741,7 +1729,6 @@ SProcVidModeAddModeLine(ClientPtr client)
     REQUEST(xXF86VidModeAddModeLineReq);
     ver = ClientMajorVersion(client);
     if (ver < 2) {
-        swaps(&oldstuff->length);
         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
         swapl(&oldstuff->screen);
         swaps(&oldstuff->hdisplay);
@@ -1757,7 +1744,6 @@ SProcVidModeAddModeLine(ClientPtr client)
         SwapRestL(oldstuff);
     }
     else {
-        swaps(&stuff->length);
         REQUEST_AT_LEAST_SIZE(xXF86VidModeAddModeLineReq);
         swapl(&stuff->screen);
         swaps(&stuff->hdisplay);
@@ -1786,7 +1772,6 @@ SProcVidModeDeleteModeLine(ClientPtr client)
     REQUEST(xXF86VidModeDeleteModeLineReq);
     ver = ClientMajorVersion(client);
     if (ver < 2) {
-        swaps(&oldstuff->length);
         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
         swapl(&oldstuff->screen);
         swaps(&oldstuff->hdisplay);
@@ -1802,7 +1787,6 @@ SProcVidModeDeleteModeLine(ClientPtr client)
         SwapRestL(oldstuff);
     }
     else {
-        swaps(&stuff->length);
         REQUEST_AT_LEAST_SIZE(xXF86VidModeDeleteModeLineReq);
         swapl(&stuff->screen);
         swaps(&stuff->hdisplay);
@@ -1831,7 +1815,6 @@ SProcVidModeModModeLine(ClientPtr client)
     REQUEST(xXF86VidModeModModeLineReq);
     ver = ClientMajorVersion(client);
     if (ver < 2) {
-        swaps(&oldstuff->length);
         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
         swapl(&oldstuff->screen);
         swaps(&oldstuff->hdisplay);
@@ -1847,7 +1830,6 @@ SProcVidModeModModeLine(ClientPtr client)
         SwapRestL(oldstuff);
     }
     else {
-        swaps(&stuff->length);
         REQUEST_AT_LEAST_SIZE(xXF86VidModeModModeLineReq);
         swapl(&stuff->screen);
         swaps(&stuff->hdisplay);
@@ -1876,7 +1858,6 @@ SProcVidModeValidateModeLine(ClientPtr client)
     REQUEST(xXF86VidModeValidateModeLineReq);
     ver = ClientMajorVersion(client);
     if (ver < 2) {
-        swaps(&oldstuff->length);
         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
         swapl(&oldstuff->screen);
         swaps(&oldstuff->hdisplay);
@@ -1892,7 +1873,6 @@ SProcVidModeValidateModeLine(ClientPtr client)
         SwapRestL(oldstuff);
     }
     else {
-        swaps(&stuff->length);
         REQUEST_AT_LEAST_SIZE(xXF86VidModeValidateModeLineReq);
         swapl(&stuff->screen);
         swaps(&stuff->hdisplay);
@@ -1915,7 +1895,6 @@ static int _X_COLD
 SProcVidModeSwitchMode(ClientPtr client)
 {
     REQUEST(xXF86VidModeSwitchModeReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq);
     swaps(&stuff->screen);
     swaps(&stuff->zoom);
@@ -1926,7 +1905,6 @@ static int _X_COLD
 SProcVidModeSwitchToMode(ClientPtr client)
 {
     REQUEST(xXF86VidModeSwitchToModeReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq);
     swapl(&stuff->screen);
     return ProcVidModeSwitchToMode(client);
@@ -1936,7 +1914,6 @@ static int _X_COLD
 SProcVidModeLockModeSwitch(ClientPtr client)
 {
     REQUEST(xXF86VidModeLockModeSwitchReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
     swaps(&stuff->screen);
     swaps(&stuff->lock);
@@ -1947,7 +1924,6 @@ static int _X_COLD
 SProcVidModeGetMonitor(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetMonitorReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
     swaps(&stuff->screen);
     return ProcVidModeGetMonitor(client);
@@ -1957,7 +1933,6 @@ static int _X_COLD
 SProcVidModeGetViewPort(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetViewPortReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
     swaps(&stuff->screen);
     return ProcVidModeGetViewPort(client);
@@ -1967,7 +1942,6 @@ static int _X_COLD
 SProcVidModeSetViewPort(ClientPtr client)
 {
     REQUEST(xXF86VidModeSetViewPortReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq);
     swaps(&stuff->screen);
     swapl(&stuff->x);
@@ -1979,7 +1953,6 @@ static int _X_COLD
 SProcVidModeGetDotClocks(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetDotClocksReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
     swaps(&stuff->screen);
     return ProcVidModeGetDotClocks(client);
@@ -1989,7 +1962,6 @@ static int _X_COLD
 SProcVidModeSetClientVersion(ClientPtr client)
 {
     REQUEST(xXF86VidModeSetClientVersionReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
     swaps(&stuff->major);
     swaps(&stuff->minor);
@@ -2000,7 +1972,6 @@ static int _X_COLD
 SProcVidModeSetGamma(ClientPtr client)
 {
     REQUEST(xXF86VidModeSetGammaReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq);
     swaps(&stuff->screen);
     swapl(&stuff->red);
@@ -2013,7 +1984,6 @@ static int _X_COLD
 SProcVidModeGetGamma(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetGammaReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
     swaps(&stuff->screen);
     return ProcVidModeGetGamma(client);
@@ -2025,7 +1995,6 @@ SProcVidModeSetGammaRamp(ClientPtr client)
     int length;
 
     REQUEST(xXF86VidModeSetGammaRampReq);
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
     swaps(&stuff->size);
     swaps(&stuff->screen);
@@ -2039,7 +2008,6 @@ static int _X_COLD
 SProcVidModeGetGammaRamp(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetGammaRampReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
     swaps(&stuff->size);
     swaps(&stuff->screen);
@@ -2050,7 +2018,6 @@ static int _X_COLD
 SProcVidModeGetGammaRampSize(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetGammaRampSizeReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
     swaps(&stuff->screen);
     return ProcVidModeGetGammaRampSize(client);
@@ -2060,7 +2027,6 @@ static int _X_COLD
 SProcVidModeGetPermissions(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetPermissionsReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
     swaps(&stuff->screen);
     return ProcVidModeGetPermissions(client);
@@ -2072,7 +2038,7 @@ SProcVidModeDispatch(ClientPtr client)
     REQUEST(xReq);
     switch (stuff->data) {
     case X_XF86VidModeQueryVersion:
-        return SProcVidModeQueryVersion(client);
+        return ProcVidModeQueryVersion(client);
     case X_XF86VidModeGetModeLine:
         return SProcVidModeGetModeLine(client);
     case X_XF86VidModeGetMonitor:

Xext/xace.c

@@ -17,11 +17,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdarg.h>
+
+#include "os/client_priv.h"
+
 #include "scrnintstr.h"
 #include "extnsionst.h"
 #include "pixmapstr.h"
@@ -29,13 +30,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "gcstruct.h"
 #include "xacestr.h"
 
-_X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = { 0 };
+CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = { 0 };
 
 /* Special-cased hook functions.  Called by Xserver.
  */
-#undef XaceHookDispatch
 int
-XaceHookDispatch(ClientPtr client, int major)
+XaceHookDispatch0(ClientPtr client, int major)
 {
     /* Call the extension dispatch hook */
     ExtensionEntry *ext = GetExtensionEntry(major);
@@ -63,130 +63,85 @@ XaceHookSelectionAccess(ClientPtr client, Selection ** ppSel, Mask access_mode)
     return rec.status;
 }
 
-/* Entry point for hook functions.  Called by Xserver.
- */
-int
-XaceHook(int hook, ...)
+int XaceHookResourceAccess(ClientPtr client, XID id, RESTYPE rtype, void *res,
+                           RESTYPE ptype, void *parent, Mask access_mode)
 {
-    union {
-        XaceResourceAccessRec res;
-        XaceDeviceAccessRec dev;
-        XaceSendAccessRec send;
-        XaceReceiveAccessRec recv;
-        XaceClientAccessRec client;
-        XaceExtAccessRec ext;
-        XaceServerAccessRec server;
-        XaceScreenAccessRec screen;
-        XaceAuthAvailRec auth;
-        XaceKeyAvailRec key;
-    } u;
-    int *prv = NULL;            /* points to return value from callback */
-    va_list ap;                 /* argument list */
-
-    if (!XaceHooks[hook])
-        return Success;
-
-    va_start(ap, hook);
-
-    /* Marshal arguments for passing to callback.
-     * Each callback has its own case, which sets up a structure to hold
-     * the arguments and integer return parameter, or in some cases just
-     * sets calldata directly to a single argument (with no return result)
-     */
-    switch (hook) {
-    case XACE_RESOURCE_ACCESS:
-        u.res.client = va_arg(ap, ClientPtr);
-        u.res.id = va_arg(ap, XID);
-        u.res.rtype = va_arg(ap, RESTYPE);
-        u.res.res = va_arg(ap, void *);
-        u.res.ptype = va_arg(ap, RESTYPE);
-        u.res.parent = va_arg(ap, void *);
-        u.res.access_mode = va_arg(ap, Mask);
-
-        u.res.status = Success; /* default allow */
-        prv = &u.res.status;
-        break;
-    case XACE_DEVICE_ACCESS:
-        u.dev.client = va_arg(ap, ClientPtr);
-        u.dev.dev = va_arg(ap, DeviceIntPtr);
-        u.dev.access_mode = va_arg(ap, Mask);
-
-        u.dev.status = Success; /* default allow */
-        prv = &u.dev.status;
-        break;
-    case XACE_SEND_ACCESS:
-        u.send.client = va_arg(ap, ClientPtr);
-        u.send.dev = va_arg(ap, DeviceIntPtr);
-        u.send.pWin = va_arg(ap, WindowPtr);
-
-        u.send.events = va_arg(ap, xEventPtr);
-        u.send.count = va_arg(ap, int);
-
-        u.send.status = Success;        /* default allow */
-        prv = &u.send.status;
-        break;
-    case XACE_RECEIVE_ACCESS:
-        u.recv.client = va_arg(ap, ClientPtr);
-        u.recv.pWin = va_arg(ap, WindowPtr);
-
-        u.recv.events = va_arg(ap, xEventPtr);
-        u.recv.count = va_arg(ap, int);
-
-        u.recv.status = Success;        /* default allow */
-        prv = &u.recv.status;
-        break;
-    case XACE_CLIENT_ACCESS:
-        u.client.client = va_arg(ap, ClientPtr);
-        u.client.target = va_arg(ap, ClientPtr);
-        u.client.access_mode = va_arg(ap, Mask);
-
-        u.client.status = Success;      /* default allow */
-        prv = &u.client.status;
-        break;
-    case XACE_EXT_ACCESS:
-        u.ext.client = va_arg(ap, ClientPtr);
-
-        u.ext.ext = va_arg(ap, ExtensionEntry *);
-        u.ext.access_mode = DixGetAttrAccess;
-        u.ext.status = Success; /* default allow */
-        prv = &u.ext.status;
-        break;
-    case XACE_SERVER_ACCESS:
-        u.server.client = va_arg(ap, ClientPtr);
-        u.server.access_mode = va_arg(ap, Mask);
-
-        u.server.status = Success;      /* default allow */
-        prv = &u.server.status;
-        break;
-    case XACE_SCREEN_ACCESS:
-    case XACE_SCREENSAVER_ACCESS:
-        u.screen.client = va_arg(ap, ClientPtr);
-        u.screen.screen = va_arg(ap, ScreenPtr);
-        u.screen.access_mode = va_arg(ap, Mask);
-
-        u.screen.status = Success;      /* default allow */
-        prv = &u.screen.status;
-        break;
-    case XACE_AUTH_AVAIL:
-        u.auth.client = va_arg(ap, ClientPtr);
-        u.auth.authId = va_arg(ap, XID);
-
-        break;
-    case XACE_KEY_AVAIL:
-        u.key.event = va_arg(ap, xEventPtr);
-        u.key.keybd = va_arg(ap, DeviceIntPtr);
-        u.key.count = va_arg(ap, int);
-
-        break;
-    default:
-        va_end(ap);
-        return 0;               /* unimplemented hook number */
-    }
-    va_end(ap);
+    XaceResourceAccessRec rec = { client, id, rtype, res, ptype, parent,
+                                  access_mode, Success };
+    CallCallbacks(&XaceHooks[XACE_RESOURCE_ACCESS], &rec);
+    return rec.status;
+}
+
+int XaceHookDeviceAccess(ClientPtr client, DeviceIntPtr dev, Mask access_mode)
+{
+    XaceDeviceAccessRec rec = { client, dev, access_mode, Success };
+    CallCallbacks(&XaceHooks[XACE_DEVICE_ACCESS], &rec);
+    return rec.status;
+}
 
-    /* call callbacks and return result, if any. */
-    CallCallbacks(&XaceHooks[hook], &u);
-    return prv ? *prv : Success;
+int XaceHookSendAccess(ClientPtr client, DeviceIntPtr dev, WindowPtr win,
+                       xEventPtr ev, int count)
+{
+    XaceSendAccessRec rec = { client, dev, win, ev, count, Success };
+    CallCallbacks(&XaceHooks[XACE_SEND_ACCESS], &rec);
+    return rec.status;
+}
+
+int XaceHookReceiveAccess(ClientPtr client, WindowPtr win,
+                          xEventPtr ev, int count)
+{
+    XaceReceiveAccessRec rec = { client, win, ev, count, Success };
+    CallCallbacks(&XaceHooks[XACE_RECEIVE_ACCESS], &rec);
+    return rec.status;
+}
+
+int XaceHookClientAccess(ClientPtr client, ClientPtr target, Mask access_mode)
+{
+    XaceClientAccessRec rec = { client, target, access_mode, Success };
+    CallCallbacks(&XaceHooks[XACE_CLIENT_ACCESS], &rec);
+    return rec.status;
+}
+
+int XaceHookExtAccess(ClientPtr client, ExtensionEntry *ext)
+{
+    XaceExtAccessRec rec = { client, ext, DixGetAttrAccess, Success };
+    CallCallbacks(&XaceHooks[XACE_EXT_ACCESS], &rec);
+    return rec.status;
+}
+
+int XaceHookServerAccess(ClientPtr client, Mask access_mode)
+{
+    XaceServerAccessRec rec = { client, access_mode, Success };
+    CallCallbacks(&XaceHooks[XACE_SERVER_ACCESS], &rec);
+    return rec.status;
+}
+
+int XaceHookScreenAccess(ClientPtr client, ScreenPtr screen, Mask access_mode)
+{
+    XaceScreenAccessRec rec = { client, screen, access_mode, Success };
+    CallCallbacks(&XaceHooks[XACE_SCREEN_ACCESS], &rec);
+    return rec.status;
+}
+
+int XaceHookScreensaverAccess(ClientPtr client, ScreenPtr screen, Mask access_mode)
+{
+    XaceScreenAccessRec rec = { client, screen, access_mode, Success };
+    CallCallbacks(&XaceHooks[XACE_SCREENSAVER_ACCESS], &rec);
+    return rec.status;
+}
+
+int XaceHookAuthAvail(ClientPtr client, XID authId)
+{
+    XaceAuthAvailRec rec = { client, authId };
+    CallCallbacks(&XaceHooks[XACE_AUTH_AVAIL], &rec);
+    return Success;
+}
+
+int XaceHookKeyAvail(xEventPtr ev, DeviceIntPtr dev, int count)
+{
+    XaceKeyAvailRec rec = { ev, dev, count };
+    CallCallbacks(&XaceHooks[XACE_KEY_AVAIL], &rec);
+    return Success;
 }
 
 /* XaceHookIsSet

Xext/xace.h

@@ -25,6 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_MAJOR_VERSION		2
 #define XACE_MINOR_VERSION		0
 
+#include "extnsionst.h"
 #include "pixmap.h"
 #include "region.h"
 #include "window.h"
@@ -54,31 +55,47 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_KEY_AVAIL			14
 #define XACE_NUM_HOOKS			15
 
-extern _X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
+extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
 
 /* Entry point for hook functions.  Called by Xserver.
  * Required by libdbe and libextmod
  */
-extern _X_EXPORT int XaceHook(int /*hook */ ,
-                              ...       /*appropriate args for hook */
-    );
+/* needs to be exported for in-tree modsetting driver, but not part 
+   of public API for external modules */
+_X_EXPORT int XaceHook(int hook, ... /* appropriate args for hook */);
 
 /* determine whether any callbacks are present for the XACE hook */
-extern _X_EXPORT int XaceHookIsSet(int hook);
+int XaceHookIsSet(int hook);
 
 /* Special-cased hook functions
  */
-extern _X_EXPORT int XaceHookDispatch(ClientPtr ptr, int major);
+int XaceHookDispatch0(ClientPtr ptr, int major);
 #define XaceHookDispatch(c, m) \
     ((XaceHooks[XACE_EXT_DISPATCH] && (m) >= EXTENSION_BASE) ? \
-    XaceHookDispatch((c), (m)) : \
+    XaceHookDispatch0((c), (m)) : \
     Success)
 
-extern _X_EXPORT int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin,
-                                            PropertyPtr *ppProp,
-                                            Mask access_mode);
-extern _X_EXPORT int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel,
-                                             Mask access_mode);
+int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp,
+                           Mask access_mode);
+int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel, Mask access_mode);
+
+/* needs to be exported for in-tree modsetting, but not part of public API */
+_X_EXPORT int XaceHookResourceAccess(ClientPtr client, XID id, RESTYPE rtype, void *res,
+                           RESTYPE ptype, void *parent, Mask access_mode);
+
+int XaceHookDeviceAccess(ClientPtr client, DeviceIntPtr dev, Mask access_mode);
+
+int XaceHookSendAccess(ClientPtr client, DeviceIntPtr dev, WindowPtr win,
+                       xEventPtr ev, int count);
+int XaceHookReceiveAccess(ClientPtr client, WindowPtr win, xEventPtr ev, int count);
+int XaceHookClientAccess(ClientPtr client, ClientPtr target, Mask access_mode);
+int XaceHookExtAccess(ClientPtr client, ExtensionEntry *ext);
+int XaceHookServerAccess(ClientPtr client, Mask access_mode);
+int XaceHookScreenAccess(ClientPtr client, ScreenPtr screen, Mask access_mode);
+int XaceHookScreensaverAccess(ClientPtr client, ScreenPtr screen, Mask access_mode);
+int XaceHookAuthAvail(ClientPtr client, XID authId);
+int XaceHookKeyAvail(xEventPtr ev, DeviceIntPtr dev, int count);
+
 
 /* Register a callback for a given hook.
  */
@@ -92,18 +109,18 @@ extern _X_EXPORT int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel,
 
 /* XTrans wrappers for use by security modules
  */
-extern _X_EXPORT int XaceGetConnectionNumber(ClientPtr ptr);
-extern _X_EXPORT int XaceIsLocal(ClientPtr ptr);
+int XaceGetConnectionNumber(ClientPtr ptr);
+int XaceIsLocal(ClientPtr ptr);
 
 /* From the original Security extension...
  */
 
-extern _X_EXPORT void XaceCensorImage(ClientPtr client,
-                                      RegionPtr pVisibleRegion,
-                                      long widthBytesLine,
-                                      DrawablePtr pDraw,
-                                      int x, int y, int w, int h,
-                                      unsigned int format, char *pBuf);
+void XaceCensorImage(ClientPtr client,
+                     RegionPtr pVisibleRegion,
+                     long widthBytesLine,
+                     DrawablePtr pDraw,
+                     int x, int y, int w, int h,
+                     unsigned int format, char *pBuf);
 
 #else                           /* XACE */
 
@@ -113,14 +130,12 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
 /* Define calls away when XACE is not being built. */
 
 #ifdef __GNUC__
-#define XaceHook(args...) Success
 #define XaceHookIsSet(args...) 0
 #define XaceHookDispatch(args...) Success
 #define XaceHookPropertyAccess(args...) Success
 #define XaceHookSelectionAccess(args...) Success
 #define XaceCensorImage(args...) { ; }
 #else
-#define XaceHook(...) Success
 #define XaceHookIsSet(...) 0
 #define XaceHookDispatch(...) Success
 #define XaceHookPropertyAccess(...) Success

Xext/xcmisc.c

@@ -26,9 +26,7 @@ from The Open Group.
 
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
@@ -38,7 +36,7 @@ from The Open Group.
 #include "extnsionst.h"
 #include "swaprep.h"
 #include <X11/extensions/xcmiscproto.h>
-#include "extinit.h"
+#include "extinit_priv.h"
 
 #include <stdint.h>
 
@@ -146,30 +144,18 @@ static int _X_COLD
 SProcXCMiscGetVersion(ClientPtr client)
 {
     REQUEST(xXCMiscGetVersionReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXCMiscGetVersionReq);
     swaps(&stuff->majorVersion);
     swaps(&stuff->minorVersion);
     return ProcXCMiscGetVersion(client);
 }
 
-static int _X_COLD
-SProcXCMiscGetXIDRange(ClientPtr client)
-{
-    REQUEST(xReq);
-
-    swaps(&stuff->length);
-    return ProcXCMiscGetXIDRange(client);
-}
-
 static int _X_COLD
 SProcXCMiscGetXIDList(ClientPtr client)
 {
     REQUEST(xXCMiscGetXIDListReq);
     REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
 
-    swaps(&stuff->length);
     swapl(&stuff->count);
     return ProcXCMiscGetXIDList(client);
 }
@@ -182,7 +168,7 @@ SProcXCMiscDispatch(ClientPtr client)
     case X_XCMiscGetVersion:
         return SProcXCMiscGetVersion(client);
     case X_XCMiscGetXIDRange:
-        return SProcXCMiscGetXIDRange(client);
+        return ProcXCMiscGetXIDRange(client);
     case X_XCMiscGetXIDList:
         return SProcXCMiscGetXIDList(client);
     default:

Xext/xres.c

@@ -2,28 +2,28 @@
    Copyright (c) 2002  XFree86 Inc
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <assert.h>
+#include <X11/extensions/XResproto.h>
+
+#include "dix/registry_priv.h"
+#include "os/client_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include "registry.h"
-#include <X11/extensions/XResproto.h>
 #include "pixmapstr.h"
 #include "windowstr.h"
 #include "gcstruct.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
-#include "client.h"
 #include "list.h"
 #include "misc.h"
 #include <string.h>
@@ -34,6 +34,8 @@
 #include "compint.h"
 #endif
 
+Bool noResExtension = FALSE;
+
 /** @brief Holds fragments of responses for ConstructClientIds.
  *
  *  note: there is no consideration for data alignment */
@@ -1078,7 +1080,6 @@ static int _X_COLD
 SProcResDispatch (ClientPtr client)
 {
     REQUEST(xReq);
-    swaps(&stuff->length);
 
     switch (stuff->data) {
     case X_XResQueryVersion:

Xext/xselinux.h

@@ -136,4 +136,12 @@ typedef struct {
     CARD32 pad6;
 } SELinuxListItemsReply;
 
+#ifdef XSELINUX
+#define SELINUX_MODE_DEFAULT    0
+#define SELINUX_MODE_DISABLED   1
+#define SELINUX_MODE_PERMISSIVE 2
+#define SELINUX_MODE_ENFORCING  3
+extern int selinuxEnforcingState;
+#endif
+
 #endif                          /* _XSELINUX_H */

Xext/xselinux_ext.c

@@ -17,16 +17,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
+
+#include "dix/dix_priv.h"
+#include "dix/property_priv.h"
 
 #include "selection.h"
 #include "inputstr.h"
 #include "windowstr.h"
 #include "propertyst.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "xselinuxint.h"
 
 #define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid)
@@ -44,6 +45,9 @@ typedef struct {
     CARD32 id;
 } SELinuxListItemRec;
 
+Bool noSELinuxExtension = FALSE;
+int selinuxEnforcingState = SELINUX_MODE_DEFAULT;
+
 /*
  * Extension Dispatch
  */
@@ -66,7 +70,6 @@ ProcSELinuxQueryVersion(ClientPtr client)
     SELinuxQueryVersionReply rep = {
         .type = X_Reply,
         .sequenceNumber = client->sequence,
-        .length = 0,
         .server_major = SELINUX_MAJOR_VERSION,
         .server_minor = SELINUX_MINOR_VERSION
     };
@@ -83,7 +86,6 @@ ProcSELinuxQueryVersion(ClientPtr client)
 static int
 SELinuxSendContextReply(ClientPtr client, security_id_t sid)
 {
-    SELinuxGetContextReply rep;
     char *ctx = NULL;
     int len = 0;
 
@@ -93,7 +95,7 @@ SELinuxSendContextReply(ClientPtr client, security_id_t sid)
         len = strlen(ctx) + 1;
     }
 
-    rep = (SELinuxGetContextReply) {
+    SELinuxGetContextReply rep = {
         .type = X_Reply,
         .sequenceNumber = client->sequence,
         .length = bytes_to_int32(len),
@@ -340,13 +342,9 @@ static int
 SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec * items,
                          int size, int count)
 {
-    int rc, k, pos = 0;
-    SELinuxListItemsReply rep;
-    CARD32 *buf;
-
-    buf = calloc(size, sizeof(CARD32));
+    int rc = BadAlloc, k, pos = 0;
+    CARD32 *buf = calloc(size, sizeof(CARD32));
     if (size && !buf) {
-        rc = BadAlloc;
         goto out;
     }
 
@@ -374,7 +372,7 @@ SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec * items,
     }
 
     /* Send reply to client */
-    rep = (SELinuxListItemsReply) {
+    SELinuxListItemsReply rep = {
         .type = X_Reply,
         .sequenceNumber = client->sequence,
         .length = size,
@@ -621,8 +619,6 @@ SProcSELinuxDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
-    swaps(&stuff->length);
-
     switch (stuff->data) {
     case X_SELinuxQueryVersion:
         return SProcSELinuxQueryVersion(client);

Xext/xselinux_hooks.c

@@ -22,17 +22,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * All rights reserved.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
+#include <errno.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #include <stdarg.h>
-
 #include <libaudit.h>
-
 #include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
+
+#include "dix/registry_priv.h"
+#include "os/client_priv.h"
+
 #include "selection.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -40,7 +42,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "propertyst.h"
 #include "extnsionst.h"
 #include "xacestr.h"
-#include "client.h"
 #define _XSELINUX_NEED_FLASK_MAP
 #include "xselinuxint.h"
 
@@ -199,7 +200,7 @@ SELinuxLabelInitial(void)
 
         /* Do the default colormap */
         dixLookupResourceByType(&unused, screenInfo.screens[i]->defColormap,
-                                RT_COLORMAP, serverClient, DixCreateAccess);
+                                X11_RESTYPE_COLORMAP, serverClient, DixCreateAccess);
     }
 }
 
@@ -662,7 +663,7 @@ SELinuxResource(CallbackListPtr *pcbl, void *unused, void *calldata)
         rec->status = rc;
 
     /* Perform the background none check on windows */
-    if (access_mode & DixCreateAccess && rec->rtype == RT_WINDOW) {
+    if (access_mode & DixCreateAccess && rec->rtype == X11_RESTYPE_WINDOW) {
         rc = SELinuxDoCheck(subj, obj, class, DixBlendAccess, &auditdata);
         if (rc != Success)
             ((WindowPtr) rec->res)->forcedBG = TRUE;
@@ -764,7 +765,7 @@ SELinuxResourceState(CallbackListPtr *pcbl, void *unused, void *calldata)
     SELinuxObjectRec *obj;
     WindowPtr pWin;
 
-    if (rec->type != RT_WINDOW)
+    if (rec->type != X11_RESTYPE_WINDOW)
         return;
     if (rec->state != ResourceStateAdding)
         return;

Xext/xselinux_label.c

@@ -17,13 +17,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <selinux/label.h>
 
-#include "registry.h"
+#include "dix/registry_priv.h"
+
 #include "xselinuxint.h"
 
 /* selection and property atom cache */
@@ -322,13 +321,13 @@ SELinuxTypeToClass(RESTYPE type)
 
         if (type & RC_DRAWABLE)
             class = SECCLASS_X_DRAWABLE;
-        else if (type == RT_GC)
+        else if (type == X11_RESTYPE_GC)
             class = SECCLASS_X_GC;
-        else if (type == RT_FONT)
+        else if (type == X11_RESTYPE_FONT)
             class = SECCLASS_X_FONT;
-        else if (type == RT_CURSOR)
+        else if (type == X11_RESTYPE_CURSOR)
             class = SECCLASS_X_CURSOR;
-        else if (type == RT_COLORMAP)
+        else if (type == X11_RESTYPE_COLORMAP)
             class = SECCLASS_X_COLORMAP;
         else {
             /* Need to do a string lookup */