Attachment 938 Details for Bug 1361 – [FIXED_X11R68x] Prototype for 2nd round: make extensins optional for the Xorg server (patch for 2004-09-18-trunk)

[patch] [FIXED_X11R68x] Prototype for 2nd round: make extensins optional for the Xorg server (patch for 2004-09-18-trunk)

patch.gudiff (text/plain), 7.72 KB, created by Roland Mainz on 2004-09-18 10:08:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-09-18 10:08:36 UTC

Size: 7.72 KB

patch

obsolete

>Index: xc/programs/Xserver/mi/miinitext.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/mi/miinitext.c,v
>retrieving revision 1.13
>diff -u -2 -0 -r1.13 miinitext.c
>--- xc/programs/Xserver/mi/miinitext.c	14 Sep 2004 00:51:25 -0000	1.13
>+++ xc/programs/Xserver/mi/miinitext.c	18 Sep 2004 17:03:18 -0000
>@@ -422,41 +422,41 @@
> #endif
> #ifdef DPMSExtension
>     { "DPMS", &noDPMSExtension },
> #endif
> #ifdef EVI
>     { "Extended-Visual-Information", &noEVIExtension },
> #endif
> #ifdef FONTCACHE
>     { "FontCache", &noFontCacheExtension },
> #endif
> #ifdef GLXEXT
>     { "GLX", &noGlxExtension },
> #endif
> #ifdef LBX
>     { "LBX", &noLbxExtension },
> #endif
> #ifdef SCREENSAVER
>     { "MIT-SCREEN-SAVER", &noScreenSaverExtension },
> #endif
> #ifdef MITSHM
>-    { "MIT-SHM", &noMITShmExtension },
>+    { SHMNAME, &noMITShmExtension },
> #endif
> #ifdef MITMISC
>     { "MIT-SUNDRY-NONSTANDARD", &noMITMiscExtension },
> #endif
> #ifdef MULTIBUFFER
>     { "Multi-Buffering", &noMultibufferExtension },
> #endif
> #ifdef RANDR
>     { "RANDR", &noRRExtension },
> #endif
> #ifdef RENDER
>     { "RENDER", &noRenderExtension },
> #endif
> #ifdef SHAPE
>     { "SHAPE", &noShapeExtension },
> #endif
> #ifdef XCSECURITY
>     { "SECURITY", &noSecurityExtension },
> #endif
> #ifdef XSYNC
>@@ -545,41 +545,41 @@
> #ifndef XFree86LOADER
> 
> /*ARGSUSED*/
> void
> InitExtensions(argc, argv)
>     int		argc;
>     char	*argv[];
> {
> #ifdef PANORAMIX
> # if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
>   if (!noPanoramiXExtension) PanoramiXExtensionInit();
> # endif
> #endif
> #ifdef BEZIER
>     if (!noBezierExtension) BezierExtensionInit();
> #endif
> #ifdef XTESTEXT1
>     if (!noTestExtensions) XTestExtension1Init();
> #endif
> #ifdef SHAPE
>-    ShapeExtensionInit();
>+    if (!noShapeExtension) ShapeExtensionInit();
> #endif
> #ifdef MITSHM
>     if (!noMITShmExtension) ShmExtensionInit();
> #endif
> #ifdef EVI
>     if (!noEVIExtension) EVIExtensionInit();
> #endif
> #ifdef PEXEXT
>     if (!noPexExtension) PexExtensionInit();
> #endif
> #ifdef MULTIBUFFER
>     if (!noMultibufferExtension) MultibufferExtensionInit();
> #endif
> #if defined(XINPUT) && !defined(NO_HW_ONLY_EXTS)
>     if (!noXInputExtension) XInputExtensionInit();
> #endif
> #ifdef XTEST
>     if (!noTestExtensions) XTestExtensionInit();
> #endif
> #ifdef BIGREQS
>@@ -695,155 +695,96 @@
> #endif
> #ifdef DAMAGE
>     if (!noDamageExtension) DamageExtensionInit();
> #endif
> }
> 
> void
> InitVisualWrap()
> {
>     miResetInitVisuals();
> #ifdef GLXEXT
> #ifndef __DARWIN__
>     GlxWrapInitVisuals(&miInitVisualsProc);
> #else
>     DarwinGlxWrapInitVisuals(&miInitVisualsProc);
> #endif
> #endif
> }
> 
> #else /* XFree86LOADER */
>-#if 0
>-/* FIXME:The names here must come from the headers. those with ?? are 
>-   not included in X11R6.3 sample implementation, so there's a problem... */
>-/* XXX use the correct #ifdefs for symbols not present when an extension
>-   is disabled */
>-ExtensionModule extension[] =
>-{
>-    { NULL, "BEZIER", NULL, NULL },	/* ?? */
>-    { NULL, "XTEST1", &noTestExtensions, NULL }, /* ?? */
>-    { NULL, "SHAPE", NULL, NULL },
>-    { NULL, "MIT-SHM", NULL, NULL },
>-    { NULL, "X3D-PEX", NULL, NULL },
>-    { NULL, "Multi-Buffering", NULL, NULL },
>-    { NULL, "XInputExtension", NULL, NULL },
>-    { NULL, "XTEST", &noTestExtensions, NULL },
>-    { NULL, "BIG-REQUESTS", NULL, NULL },
>-    { NULL, "MIT-SUNDRY-NONSTANDARD", NULL, NULL },
>-    { NULL, "XIDLE", NULL, NULL },	/* ?? */
>-    { NULL, "XTRAP", &noTestExtensions, NULL }, /* ?? */
>-    { NULL, "MIT-SCREEN-SAVER", NULL, NULL },
>-    { NULL, "XVideo", NULL, NULL },	/* ?? */
>-    { NULL, "XIE", NULL, NULL },
>-    { NULL, "SYNC", NULL, NULL },
>-#ifdef XKB
>-    { NULL, "XKEYBOARD", &noXkbExtension, NULL },
>-#else
>-    { NULL, "NOXKEYBOARD", NULL, NULL },
>-#endif
>-    { NULL, "XC-MISC", NULL, NULL },
>-    { NULL, "RECORD", &noTestExtensions, NULL },
>-    { NULL, "LBX", NULL, NULL },
>-    { NULL, "DOUBLE-BUFFER", NULL, NULL },
>-    { NULL, "XC-APPGROUP", NULL, NULL },
>-    { NULL, "SECURITY", NULL, NULL },
>-    { NULL, "XpExtension", NULL, NULL },
>-    { NULL, "XFree86-VidModeExtension", NULL, NULL },
>-    { NULL, "XFree86-Misc", NULL, NULL },
>-    { NULL, "XFree86-DGA", NULL, NULL },
>-    { NULL, "DPMS", NULL, NULL },
>-    { NULL, "GLX", NULL, NULL },
>-    { NULL, "TOG-CUP", NULL, NULL },
>-    { NULL, "Extended-Visual-Information", NULL, NULL },
>-#ifdef PANORAMIX
>-    { NULL, "XINERAMA", &noPanoramiXExtension, NULL },
>-#else
>-    { NULL, "NOXINERAMA", NULL, NULL },
>-#endif
>-    { NULL, "XFree86-Bigfont", NULL, NULL },
>-    { NULL, "XFree86-DRI", NULL, NULL },
>-    { NULL, "Adobe-DPS-Extension", NULL, NULL },
>-    { NULL, "FontCache", NULL, NULL },
>-    { NULL, "RENDER", NULL, NULL },
>-    { NULL, "RANDR", NULL, NULL },
>-    { NULL, "X-Resource", NULL, NULL },
>-    { NULL, "DMX", NULL, NULL },
>-    { NULL, NULL, NULL, NULL }
>-};
>-#endif
>-
> /* List of built-in (statically linked) extensions */
> static ExtensionModule staticExtensions[] = {
> #ifdef BEZIER
>-    { BezierExtensionInit, "BEZIER", NULL, NULL, NULL },
>+    { BezierExtensionInit, "BEZIER", &noBezierExtension, NULL, NULL },
> #endif
> #ifdef XTESTEXT1
>     { XTestExtension1Init, "XTEST1", &noTestExtensions, NULL, NULL },
> #endif
> #ifdef MITSHM
>-    { ShmExtensionInit, SHMNAME, NULL, NULL, NULL },
>+    { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
> #endif
> #ifdef XINPUT
>-    { XInputExtensionInit, "XInputExtension", NULL, NULL, NULL },
>+    { XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL },
> #endif
> #ifdef XTEST
>     { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
> #endif
> #ifdef XIDLE
>-    { XIdleExtensionInit, "XIDLE", NULL, NULL, NULL },
>+    { XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL },
> #endif
> #ifdef XKB
>     { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
> #endif
> #ifdef LBX
>-    { LbxExtensionInit, LBXNAME, NULL, NULL, NULL },
>+    { LbxExtensionInit, LBXNAME, &noLbxExtension, NULL, NULL },
> #endif
> #ifdef XAPPGROUP
>-    { XagExtensionInit, XAGNAME, NULL, NULL, NULL },
>+    { XagExtensionInit, XAGNAME, &noXagExtension, NULL, NULL },
> #endif
> #ifdef XCSECURITY
>-    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, NULL, NULL, NULL },
>+    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
> #endif
> #ifdef XPRINT
>     { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
> #endif
> #ifdef PANORAMIX
>     { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
> #endif
> #ifdef XFIXES
>     /* must be before Render to layer DisplayCursor correctly */
>-    { XFixesExtensionInit, "XFIXES", NULL, NULL, NULL },
>+    { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL },
> #endif
> #ifdef XF86BIGFONT
>-    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, NULL, NULL, NULL },
>+    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
> #endif
> #ifdef RENDER
>     { RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL },
> #endif
> #ifdef RANDR
>-    { RRExtensionInit, "RANDR", NULL, NULL, NULL },
>+    { RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL },
> #endif
> #ifdef COMPOSITE
>     { CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
> #endif
> #ifdef DAMAGE
>-    { DamageExtensionInit, "DAMAGE", NULL, NULL },
>+    { DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL },
> #endif
> #ifdef XEVIE
>     { XevieExtensionInit, "XEVIE", &noXevieExtension, NULL },
> #endif 
>     { NULL, NULL, NULL, NULL, NULL }
> };
>     
> /*ARGSUSED*/
> void
> InitExtensions(argc, argv)
>     int		argc;
>     char	*argv[];
> {
>     int i;
>     ExtensionModule *ext;
>     static Bool listInitialised = FALSE;
> 
>     if (!listInitialised) {
> 	/* Add built-in extensions to the list. */
> 	for (i = 0; staticExtensions[i].name; i++)

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1361: 894 | 895 | 899 | 938 | 1287

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.