[Adjusted to apply to Xorg 1.5.3]

From 72978d1904966b4ae415ff0f45f565a3c9fe9898 Mon Sep 17 00:00:00 2001

From: Alan Coopersmith <[email protected]>

Date: Wed, 11 Feb 2009 19:59:46 -0800

Subject: [PATCH] Add helper function CreateNewResourceTypeNamed

Calls CreateNewResourceType to make a resource type, and if that

succeeds, calls RegisterResourceName to record the type name for

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

Signed-off-by: Alan Coopersmith <[email protected]>

---

 dix/resource.c     |   13 ++++++++++++-

 include/resource.h |    3 +++

 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/dix/resource.c b/dix/resource.c

index ec1d8cf..e3b0024 100644

--- a/dix/resource.c

+++ b/dix/resource.c

@@ -147,10 +147,10 @@ Equipment Corporation.

 #endif

 #include "xace.h"

 #include <assert.h>

+#include "registry.h"

 #ifdef XSERVER_DTRACE

 #include <sys/types.h>

-#include "registry.h"

 typedef const char *string;

 #include "Xserver-dtrace.h"

@@ -224,6 +224,17 @@ CreateNewResourceType(DeleteType deleteFunc)

     }

 }

+RESTYPE

+CreateNewResourceTypeNamed(DeleteType deleteFunc, char *name)

+{

+    RESTYPE res = CreateNewResourceType(deleteFunc);

+

+    if (res && name)

+	RegisterResourceName(res, name);

+

+    return res;

+}

+

 _X_EXPORT RESTYPE

 CreateNewResourceClass(void)

 {

diff --git a/include/resource.h b/include/resource.h

index cb6e064..8432a6b 100644

--- a/include/resource.h

+++ b/include/resource.h

@@ -157,6 +157,9 @@ typedef Bool (*FindComplexResType)(

 extern RESTYPE CreateNewResourceType(

     DeleteType /*deleteFunc*/);

+extern _X_EXPORT RESTYPE CreateNewResourceTypeNamed(

+    DeleteType /*deleteFunc*/, char * /*name*/);

+

 extern RESTYPE CreateNewResourceClass(void);

 extern Bool InitClientResources(

-- 

1.5.6.5

From 2b6e5a8f5af5eb92a6402efba5fc4cf44d85d28c Mon Sep 17 00:00:00 2001

From: Alan Coopersmith <[email protected]>

Date: Wed, 11 Feb 2009 20:03:35 -0800

Subject: [PATCH] Convert all calls of CreateNewResourceType to CreateNewResourceTypeNamed

Also cleaned up various bits of checking to see if CreateNewResourceType

failed, including several places where the result was |'ed with flag bits

before checking to see if it was 0.

Signed-off-by: Alan Coopersmith <[email protected]>

---

 Xext/geext.c                          |    4 ++--

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

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

 Xext/saver.c                          |    8 +++++---

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

 Xext/shape.c                          |    4 ++--

 Xext/shm.c                            |    2 +-

 Xext/sleepuntil.c                     |    3 ++-

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

 Xext/xvdisp.c                         |    2 +-

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

 Xext/xvmc.c                           |    9 ++++++---

 Xi/extinit.c                          |    6 ++++--

 composite/compext.c                   |    9 ++++++---

 damageext/damageext.c                 |    5 +++--

 dbe/dbe.c                             |    8 ++++++--

 glx/glxext.c                          |   11 ++++++++---

 hw/dmx/glxProxy/glxext.c              |   15 ++++++++++-----

 hw/kdrive/ephyr/ephyrdriext.c         |    2 +-

 hw/xfree86/dixmods/extmod/xf86vmode.c |    3 ++-

 hw/xfree86/dri/dri.c                  |    9 +++++++--

 hw/xfree86/dri/xf86dri.c              |    2 +-

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

 hw/xquartz/applewm.c                  |    4 ++--

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

 hw/xwin/winwindowswm.c                |    4 ++--

 mi/miarc.c                            |    3 ++-

 randr/randr.c                         |    4 ++--

 randr/rrcrtc.c                        |    4 +---

 randr/rrmode.c                        |    4 +---

 randr/rroutput.c                      |    5 ++---

 record/record.c                       |    3 ++-

 render/picture.c                      |   11 ++++-------

 render/render.c                       |    3 ++-

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

 xfixes/region.c                       |    2 +-

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

 xkb/xkb.c                             |    2 +-

 38 files changed, 158 insertions(+), 101 deletions(-)

diff --git a/Xext/mbuf.c b/Xext/mbuf.c

index 09399b6..dffe978 100644

--- a/Xext/mbuf.c

+++ b/Xext/mbuf.c

@@ -221,10 +221,14 @@ MultibufferExtensionInit()

      * create the resource types

      */

     MultibufferDrawableResType =

-	CreateNewResourceType(MultibufferDrawableDelete)|RC_DRAWABLE;

-    MultibufferResType = CreateNewResourceType(MultibufferDelete);

-    MultibuffersResType = CreateNewResourceType(MultibuffersDelete);

-    OtherClientResType = CreateNewResourceType(OtherClientDelete);

+	CreateNewResourceTypeNamed(MultibufferDrawableDelete,

+				   "MultibufferDrawable");

+    MultibufferResType = CreateNewResourceTypeNamed(MultibufferDelete,

+						    "MultibufferBuffer");

+    MultibuffersResType = CreateNewResourceTypeNamed(MultibuffersDelete,

+						     "MultibufferWindow");

+    OtherClientResType = CreateNewResourceTypeNamed(OtherClientDelete,

+						    "MultibufferOtherClient");

     if (MultibufferDrawableResType && MultibufferResType &&

 	MultibuffersResType && 	OtherClientResType &&

 	(extEntry = AddExtension(MULTIBUFFER_PROTOCOL_NAME,

@@ -233,6 +237,7 @@ MultibufferExtensionInit()

 				 ProcMultibufferDispatch, SProcMultibufferDispatch,

 				 MultibufferResetProc, StandardMinorOpcode)))

     {

+	MultibufferDrawableResType |= RC_DRAWABLE;

 	MultibufferEventBase = extEntry->eventBase;

 	MultibufferErrorBase = extEntry->errorBase;

 	EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent;

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c

index 0439668..f09227b 100644

--- a/Xext/panoramiX.c

+++ b/Xext/panoramiX.c

@@ -500,15 +500,21 @@ void PanoramiXExtensionInit(int argc, char *argv[])

 	}

 	XRC_DRAWABLE = CreateNewResourceClass();

-	XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource) | 

-						XRC_DRAWABLE;

-	XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource) | 

-						XRC_DRAWABLE;

-	XRT_GC = CreateNewResourceType(XineramaDeleteResource);

-	XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource);

