From 011fdb9ba7d3e1b412982e640e140f9f6706b2ab Mon Sep 17 00:00:00 2001

Date: Wed, 2 Dec 2009 17:11:52 -0800

Subject: [PATCH] Ensure all resource types created have names registered

Calls RegisterResourceName to record the type name for

use by X-Resource, XACE/SELinux/XTsol, and DTrace.

Does not change ABI so is safe for applying to stable branches

 Xext/mbuf.c                           |   10 +++++++++-

 Xext/panoramiX.c                      |   18 +++++++++++++-----

 Xext/saver.c                          |    4 ++++

 Xext/shape.c                          |    3 +++

 Xext/shm.c                            |    2 ++

 Xext/sleepuntil.c                     |    2 ++

 Xext/sync.c                           |   12 ++++++++++--

 Xext/xvdisp.c                         |    5 ++++-

 Xext/xvmain.c                         |   15 +++++++++++----

 Xext/xvmc.c                           |    4 ++++

 Xi/extinit.c                          |    2 ++

 composite/compext.c                   |    6 ++++++

 damageext/damageext.c                 |    3 +++

 dbe/dbe.c                             |   10 +++++++++-

 glx/glxext.c                          |    3 +++

 hw/dmx/glxProxy/glxext.c              |   11 +++++++++++

 hw/kdrive/ephyr/ephyrdriext.c         |    6 ++++++

 hw/xfree86/dixmods/extmod/xf86vmode.c |    2 ++

 hw/xfree86/dri/dri.c                  |    6 ++++++

 hw/xfree86/dri/xf86dri.c              |    4 ++++

 hw/xfree86/dri2/dri2ext.c             |    9 ++++++++-

 hw/xquartz/applewm.c                  |    3 +++

 hw/xquartz/xpr/dri.c                  |    6 +++++-

 hw/xwin/winwindowswm.c                |    3 +++

 mi/miarc.c                            |    2 ++

 randr/randr.c                         |    4 ++++

 record/record.c                       |    2 ++

 render/render.c                       |    4 ++++

 xfixes/cursor.c                       |    9 ++++++++-

 xfixes/region.c                       |    6 +++++-

 xfixes/select.c                       |    6 ++++++

 xkb/xkb.c                             |    7 ++++++-

 32 files changed, 170 insertions(+), 19 deletions(-)

index 1f24974..51e927a 100644

@@ -42,6 +42,8 @@ in this Software without prior written authorization from The Open Group.

 #include "opaque.h"

 #include "sleepuntil.h"

 #include "inputstr.h"

+#include "registry.h"

+

 #include <X11/extensions/multibufconst.h>

 #include <X11/extensions/multibufproto.h>

@@ -467,7 +469,7 @@ MultibufferExtensionInit()

+	CreateNewResourceType(MultibufferDrawableDelete);

     MultibufferResType = CreateNewResourceType(MultibufferDelete);

     MultibuffersResType = CreateNewResourceType(MultibuffersDelete);

     OtherClientResType = CreateNewResourceType(OtherClientDelete);

@@ -479,6 +481,12 @@ MultibufferExtensionInit()

+	RegisterResourceName(MultibufferDrawableResType,

+			     "MultibufferDrawable");

+	RegisterResourceName(MultibufferResType, "MultibufferBuffer");

+	RegisterResourceName(MultibuffersResType, "MultibufferWindow");

+	RegisterResourceName(OtherClientResType, "MultibufferOtherClient");

index 4b7b07e..507eec2 100644

@@ -52,6 +52,7 @@ Equipment Corporation.

 #include "globals.h"

 #include "servermd.h"

 #include "resource.h"

+#include "registry.h"

 #ifdef RENDER

 #include "picturestr.h"

 #endif

@@ -503,15 +504,22 @@ void PanoramiXExtensionInit(int argc, char *argv[])

+	XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource);

+	XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource);

 	XRT_GC = CreateNewResourceType(XineramaDeleteResource);

 	XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource);

+	    RegisterResourceName(XRT_WINDOW, "XineramaWindow");

+	    RegisterResourceName(XRT_PIXMAP, "XineramaPixmap");

+	    RegisterResourceName(XRT_GC, "XineramaGC");

+	    RegisterResourceName(XRT_COLORMAP, "XineramaColormap");

+

index 04e6497..5757f85 100644

@@ -47,6 +47,7 @@ in this Software without prior written authorization from the X Consortium.

 #include "cursorstr.h"

 #include "colormapst.h"

 #include "xace.h"

+#include "registry.h"

 #ifdef PANORAMIX

 #include "panoramiX.h"

 #include "panoramiXsrv.h"

@@ -266,6 +267,9 @@ ScreenSaverExtensionInit(INITARGS)

 				 ProcScreenSaverDispatch, SProcScreenSaverDispatch,

 				 NULL, StandardMinorOpcode)))

