From 895f40792a14d8b88923bf3b428d31ae3bb31e46 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 2 Dec 2009 17:43:01 -0800 Subject: Add type name argument to CreateNewResourceType Convert all calls of CreateNewResourceType to pass name argument Breaks DIX ABI. ABI versions bumped: Signed-off-by: Alan Coopersmith Reviewed-by: Keith Packard Signed-off-by: Keith Packard --- Xext/mbuf.c | 18 +++++++----------- Xext/panoramiX.c | 18 ++++++++---------- Xext/saver.c | 12 +++++------- Xext/security.c | 10 +++++----- Xext/shape.c | 7 ++----- Xext/shm.c | 4 +--- Xext/sleepuntil.c | 5 ++--- Xext/sync.c | 16 +++++----------- Xext/xvdisp.c | 5 +---- Xext/xvmain.c | 23 ++++++++++------------- Xext/xvmc.c | 13 ++++++------- 11 files changed, 52 insertions(+), 79 deletions(-) (limited to 'Xext') diff --git a/Xext/mbuf.c b/Xext/mbuf.c index 02354b0ac..aacb9cfde 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -42,8 +42,6 @@ in this Software without prior written authorization from The Open Group. #include "opaque.h" #include "sleepuntil.h" #include "inputstr.h" -#include "registry.h" - #include #include @@ -469,12 +467,15 @@ MultibufferExtensionInit() * create the resource types */ MultibufferDrawableResType = - CreateNewResourceType(MultibufferDrawableDelete); + CreateNewResourceType(MultibufferDrawableDelete, "MultibufferDrawable"); if (MultiBufferDrawableResType) MultibufferDrawableResType |= RC_DRAWABLE; - MultibufferResType = CreateNewResourceType(MultibufferDelete); - MultibuffersResType = CreateNewResourceType(MultibuffersDelete); - OtherClientResType = CreateNewResourceType(OtherClientDelete); + MultibufferResType = CreateNewResourceType(MultibufferDelete, + "MultibufferBuffer"); + MultibuffersResType = CreateNewResourceType(MultibuffersDelete, + "MultibufferWindow"); + OtherClientResType = CreateNewResourceType(OtherClientDelete, + "MultibufferOtherClient"); if (MultibufferDrawableResType && MultibufferResType && MultibuffersResType && OtherClientResType && (extEntry = AddExtension(MULTIBUFFER_PROTOCOL_NAME, @@ -483,11 +484,6 @@ MultibufferExtensionInit() ProcMultibufferDispatch, SProcMultibufferDispatch, MultibufferResetProc, StandardMinorOpcode))) { - RegisterResourceName(MultibufferDrawableResType, - "MultibufferDrawable"); - RegisterResourceName(MultibufferResType, "MultibufferBuffer"); - RegisterResourceName(MultibuffersResType, "MultibufferWindow"); - RegisterResourceName(OtherClientResType, "MultibufferOtherClient"); MultibufferEventBase = extEntry->eventBase; MultibufferErrorBase = extEntry->errorBase; EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent; diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 2a950eefc..cfeba017f 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -52,7 +52,6 @@ Equipment Corporation. #include "globals.h" #include "servermd.h" #include "resource.h" -#include "registry.h" #ifdef RENDER #include "picturestr.h" #endif @@ -504,21 +503,20 @@ void PanoramiXExtensionInit(int argc, char *argv[]) } XRC_DRAWABLE = CreateNewResourceClass(); - XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource); + XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource, + "XineramaWindow"); if (XRT_WINDOW) XRT_WINDOW |= XRC_DRAWABLE; - XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource); + XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource, + "XineramaPixmap"); if (XRT_PIXMAP) XRT_PIXMAP |= XRC_DRAWABLE; - XRT_GC = CreateNewResourceType(XineramaDeleteResource); - XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource); + XRT_GC = CreateNewResourceType(XineramaDeleteResource, + "XineramaGC"); + XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource, + "XineramaColormap"); if (XRT_WINDOW && XRT_PIXMAP && XRT_GC && XRT_COLORMAP) { - RegisterResourceName(XRT_WINDOW, "XineramaWindow"); - RegisterResourceName(XRT_PIXMAP, "XineramaPixmap"); - RegisterResourceName(XRT_GC, "XineramaGC"); - RegisterResourceName(XRT_COLORMAP, "XineramaColormap"); - panoramiXGeneration = serverGeneration; success = TRUE; } diff --git a/Xext/saver.c b/Xext/saver.c index 5757f8519..2549e8a31 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -47,7 +47,6 @@ 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" @@ -253,9 +252,11 @@ ScreenSaverExtensionInit(INITARGS) int i; ScreenPtr pScreen; - AttrType = CreateNewResourceType(ScreenSaverFreeAttr); - SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents); - SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend); + AttrType = CreateNewResourceType(ScreenSaverFreeAttr, "SaverAttr"); + SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents, + "SaverEvent"); + SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend, + "SaverSuspend"); for (i = 0; i < screenInfo.numScreens; i++) { @@ -267,9 +268,6 @@ ScreenSaverExtensionInit(INITARGS) ProcScreenSaverDispatch, SProcScreenSaverDispatch, NULL, StandardMinorOpcode))) { - RegisterResourceName(AttrType, "SaverAttr"); - RegisterResourceName(SaverEventType, "SaverEvent"); - RegisterResourceName(SuspendType, "SaverSuspend"); ScreenSaverEventBase = extEntry->eventBase; EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent; } diff --git a/Xext/security.c b/Xext/security.c index 2cd0e1774..af8d2052f 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1105,17 +1105,17 @@ SecurityExtensionInit(INITARGS) int ret = TRUE; SecurityAuthorizationResType = - CreateNewResourceType(SecurityDeleteAuthorization); + CreateNewResourceType(SecurityDeleteAuthorization, + "SecurityAuthorization"); - RTEventClient = CreateNewResourceType( - SecurityDeleteAuthorizationEventClient); + RTEventClient = + CreateNewResourceType(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 247f21bee..cb4126b44 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -40,7 +40,6 @@ 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 #include "regionstr.h" @@ -128,15 +127,13 @@ ShapeExtensionInit(void) { ExtensionEntry *extEntry; - ClientType = CreateNewResourceType(ShapeFreeClient); - ShapeEventType = CreateNewResourceType(ShapeFreeEvents); + ClientType = CreateNewResourceType(ShapeFreeClient, "ShapeClient"); + ShapeEventType = CreateNewResourceType(ShapeFreeEvents, "ShapeEvent"); if (ClientType && ShapeEventType && (extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0, ProcShapeDispatch, SProcShapeDispatch, NULL, StandardMinorOpcode))) { - RegisterResourceName(ClientType, "ShapeClient"); - RegisterResourceName(ShapeEventType, "ShapeEvent"); ShapeEventBase = extEntry->eventBase; EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent; } diff --git a/Xext/shm.c b/Xext/shm.c index 589155d0d..ab58c2750 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -52,7 +52,6 @@ in this Software without prior written authorization from The Open Group. #include "servermd.h" #include "shmint.h" #include "xace.h" -#include "registry.h" #include #include #include "protocol-versions.h" @@ -278,13 +277,12 @@ ShmExtensionInit(INITARGS) screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap; } } - ShmSegType = CreateNewResourceType(ShmDetachSegment); + ShmSegType = CreateNewResourceType(ShmDetachSegment, "ShmSeg"); if (ShmSegType && (extEntry = AddExtension(SHMNAME, ShmNumberEvents, ShmNumberErrors, ProcShmDispatch, SProcShmDispatch, ShmResetProc, StandardMinorOpcode))) { - RegisterResourceName(ShmSegType, "ShmSeg"); ShmReqCode = (unsigned char)extEntry->base; ShmCompletionCode = extEntry->eventBase; BadShmSegCode = extEntry->errorBase; diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 6b5964ec7..075f428d4 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -39,7 +39,6 @@ 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; @@ -88,10 +87,10 @@ ClientSleepUntil (ClientPtr client, if (SertafiedGeneration != serverGeneration) { - SertafiedResType = CreateNewResourceType (SertafiedDelete); + SertafiedResType = CreateNewResourceType (SertafiedDelete, + "ClientSleep"); if (!SertafiedResType) return FALSE; - RegisterResourceName(SertafiedResType, "ClientSleep"); SertafiedGeneration = serverGeneration; BlockHandlerRegistered = FALSE; } diff --git a/Xext/sync.c b/Xext/sync.c index b3bba1734..ce6531467 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -64,7 +64,6 @@ PERFORMANCE OF THIS SOFTWARE. #include "extnsionst.h" #include "dixstruct.h" #include "resource.h" -#include "registry.h" #include "opaque.h" #include #include "syncsrv.h" @@ -874,12 +873,11 @@ SyncCreateSystemCounter( */ if (RTCounter == 0) { - RTCounter = CreateNewResourceType(FreeCounter); + RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter"); if (RTCounter == 0) { return NULL; } - RegisterResourceName(RTCounter, "SyncCounter"); } pCounter = SyncCreateCounter(NULL, FakeClientID(0), initial); @@ -2112,13 +2110,13 @@ SyncExtensionInit(void) if (RTCounter == 0) { - RTCounter = CreateNewResourceType(FreeCounter); + RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter"); } - RTAlarm = CreateNewResourceType(FreeAlarm); - RTAwait = CreateNewResourceType(FreeAwait); + RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm"); + RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait"); if (RTAwait) RTAwait |= RC_NEVERRETAIN; - RTAlarmClient = CreateNewResourceType(FreeAlarmClient); + RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient"); if (RTAlarmClient) RTAlarmClient |= RC_NEVERRETAIN; @@ -2135,10 +2133,6 @@ SyncExtensionInit(void) return; } - RegisterResourceName(RTCounter, "SyncCounter"); - RegisterResourceName(RTAlarm, "SyncAlarm"); - RegisterResourceName(RTAwait, "SyncAwait"); - RegisterResourceName(RTAlarmClient, "SyncAlarmClient"); SyncEventBase = extEntry->eventBase; SyncErrorBase = extEntry->errorBase; EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent; diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index e674dfdca..b6fc34ff9 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -36,7 +36,6 @@ SOFTWARE. #include "gcstruct.h" #include "dixstruct.h" #include "resource.h" -#include "registry.h" #include "opaque.h" #include @@ -1864,12 +1863,10 @@ void XineramifyXv(void) XvAdaptorPtr MatchingAdaptors[MAXSCREENS]; int i, j, k, l; - XvXRTPort = CreateNewResourceType(XineramaDeleteResource); + XvXRTPort = CreateNewResourceType(XineramaDeleteResource, "XvXRTPort"); if (!xvsp0 || !XvXRTPort) return; - RegisterResourceName(XvXRTPort, "XvXRTPort"); - for(i = 0; i < xvsp0->nAdaptors; i++) { refAdapt = xvsp0->pAdaptors + i; diff --git a/Xext/xvmain.c b/Xext/xvmain.c index c33c209a9..05a68907a 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -90,7 +90,6 @@ SOFTWARE. #include "extnsionst.h" #include "dixstruct.h" #include "resource.h" -#include "registry.h" #include "opaque.h" #include "input.h" @@ -209,47 +208,45 @@ CreateResourceTypes(void) XvResourceGeneration = serverGeneration; - if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort))) + if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort, "XvRTPort"))) { ErrorF("CreateResourceTypes: failed to allocate port resource.\n"); return FALSE; } - RegisterResourceName(XvRTPort, "XvRTPort"); - if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab))) + if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab, "XvRTGrab"))) { ErrorF("CreateResourceTypes: failed to allocate grab resource.\n"); return FALSE; } - RegisterResourceName(XvRTGrab, "XvRTGrab"); - if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding))) + if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding, + "XvRTEncoding"))) { ErrorF("CreateResourceTypes: failed to allocate encoding resource.\n"); return FALSE; } - RegisterResourceName(XvRTEncoding, "XvRTEncoding"); - if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify))) + if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify, + "XvRTVideoNotify"))) { ErrorF("CreateResourceTypes: failed to allocate video notify resource.\n"); return FALSE; } - RegisterResourceName(XvRTVideoNotify, "XvRTVideoNotify"); - if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList))) + if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList, + "XvRTVideoNotifyList"))) { ErrorF("CreateResourceTypes: failed to allocate video notify list resource.\n"); return FALSE; } - RegisterResourceName(XvRTVideoNotifyList, "XvRTVideoNotifyList"); - if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify))) + if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify, + "XvRTPortNotify"))) { ErrorF("CreateResourceTypes: failed to allocate port notify resource.\n"); return FALSE; } - RegisterResourceName(XvRTPortNotify, "XvRTPortNotify"); return TRUE; diff --git a/Xext/xvmc.c b/Xext/xvmc.c index 0a233b115..c85f85eb4 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -11,7 +11,6 @@ #include "os.h" #include "dixstruct.h" #include "resource.h" -#include "registry.h" #include "scrnintstr.h" #include "extnsionst.h" #include "servermd.h" @@ -675,17 +674,17 @@ XvMCExtensionInit(void) if(XvMCScreenKey == NULL) /* nobody supports it */ return; - if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes))) + if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes, + "XvMCRTContext"))) return; - RegisterResourceName(XvMCRTContext, "XvMCRTContext"); - if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes))) + if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes, + "XvMCRTSurface"))) return; - RegisterResourceName(XvMCRTSurface, "XvMCRTSurface"); - if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes))) + if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes, + "XvMCRTSubpicture"))) return; - RegisterResourceName(XvMCRTSubpicture, "XvMCRTSubpicture"); extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors, ProcXvMCDispatch, SProcXvMCDispatch, -- cgit v1.2.3