From d8432fdd4f13e9f9d1d44f5482faeb56562661a9 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 20 Dec 2009 21:08:15 +0000 Subject: Switched to xorg-server-1.7.99.2 --- xorg-server/Xext/Makefile.in | 14 +++++++++++++- xorg-server/Xext/mbuf.c | 13 +++++++++---- xorg-server/Xext/panoramiX.c | 26 +++++++++++++++++--------- xorg-server/Xext/saver.c | 8 +++++--- xorg-server/Xext/security.c | 10 +++++----- xorg-server/Xext/shape.c | 4 ++-- xorg-server/Xext/shm.c | 2 +- xorg-server/Xext/sleepuntil.c | 3 ++- xorg-server/Xext/sync.c | 14 +++++++++----- xorg-server/Xext/xvdisp.c | 6 +++--- xorg-server/Xext/xvmain.c | 24 ++++++++++++++---------- xorg-server/Xext/xvmc.c | 9 ++++++--- 12 files changed, 86 insertions(+), 47 deletions(-) (limited to 'xorg-server/Xext') diff --git a/xorg-server/Xext/Makefile.in b/xorg-server/Xext/Makefile.in index 2fb733684..c2467e351 100644 --- a/xorg-server/Xext/Makefile.in +++ b/xorg-server/Xext/Makefile.in @@ -234,6 +234,7 @@ DGA_LIBS = @DGA_LIBS@ DIX_CFLAGS = @DIX_CFLAGS@ DIX_LIB = @DIX_LIB@ DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@ @@ -264,6 +265,13 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FONT100DPIDIR = @FONT100DPIDIR@ +FONT75DPIDIR = @FONT75DPIDIR@ +FONTMISCDIR = @FONTMISCDIR@ +FONTOTFDIR = @FONTOTFDIR@ +FONTROOTDIR = @FONTROOTDIR@ +FONTTTFDIR = @FONTTTFDIR@ +FONTTYPE1DIR = @FONTTYPE1DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ @@ -274,6 +282,7 @@ GREP = @GREP@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_LIBS = @HAL_LIBS@ INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -323,6 +332,8 @@ OBJCFLAGS = @OBJCFLAGS@ OBJCLINK = @OBJCLINK@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OS_LIB = @OS_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -347,6 +358,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ @@ -437,7 +450,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ diff --git a/xorg-server/Xext/mbuf.c b/xorg-server/Xext/mbuf.c index 1f2497463..aacb9cfde 100644 --- a/xorg-server/Xext/mbuf.c +++ b/xorg-server/Xext/mbuf.c @@ -467,10 +467,15 @@ MultibufferExtensionInit() * create the resource types */ MultibufferDrawableResType = - CreateNewResourceType(MultibufferDrawableDelete)|RC_DRAWABLE; - MultibufferResType = CreateNewResourceType(MultibufferDelete); - MultibuffersResType = CreateNewResourceType(MultibuffersDelete); - OtherClientResType = CreateNewResourceType(OtherClientDelete); + CreateNewResourceType(MultibufferDrawableDelete, "MultibufferDrawable"); + if (MultiBufferDrawableResType) + MultibufferDrawableResType |= RC_DRAWABLE; + MultibufferResType = CreateNewResourceType(MultibufferDelete, + "MultibufferBuffer"); + MultibuffersResType = CreateNewResourceType(MultibuffersDelete, + "MultibufferWindow"); + OtherClientResType = CreateNewResourceType(OtherClientDelete, + "MultibufferOtherClient"); if (MultibufferDrawableResType && MultibufferResType && MultibuffersResType && OtherClientResType && (extEntry = AddExtension(MULTIBUFFER_PROTOCOL_NAME, diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c index 4b7b07e1d..cfeba017f 100644 --- a/xorg-server/Xext/panoramiX.c +++ b/xorg-server/Xext/panoramiX.c @@ -503,15 +503,23 @@ 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); - - panoramiXGeneration = serverGeneration; - success = TRUE; + XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource, + "XineramaWindow"); + if (XRT_WINDOW) + XRT_WINDOW |= XRC_DRAWABLE; + XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource, + "XineramaPixmap"); + if (XRT_PIXMAP) + XRT_PIXMAP |= XRC_DRAWABLE; + XRT_GC = CreateNewResourceType(XineramaDeleteResource, + "XineramaGC"); + XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource, + "XineramaColormap"); + + if (XRT_WINDOW && XRT_PIXMAP && XRT_GC && XRT_COLORMAP) { + panoramiXGeneration = serverGeneration; + success = TRUE; + } } if (!success) { diff --git a/xorg-server/Xext/saver.c b/xorg-server/Xext/saver.c index 04e6497bd..2549e8a31 100644 --- a/xorg-server/Xext/saver.c +++ b/xorg-server/Xext/saver.c @@ -252,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++) { diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c index 2cd0e1774..af8d2052f 100644 --- a/xorg-server/Xext/security.c +++ b/xorg-server/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/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c index 700fe76d1..cb4126b44 100644 --- a/xorg-server/Xext/shape.c +++ b/xorg-server/Xext/shape.c @@ -127,8 +127,8 @@ 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, diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 9e462f216..ab58c2750 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -277,7 +277,7 @@ ShmExtensionInit(INITARGS) screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap; } } - ShmSegType = CreateNewResourceType(ShmDetachSegment); + ShmSegType = CreateNewResourceType(ShmDetachSegment, "ShmSeg"); if (ShmSegType && (extEntry = AddExtension(SHMNAME, ShmNumberEvents, ShmNumberErrors, ProcShmDispatch, SProcShmDispatch, diff --git a/xorg-server/Xext/sleepuntil.c b/xorg-server/Xext/sleepuntil.c index 2616a5e5b..075f428d4 100644 --- a/xorg-server/Xext/sleepuntil.c +++ b/xorg-server/Xext/sleepuntil.c @@ -87,7 +87,8 @@ ClientSleepUntil (ClientPtr client, if (SertafiedGeneration != serverGeneration) { - SertafiedResType = CreateNewResourceType (SertafiedDelete); + SertafiedResType = CreateNewResourceType (SertafiedDelete, + "ClientSleep"); if (!SertafiedResType) return FALSE; SertafiedGeneration = serverGeneration; diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c index 667f8ab78..ce6531467 100644 --- a/xorg-server/Xext/sync.c +++ b/xorg-server/Xext/sync.c @@ -873,7 +873,7 @@ SyncCreateSystemCounter( */ if (RTCounter == 0) { - RTCounter = CreateNewResourceType(FreeCounter); + RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter"); if (RTCounter == 0) { return NULL; @@ -2110,11 +2110,15 @@ SyncExtensionInit(void) if (RTCounter == 0) { - RTCounter = CreateNewResourceType(FreeCounter); + RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter"); } - RTAlarm = CreateNewResourceType(FreeAlarm); - RTAwait = CreateNewResourceType(FreeAwait)|RC_NEVERRETAIN; - RTAlarmClient = CreateNewResourceType(FreeAlarmClient)|RC_NEVERRETAIN; + RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm"); + RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait"); + if (RTAwait) + RTAwait |= RC_NEVERRETAIN; + RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient"); + if (RTAlarmClient) + RTAlarmClient |= RC_NEVERRETAIN; if (RTCounter == 0 || RTAwait == 0 || RTAlarm == 0 || RTAlarmClient == 0 || diff --git a/xorg-server/Xext/xvdisp.c b/xorg-server/Xext/xvdisp.c index 5229916a9..b6fc34ff9 100644 --- a/xorg-server/Xext/xvdisp.c +++ b/xorg-server/Xext/xvdisp.c @@ -1863,10 +1863,10 @@ void XineramifyXv(void) XvAdaptorPtr MatchingAdaptors[MAXSCREENS]; int i, j, k, l; - XvXRTPort = CreateNewResourceType(XineramaDeleteResource); + XvXRTPort = CreateNewResourceType(XineramaDeleteResource, "XvXRTPort"); + + if (!xvsp0 || !XvXRTPort) return; - if(!xvsp0) return; - for(i = 0; i < xvsp0->nAdaptors; i++) { refAdapt = xvsp0->pAdaptors + i; diff --git a/xorg-server/Xext/xvmain.c b/xorg-server/Xext/xvmain.c index 7c8a3c3d4..05a68907a 100644 --- a/xorg-server/Xext/xvmain.c +++ b/xorg-server/Xext/xvmain.c @@ -208,37 +208,41 @@ CreateResourceTypes(void) XvResourceGeneration = serverGeneration; - if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort))) + if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort, "XvRTPort"))) { ErrorF("CreateResourceTypes: failed to allocate port resource.\n"); return FALSE; } - - if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab))) + + if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab, "XvRTGrab"))) { ErrorF("CreateResourceTypes: failed to allocate grab resource.\n"); return FALSE; } - - if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding))) + + if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding, + "XvRTEncoding"))) { ErrorF("CreateResourceTypes: failed to allocate encoding resource.\n"); return FALSE; } - - if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify))) + + if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify, + "XvRTVideoNotify"))) { ErrorF("CreateResourceTypes: failed to allocate video notify resource.\n"); return FALSE; } - - if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList))) + + if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList, + "XvRTVideoNotifyList"))) { ErrorF("CreateResourceTypes: failed to allocate video notify list resource.\n"); return FALSE; } - if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify))) + if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify, + "XvRTPortNotify"))) { ErrorF("CreateResourceTypes: failed to allocate port notify resource.\n"); return FALSE; diff --git a/xorg-server/Xext/xvmc.c b/xorg-server/Xext/xvmc.c index c17a4b1c3..c85f85eb4 100644 --- a/xorg-server/Xext/xvmc.c +++ b/xorg-server/Xext/xvmc.c @@ -674,13 +674,16 @@ XvMCExtensionInit(void) if(XvMCScreenKey == NULL) /* nobody supports it */ return; - if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes))) + if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes, + "XvMCRTContext"))) return; - if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes))) + if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes, + "XvMCRTSurface"))) return; - if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes))) + if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes, + "XvMCRTSubpicture"))) return; extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors, -- cgit v1.2.3