+	RegisterResourceName(AttrType, "SaverAttr");

+	RegisterResourceName(SaverEventType, "SaverEvent");

+	RegisterResourceName(SuspendType, "SaverSuspend");

 	ScreenSaverEventBase = extEntry->eventBase;

 	EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;

     }

index 700fe76..247f21b 100644

@@ -40,6 +40,7 @@ in this Software without prior written authorization from The Open Group.

 #include "extnsionst.h"

 #include "dixstruct.h"

 #include "resource.h"

+#include "registry.h"

 #include "opaque.h"

 #include <X11/extensions/shapeproto.h>

 #include "regionstr.h"

@@ -134,6 +135,8 @@ ShapeExtensionInit(void)

 				 NULL, StandardMinorOpcode)))

     {

+	RegisterResourceName(ClientType, "ShapeClient");

+	RegisterResourceName(ShapeEventType, "ShapeEvent");

 	ShapeEventBase = extEntry->eventBase;

 	EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;

     }

index 9e462f2..589155d 100644

@@ -52,6 +52,7 @@ in this Software without prior written authorization from The Open Group.

 #include "servermd.h"

 #include "shmint.h"

 #include "xace.h"

+#include "registry.h"

 #include <X11/extensions/shmproto.h>

 #include <X11/Xfuncproto.h>

 #include "protocol-versions.h"

@@ -283,6 +284,7 @@ ShmExtensionInit(INITARGS)

 				 ShmResetProc, StandardMinorOpcode)))

     {

+	RegisterResourceName(ShmSegType, "ShmSeg");

 	ShmReqCode = (unsigned char)extEntry->base;

 	ShmCompletionCode = extEntry->eventBase;

 	BadShmSegCode = extEntry->errorBase;

index 2616a5e..6b5964e 100644

@@ -39,6 +39,7 @@ in this Software without prior written authorization from The Open Group.

 #include "dixstruct.h"

 #include "pixmapstr.h"

 #include "scrnintstr.h"

+#include "registry.h"

 typedef struct _Sertafied {

     struct _Sertafied	*next;

@@ -90,6 +91,7 @@ ClientSleepUntil (ClientPtr client,

 	SertafiedResType = CreateNewResourceType (SertafiedDelete);

+	RegisterResourceName(SertafiedResType, "ClientSleep");

 	BlockHandlerRegistered = FALSE;

     }

index 667f8ab..b1c8cb8 100644

@@ -64,6 +64,7 @@ PERFORMANCE OF THIS SOFTWARE.

 #include "extnsionst.h"

 #include "dixstruct.h"

 #include "resource.h"

+#include "registry.h"

 #include "opaque.h"

 #include <X11/extensions/syncproto.h>

 #include "syncsrv.h"

@@ -878,6 +879,7 @@ SyncCreateSystemCounter(

 	    return NULL;

 	}

+	RegisterResourceName(RTCounter, "SyncCounter");

     }

     pCounter = SyncCreateCounter(NULL, FakeClientID(0), initial);

@@ -2113,8 +2115,8 @@ SyncExtensionInit(void)

 	RTCounter = CreateNewResourceType(FreeCounter);

     RTAlarm = CreateNewResourceType(FreeAlarm);

+    RTAwait = CreateNewResourceType(FreeAwait);

+    RTAlarmClient = CreateNewResourceType(FreeAlarmClient);

@@ -2129,6 +2131,12 @@ SyncExtensionInit(void)

+    RegisterResourceName(RTCounter, "SyncCounter");

+    RegisterResourceName(RTAlarm, "SyncAlarm");

+    RegisterResourceName(RTAwait, "SyncAwait");

+    RegisterResourceName(RTAlarmClient, "SyncAlarmClient");

index 5229916..4a38b82 100644

@@ -36,6 +36,7 @@ SOFTWARE.

 #include "gcstruct.h"

 #include "dixstruct.h"

 #include "resource.h"

+#include "registry.h"

 #include "opaque.h"

 #include <X11/extensions/Xv.h>

@@ -1865,7 +1866,9 @@ void XineramifyXv(void)

    XvXRTPort = CreateNewResourceType(XineramaDeleteResource);

-   if(!xvsp0) return;

+   if (!xvsp0 || !XvXRTPort) return;

+

+   RegisterResourceName(XvXRTPort, "XvXRTPort");

    for(i = 0; i < xvsp0->nAdaptors; i++) {

       refAdapt = xvsp0->pAdaptors + i;

index 7c8a3c3..c33c209 100644

@@ -90,6 +90,7 @@ SOFTWARE.

 #include "extnsionst.h"

 #include "dixstruct.h"

 #include "resource.h"

+#include "registry.h"

 #include "opaque.h"

 #include "input.h"

@@ -213,36 +214,42 @@ CreateResourceTypes(void)

+  RegisterResourceName(XvRTPort, "XvRTPort");

   if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab)))