+	XRT_WINDOW = CreateNewResourceTypeNamed(XineramaDeleteResource,

+						"XineramaWindow");

+	XRT_PIXMAP = CreateNewResourceTypeNamed(XineramaDeleteResource,

+						"XineramaPixmap");

+	XRT_GC = CreateNewResourceTypeNamed(XineramaDeleteResource,

+					    "XineramaGC");

+	XRT_COLORMAP = CreateNewResourceTypeNamed(XineramaDeleteResource,

+						  "XineramaColormap");

 	panoramiXGeneration = serverGeneration;

-	success = TRUE;

+	if (XRT_WINDOW && XRT_PIXMAP && XRT_GC && XRT_COLORMAP) {

+	    XRT_WINDOW |= XRC_DRAWABLE;

+	    XRT_PIXMAP |= XRC_DRAWABLE;

+	    success = TRUE;

+	}

     }

     if (!success) {

diff --git a/Xext/saver.c b/Xext/saver.c

index cd67749..f1b0f33 100644

--- a/Xext/saver.c

+++ b/Xext/saver.c

@@ -252,9 +252,11 @@ ScreenSaverExtensionInit(INITARGS)

     int		    i;

     ScreenPtr	    pScreen;

-    AttrType = CreateNewResourceType(ScreenSaverFreeAttr);

-    EventType = CreateNewResourceType(ScreenSaverFreeEvents);

-    SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend);

+    AttrType = CreateNewResourceTypeNamed(ScreenSaverFreeAttr, "SaverAttr");

+    EventType = CreateNewResourceTypeNamed(ScreenSaverFreeEvents,

+						"SaverEvent");

