From 0769b0d4006a5458f7534a62ecda266d9ed9098f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 18 Apr 2008 15:32:04 -0700 Subject: [PATCH] Nuke the MIT-SUNDRY-NONSTANDARD extension. This extension provided bug-compatibility with pre-X11R6, but has been stubbed out in our server since 2006 to return BadRequest when you actually asked for it. (cherry picked from commit 25827fde68d3bb02a2b7e05fae53a1d97edf1f76) --- Xext/Makefile.am | 1 - Xext/mitmisc.c | 155 ---------------------------- configure.ac | 1 - hw/dmx/dmx-config.h | 1 - hw/xfree86/dixmods/extmod/modinit.c | 9 -- hw/xfree86/dixmods/extmod/modinit.h | 6 -- hw/xfree86/loader/dixsym.c | 3 - include/dix-config.h.in | 3 - include/globals.h | 4 - include/xorg-server.h.in | 3 - mi/miinitext.c | 12 --- os/utils.c | 3 - 12 files changed, 201 deletions(-) delete mode 100644 Xext/mitmisc.c diff --git a/Xext/Makefile.am b/Xext/Makefile.am index a75f0cedd..85a5cc691 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -28,7 +28,6 @@ BUILTIN_SRCS = \ # Sources always included in libXextmodule.la & libXext.la MODULE_SRCS = \ bigreq.c \ - mitmisc.c \ shape.c \ sync.c \ xcmisc.c diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c deleted file mode 100644 index e793d4dc1..000000000 --- a/Xext/mitmisc.c +++ /dev/null @@ -1,155 +0,0 @@ -/************************************************************ - -Copyright 1989, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -********************************************************/ - -/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ - - -#define NEED_EVENTS -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include -#include -#include "misc.h" -#include "os.h" -#include "dixstruct.h" -#include "extnsionst.h" -#define _MITMISC_SERVER_ -#include -#include "modinit.h" - -static void MITResetProc( - ExtensionEntry * /* extEntry */ -); - -static DISPATCH_PROC(ProcMITDispatch); -static DISPATCH_PROC(ProcMITGetBugMode); -static DISPATCH_PROC(ProcMITSetBugMode); -static DISPATCH_PROC(SProcMITDispatch); -static DISPATCH_PROC(SProcMITGetBugMode); -static DISPATCH_PROC(SProcMITSetBugMode); - -void -MITMiscExtensionInit(INITARGS) -{ - AddExtension(MITMISCNAME, 0, 0, - ProcMITDispatch, SProcMITDispatch, - MITResetProc, StandardMinorOpcode); -} - -/*ARGSUSED*/ -static void -MITResetProc (extEntry) -ExtensionEntry *extEntry; -{ -} - -static int -ProcMITSetBugMode(client) - register ClientPtr client; -{ - REQUEST(xMITSetBugModeReq); - - REQUEST_SIZE_MATCH(xMITSetBugModeReq); - if (stuff->onOff != xFalse) - return BadRequest; - return(client->noClientException); -} - -static int -ProcMITGetBugMode(client) - register ClientPtr client; -{ - xMITGetBugModeReply rep; - register int n; - - REQUEST_SIZE_MATCH(xMITGetBugModeReq); - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.onOff = FALSE; - if (client->swapped) { - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - } - WriteToClient(client, sizeof(xMITGetBugModeReply), (char *)&rep); - return(client->noClientException); -} - -static int -ProcMITDispatch (client) - register ClientPtr client; -{ - REQUEST(xReq); - switch (stuff->data) - { - case X_MITSetBugMode: - return ProcMITSetBugMode(client); - case X_MITGetBugMode: - return ProcMITGetBugMode(client); - default: - return BadRequest; - } -} - -static int -SProcMITSetBugMode(client) - register ClientPtr client; -{ - register int n; - REQUEST(xMITSetBugModeReq); - - swaps(&stuff->length, n); - return ProcMITSetBugMode(client); -} - -static int -SProcMITGetBugMode(client) - register ClientPtr client; -{ - register int n; - REQUEST(xMITGetBugModeReq); - - swaps(&stuff->length, n); - return ProcMITGetBugMode(client); -} - -static int -SProcMITDispatch (client) - register ClientPtr client; -{ - REQUEST(xReq); - switch (stuff->data) - { - case X_MITSetBugMode: - return SProcMITSetBugMode(client); - case X_MITGetBugMode: - return SProcMITGetBugMode(client); - default: - return BadRequest; - } -} diff --git a/configure.ac b/configure.ac index 68ffd3b46..b005dc1e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1116,7 +1116,6 @@ else fi AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes]) -AC_DEFINE(MITMISC, 1, [Support MIT Misc extension]) AC_DEFINE(XTEST, 1, [Support XTest extension]) AC_DEFINE(XSYNC, 1, [Support XSync extension]) AC_DEFINE(XCMISC, 1, [Support XCMisc extension]) diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h index 343fdabf5..df77f096a 100644 --- a/hw/dmx/dmx-config.h +++ b/hw/dmx/dmx-config.h @@ -84,7 +84,6 @@ #undef XFreeXDGA #undef XF86DRI #undef TOGCUP -#undef MITMISC #undef SCREENSAVER #undef RANDR #undef XFIXES diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index 3b6b36a2c..fe499fefe 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -65,15 +65,6 @@ static ExtensionModule extensionModules[] = { NULL }, #endif -#ifdef MITMISC - { - MITMiscExtensionInit, - MITMISCNAME, - &noMITMiscExtension, - NULL, - NULL - }, -#endif #ifdef notyet { XTestExtensionInit, diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 32248504c..6c87b15e4 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -18,12 +18,6 @@ extern void MultibufferExtensionInit(INITARGS); #include #endif -#ifdef MITMISC -extern void MITMiscExtensionInit(INITARGS); -#define _MITMISC_SERVER_ -#include -#endif - #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index c6b657dae..d96dde7c9 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -368,9 +368,6 @@ _X_HIDDEN void *dixLookupTab[] = { #ifdef MITSHM SYMVAR(noMITShmExtension) #endif -#ifdef MITMISC - SYMVAR(noMITMiscExtension) -#endif #ifdef MULTIBUFFER SYMVAR(noMultibufferExtension) #endif diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 3184497e8..ec8a94e3b 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -267,9 +267,6 @@ /* Support os-specific local connections */ #undef LOCALCONN -/* Support MIT Misc extension */ -#undef MITMISC - /* Support MIT-SHM Extension */ #undef MITSHM diff --git a/include/globals.h b/include/globals.h index cfb6c2c22..62794f519 100644 --- a/include/globals.h +++ b/include/globals.h @@ -82,10 +82,6 @@ extern Bool noScreenSaverExtension; extern Bool noMITShmExtension; #endif -#ifdef MITMISC -extern Bool noMITMiscExtension; -#endif - #ifdef MULTIBUFFER extern Bool noMultibufferExtension; #endif diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 4dd2f27dd..c0997a9e1 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -46,9 +46,6 @@ /* Support IPv6 for TCP connections */ #undef IPv6 -/* Support MIT Misc extension */ -#undef MITMISC - /* Support MIT-SHM Extension */ #undef MITSHM diff --git a/mi/miinitext.c b/mi/miinitext.c index cecac389f..71c234820 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -114,9 +114,6 @@ extern Bool noScreenSaverExtension; #ifdef MITSHM extern Bool noMITShmExtension; #endif -#ifdef MITMISC -extern Bool noMITMiscExtension; -#endif #ifdef MULTIBUFFER extern Bool noMultibufferExtension; #endif @@ -245,9 +242,6 @@ extern void XTestExtensionInit(INITARGS); #ifdef BIGREQS extern void BigReqExtensionInit(INITARGS); #endif -#ifdef MITMISC -extern void MITMiscExtensionInit(INITARGS); -#endif #ifdef XIDLE extern void XIdleExtensionInit(INITARGS); #endif @@ -375,9 +369,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef MITSHM { SHMNAME, &noMITShmExtension }, #endif -#ifdef MITMISC - { "MIT-SUNDRY-NONSTANDARD", &noMITMiscExtension }, -#endif #ifdef MULTIBUFFER { "Multi-Buffering", &noMultibufferExtension }, #endif @@ -504,9 +495,6 @@ InitExtensions(argc, argv) #ifdef BIGREQS if (!noBigReqExtension) BigReqExtensionInit(); #endif -#ifdef MITMISC - if (!noMITMiscExtension) MITMiscExtensionInit(); -#endif #ifdef XIDLE if (!noXIdleExtension) XIdleExtensionInit(); #endif diff --git a/os/utils.c b/os/utils.c index a38a34d73..51a15c5d7 100644 --- a/os/utils.c +++ b/os/utils.c @@ -158,9 +158,6 @@ _X_EXPORT Bool noScreenSaverExtension = FALSE; #ifdef MITSHM _X_EXPORT Bool noMITShmExtension = FALSE; #endif -#ifdef MITMISC -_X_EXPORT Bool noMITMiscExtension = FALSE; -#endif #ifdef MULTIBUFFER _X_EXPORT Bool noMultibufferExtension = FALSE; #endif