+  RegisterResourceName(XvRTGrab, "XvRTGrab");

   if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding)))

+  RegisterResourceName(XvRTEncoding, "XvRTEncoding");

   if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify)))

+  RegisterResourceName(XvRTVideoNotify, "XvRTVideoNotify");

   if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList)))

+  RegisterResourceName(XvRTVideoNotifyList, "XvRTVideoNotifyList");

   if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify)))

     }

+  RegisterResourceName(XvRTPortNotify, "XvRTPortNotify");

   return TRUE;

index c17a4b1..0a233b1 100644

@@ -11,6 +11,7 @@

 #include "os.h"

 #include "dixstruct.h"

 #include "resource.h"

+#include "registry.h"

 #include "scrnintstr.h"

 #include "extnsionst.h"

 #include "servermd.h"

@@ -676,12 +677,15 @@ XvMCExtensionInit(void)

    if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes)))

+   RegisterResourceName(XvMCRTContext, "XvMCRTContext");

    if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes)))

+   RegisterResourceName(XvMCRTSurface, "XvMCRTSurface");

    if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes)))

 	return;

+   RegisterResourceName(XvMCRTSubpicture, "XvMCRTSubpicture");

                               ProcXvMCDispatch, SProcXvMCDispatch,

index 0c12919..372f77f 100644

@@ -1270,6 +1270,8 @@ XInputExtensionInit(void)

 	XIVersion = thisversion;

 	RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone);

 	RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT");

index 976d002..c63bd02 100644

@@ -53,6 +53,7 @@

 #include "compint.h"

 #include "xace.h"

+#include "registry.h"

 #include "protocol-versions.h"

 static CARD8	CompositeReqCode;

@@ -555,14 +556,19 @@ CompositeExtensionInit (void)

     CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow);

+    RegisterResourceName(CompositeClientWindowType, "CompositeClientWindow");

     CompositeClientSubwindowsType = CreateNewResourceType (FreeCompositeClientSubwindows);

+    RegisterResourceName(CompositeClientSubwindowsType,

+			 "CompositeClientSubwindows");

     CompositeClientOverlayType = CreateNewResourceType (FreeCompositeClientOverlay);

+    RegisterResourceName(CompositeClientOverlayType,

+			 "CompositeClientOverlay");

     if (!dixRequestPrivate(CompositeClientPrivateKey,

 			   sizeof(CompositeClientRec)))

index 449c2fd..044e8ef 100644

@@ -24,6 +24,7 @@

 #include <dix-config.h>

 #endif

+#include "registry.h"

 #include "damageextint.h"

 #include "protocol-versions.h"

@@ -500,10 +501,12 @@ DamageExtensionInit(void)

     DamageExtType = CreateNewResourceType (FreeDamageExt);

+    RegisterResourceName(DamageExtType, "DamageExt");

     DamageExtWinType = CreateNewResourceType (FreeDamageExtWin);

+    RegisterResourceName(DamageExtWinType, "DamageExtWin");

     if (!dixRequestPrivate(DamageClientPrivateKey, sizeof (DamageClientRec)))

 	return;

index a4f853d..78ce912 100644

@@ -54,6 +54,7 @@

 #include "dbestruct.h"

 #include "midbe.h"

 #include "xace.h"

+#include "registry.h"

 /* GLOBALS */

@@ -1573,9 +1574,16 @@ DbeExtensionInit(void)

+        CreateNewResourceType(DbeDrawableDelete);

         CreateNewResourceType(DbeWindowPrivDelete);

+    RegisterResourceName(dbeDrawableResType, "dbeDrawable");

+    RegisterResourceName(dbeWindowPrivResType, "dbeWindow");

+

index 9f9c0ed..546d968 100644

@@ -347,6 +347,9 @@ void GlxExtensionInit(void)

     __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);

     __glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone);

+

     RegisterResourceName(__glXContextRes, "GLXContext");

     RegisterResourceName(__glXDrawableRes, "GLXDrawable");

     RegisterResourceName(__glXSwapBarrierRes, "GLXSwapBarrier");

index b30d144..c00ae6e 100644

@@ -44,6 +44,7 @@

 #include "glxvisuals.h"

 #include "micmap.h"

 #include "glxswap.h"

+#include "registry.h"

 /*

 ** Stubs to satisfy miinitext.c references.

@@ -299,6 +300,16 @@ void GlxExtensionInit(void)

     __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone);

     __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone);

+    if (!__glXContextRes || !__glXClientRes || !__glXPixmapRes ||

+	!__glXWindowRes || !__glXPbufferRes)

+	return;

+