+    SuspendType = CreateNewResourceTypeNamed(ScreenSaverFreeSuspend,

+					     "SaverSuspend");

     for (i = 0; i < screenInfo.numScreens; i++)

     {

diff --git a/Xext/security.c b/Xext/security.c

index fc4691b..0c28ec0 100644

--- a/Xext/security.c

+++ b/Xext/security.c

@@ -1093,17 +1093,17 @@ SecurityExtensionInit(INITARGS)

     int ret = TRUE;

     SecurityAuthorizationResType =

-	CreateNewResourceType(SecurityDeleteAuthorization);

+	CreateNewResourceTypeNamed(SecurityDeleteAuthorization,

+				   "SecurityAuthorization");

-    RTEventClient = CreateNewResourceType(

-				SecurityDeleteAuthorizationEventClient);

+    RTEventClient = CreateNewResourceTypeNamed(

+				SecurityDeleteAuthorizationEventClient,

+				"SecurityEventClient");

     if (!SecurityAuthorizationResType || !RTEventClient)

 	return;

     RTEventClient |= RC_NEVERRETAIN;

-    RegisterResourceName(SecurityAuthorizationResType, "SecurityAuthorization");

-    RegisterResourceName(RTEventClient, "SecurityEventClient");

     /* Allocate the private storage */

     if (!dixRequestPrivate(stateKey, sizeof(SecurityStateRec)))

diff --git a/Xext/shape.c b/Xext/shape.c

index fbf8f8c..d1991ff 100644

--- a/Xext/shape.c

+++ b/Xext/shape.c

@@ -127,8 +127,8 @@ ShapeExtensionInit(void)

 {

     ExtensionEntry *extEntry;

-    ClientType = CreateNewResourceType(ShapeFreeClient);

-    EventType = CreateNewResourceType(ShapeFreeEvents);

+    ClientType = CreateNewResourceTypeNamed(ShapeFreeClient, "ShapeClient");

+    EventType = CreateNewResourceTypeNamed(ShapeFreeEvents, "ShapeEvent");

     if (ClientType && EventType &&

 	(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,

 				 ProcShapeDispatch, SProcShapeDispatch,

diff --git a/Xext/shm.c b/Xext/shm.c

index 7b63484..b2406e7 100644

--- a/Xext/shm.c

+++ b/Xext/shm.c

@@ -244,7 +244,7 @@ ShmExtensionInit(INITARGS)

 	    screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;

 	}

     }

-    ShmSegType = CreateNewResourceType(ShmDetachSegment);

+    ShmSegType = CreateNewResourceTypeNamed(ShmDetachSegment, "ShmSeg");

     if (ShmSegType &&

 	(extEntry = AddExtension(SHMNAME, ShmNumberEvents, ShmNumberErrors,

 				 ProcShmDispatch, SProcShmDispatch,

diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c

index 2616a5e..84a260f 100644

--- a/Xext/sleepuntil.c

+++ b/Xext/sleepuntil.c

@@ -87,7 +87,8 @@ ClientSleepUntil (ClientPtr client,

     if (SertafiedGeneration != serverGeneration)

     {

-	SertafiedResType = CreateNewResourceType (SertafiedDelete);

+	SertafiedResType = CreateNewResourceTypeNamed (SertafiedDelete,

+						       "ClientSleep");

 	if (!SertafiedResType)

 	    return FALSE;

 	SertafiedGeneration = serverGeneration;

diff --git a/Xext/sync.c b/Xext/sync.c

index 9236fab..5d2d77c 100644

--- a/Xext/sync.c

+++ b/Xext/sync.c

@@ -876,7 +876,7 @@ SyncCreateSystemCounter(

      */

     if (RTCounter == 0)

     {

-	RTCounter = CreateNewResourceType(FreeCounter);

+	RTCounter = CreateNewResourceTypeNamed(FreeCounter, "SyncCounter");

 	if (RTCounter == 0)

 	{

 	    return NULL;

@@ -2127,11 +2127,12 @@ SyncExtensionInit(void)

     if (RTCounter == 0)

     {

-	RTCounter = CreateNewResourceType(FreeCounter);

+	RTCounter = CreateNewResourceTypeNamed(FreeCounter, "SyncCounter");

     }

-    RTAlarm = CreateNewResourceType(FreeAlarm);

-    RTAwait = CreateNewResourceType(FreeAwait)|RC_NEVERRETAIN;

-    RTAlarmClient = CreateNewResourceType(FreeAlarmClient)|RC_NEVERRETAIN;

+    RTAlarm = CreateNewResourceTypeNamed(FreeAlarm, "SyncAlarm");

+    RTAwait = CreateNewResourceTypeNamed(FreeAwait, "SyncAwait");

+    RTAlarmClient = CreateNewResourceTypeNamed(FreeAlarmClient,

+					       "SyncAlarmClient");

     if (RTCounter == 0 || RTAwait == 0 || RTAlarm == 0 ||

 	RTAlarmClient == 0 ||

@@ -2146,6 +2147,8 @@ SyncExtensionInit(void)

 	return;

     }

+    RTAwait |= RC_NEVERRETAIN;

+    RTAlarmClient |= RC_NEVERRETAIN;

     SyncEventBase = extEntry->eventBase;

     SyncErrorBase = extEntry->errorBase;

     EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent;

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c

index 770c53a..bc8039d 100644

--- a/Xext/xvdisp.c

+++ b/Xext/xvdisp.c

@@ -1924,7 +1924,7 @@ void XineramifyXv(void)

    XvAdaptorPtr MatchingAdaptors[MAXSCREENS];

    int i, j, k, l;

-   XvXRTPort = CreateNewResourceType(XineramaDeleteResource);

+   XvXRTPort = CreateNewResourceTypeNamed(XineramaDeleteResource, "XvXRTPort");

    if(!xvsp0) return;

diff --git a/Xext/xvmain.c b/Xext/xvmain.c

index 4771946..92fba4f 100644

--- a/Xext/xvmain.c

+++ b/Xext/xvmain.c

@@ -208,37 +208,42 @@ CreateResourceTypes(void)

   XvResourceGeneration = serverGeneration;

-  if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort)))

+  if (!(XvRTPort = CreateNewResourceTypeNamed(XvdiDestroyPort, "XvRTPort")))

     {

       ErrorF("CreateResourceTypes: failed to allocate port resource.\n");

       return FALSE;

     }

-  

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

+

+  if (!(XvRTGrab = CreateNewResourceTypeNamed(XvdiDestroyGrab, "XvRTGrab")))

     {

       ErrorF("CreateResourceTypes: failed to allocate grab resource.\n");

       return FALSE;

     }

-  

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

+

+  if (!(XvRTEncoding = CreateNewResourceTypeNamed(XvdiDestroyEncoding,

+						  "XvRTEncoding")))

     {

       ErrorF("CreateResourceTypes: failed to allocate encoding resource.\n");

       return FALSE;

     }

-  

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

+

+  if (!(XvRTVideoNotify = CreateNewResourceTypeNamed(XvdiDestroyVideoNotify,

+						     "XvRTVideoNotify")))

     {

       ErrorF("CreateResourceTypes: failed to allocate video notify resource.\n");

       return FALSE;

     }

-  

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

+

+  if (!(XvRTVideoNotifyList =

+	CreateNewResourceTypeNamed(XvdiDestroyVideoNotifyList,

+				   "XvRTVideoNotifyList")))

     {

       ErrorF("CreateResourceTypes: failed to allocate video notify list resource.\n");

       return FALSE;

     }

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

+  if (!(XvRTPortNotify = CreateNewResourceTypeNamed(XvdiDestroyPortNotify,

+						    "XvRTPortNotify")))

     {

       ErrorF("CreateResourceTypes: failed to allocate port notify resource.\n");

       return FALSE;

diff --git a/Xext/xvmc.c b/Xext/xvmc.c

index 9166cf8..6eeaec0 100644

--- a/Xext/xvmc.c

+++ b/Xext/xvmc.c

@@ -670,13 +670,16 @@ XvMCExtensionInit(void)

    if(XvMCScreenKey == NULL) /* nobody supports it */

 	return; 

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

+   if(!(XvMCRTContext = CreateNewResourceTypeNamed(XvMCDestroyContextRes,

+						   "XvMCRTContext")))

 	return;

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

+   if(!(XvMCRTSurface = CreateNewResourceTypeNamed(XvMCDestroySurfaceRes,

+						   "XvMCRTSurface")))

 	return;

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

+   if(!(XvMCRTSubpicture = CreateNewResourceTypeNamed(XvMCDestroySubpictureRes,

+						      "XvMCRTSubpicture")))

 	return;

    extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors, 

diff --git a/Xi/extinit.c b/Xi/extinit.c

index a7a21ec..ffc4299 100644

--- a/Xi/extinit.c

+++ b/Xi/extinit.c

 	AllExtensionVersions[IReqCode - 128] = thisversion;

 	MakeDeviceTypeAtoms();

-	RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone);

-	RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT");

+	RT_INPUTCLIENT = CreateNewResourceTypeNamed(

+	    (DeleteType) InputClientGone, "INPUTCLIENT");

+	if (!RT_INPUTCLIENT)

+	    FatalError("Failed to add resource type for XI.\n");

 	FixExtensionEvents(extEntry);

 	ReplySwapVector[IReqCode] = (ReplySwapPtr) SReplyIDispatch;

 	EventSwapVector[DeviceValuator] = SEventIDispatch;

diff --git a/composite/compext.c b/composite/compext.c

index c154402..6fedc49 100644

--- a/composite/compext.c

+++ b/composite/compext.c

@@ -574,15 +574,18 @@ CompositeExtensionInit (void)

 	return;

 #endif

-    CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow);

+    CompositeClientWindowType = CreateNewResourceTypeNamed

+	(FreeCompositeClientWindow, "CompositeClientWindow");

     if (!CompositeClientWindowType)

 	return;

-    CompositeClientSubwindowsType = CreateNewResourceType (FreeCompositeClientSubwindows);

+    CompositeClientSubwindowsType = CreateNewResourceTypeNamed

+	(FreeCompositeClientSubwindows, "CompositeClientSubwindows");

     if (!CompositeClientSubwindowsType)

 	return;

-    CompositeClientOverlayType = CreateNewResourceType (FreeCompositeClientOverlay);

+    CompositeClientOverlayType = CreateNewResourceTypeNamed

+	(FreeCompositeClientOverlay, "CompositeClientOverlay");

     if (!CompositeClientOverlayType)

 	return;

diff --git a/damageext/damageext.c b/damageext/damageext.c

index 8fa1c53..26a7cb9 100644

--- a/damageext/damageext.c

+++ b/damageext/damageext.c

@@ -503,11 +503,12 @@ DamageExtensionInit(void)

     for (s = 0; s < screenInfo.numScreens; s++)

 	DamageSetup (screenInfo.screens[s]);

-    DamageExtType = CreateNewResourceType (FreeDamageExt);

+    DamageExtType = CreateNewResourceTypeNamed (FreeDamageExt, "DamageExt");

     if (!DamageExtType)

 	return;

-    DamageExtWinType = CreateNewResourceType (FreeDamageExtWin);

+    DamageExtWinType = CreateNewResourceTypeNamed (FreeDamageExtWin,

+						   "DamageExtWin");

     if (!DamageExtWinType)

 	return;

diff --git a/dbe/dbe.c b/dbe/dbe.c

index 3fd99df..11383a5 100644

--- a/dbe/dbe.c

+++ b/dbe/dbe.c

@@ -1568,9 +1568,13 @@ DbeExtensionInit(void)

     /* Create the resource types. */

     dbeDrawableResType =

-        CreateNewResourceType(DbeDrawableDelete) | RC_DRAWABLE;

+        CreateNewResourceTypeNamed(DbeDrawableDelete, "dbeDrawable");

     dbeWindowPrivResType =

-        CreateNewResourceType(DbeWindowPrivDelete);

+        CreateNewResourceTypeNamed(DbeWindowPrivDelete, "dbeWindow");

+    if (!dbeDrawableResType || !dbeWindowPrivResType)

+	return;

+    dbeDrawableResType |= RC_DRAWABLE;

+

     if (!dixRegisterPrivateOffset(dbeDrawableResType,

 				  offsetof(PixmapRec, devPrivates)))

 	return;

diff --git a/glx/glxext.c b/glx/glxext.c

index 025e619..f5083de 100644

--- a/glx/glxext.c

+++ b/glx/glxext.c

@@ -291,9 +291,14 @@ void GlxExtensionInit(void)

     __GLXprovider *p;

     Bool glx_provided = False;

-    __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);

-    __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);

-    __glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone);

+    __glXContextRes = CreateNewResourceTypeNamed((DeleteType)ContextGone,

+						 "GLXContext");

+    __glXDrawableRes = CreateNewResourceTypeNamed((DeleteType)DrawableGone,

+						  "GLXDrawable");

+    __glXSwapBarrierRes = CreateNewResourceTypeNamed(

+	(DeleteType)SwapBarrierGone, "GLXSwapBarrier");

+    if (!__glXContextRes || !__glXDrawableRes || !__glXSwapBarrierRes)

+	return;

     if (!dixRequestPrivate(glxClientPrivateKey, sizeof (__GLXclientState)))

 	return;

diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c

index b30d144..74ae8f0 100644

--- a/hw/dmx/glxProxy/glxext.c

+++ b/hw/dmx/glxProxy/glxext.c

@@ -293,11 +293,16 @@ void GlxExtensionInit(void)

        return;

     }

-    __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);

-    __glXClientRes = CreateNewResourceType((DeleteType)ClientGone);

-    __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);

-    __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone);

-    __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone);

+    __glXContextRes = CreateNewResourceTypeNamed((DeleteType)ContextGone,

+						 "GLXContext");

+    __glXClientRes = CreateNewResourceTypeNamed((DeleteType)ClientGone,

+					   "GLXClient");

+    __glXPixmapRes = CreateNewResourceTypeNamed((DeleteType)PixmapGone,

+						"GLXPixmap");