From a311bfa73afa1af76f81958d23bc8e0c631d6828 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Wed, 2 Nov 2005 15:53:57 +0000
Subject: [PATCH] Fix support for enabling/disabling extensions loaded from
 modules.

---
 hw/xfree86/dixmods/dbemodule.c      |  3 ++-
 hw/xfree86/dixmods/extmod/modinit.c | 34 +++++++++++++++--------------
 hw/xfree86/dixmods/glxmodule.c      |  3 ++-
 hw/xfree86/dri/drimodule.c          |  3 ++-
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c
index 7daa838eb..62fbcfd21 100644
--- a/hw/xfree86/dixmods/dbemodule.c
+++ b/hw/xfree86/dixmods/dbemodule.c
@@ -5,6 +5,7 @@
 #endif
 
 #include "xf86Module.h"
+#include "globals.h"
 
 static MODULESETUPPROTO(dbeSetup);
 
@@ -13,7 +14,7 @@ extern void DbeExtensionInit(INITARGS);
 ExtensionModule dbeExt = {
     DbeExtensionInit,
     "DOUBLE-BUFFER",
-    NULL,
+    &noDbeExtension,
     NULL,
     NULL
 };
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 68caa4b02..3c2044f78 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -36,6 +36,7 @@
 #include <X11/Xproto.h>
 
 #include "modinit.h"
+#include "globals.h"
 
 static MODULESETUPPROTO(extmodSetup);
 
@@ -47,7 +48,7 @@ ExtensionModule extensionModules[] = {
     {
 	ShapeExtensionInit,
 	SHAPENAME,
-	NULL,
+	&noShapeExtension,
 	NULL,
 	NULL
     },
@@ -56,7 +57,7 @@ ExtensionModule extensionModules[] = {
     {
 	MultibufferExtensionInit,
 	MULTIBUFFER_PROTOCOL_NAME,
-	NULL,
+	&noMultibufferExtension,
 	NULL,
 	NULL
     },
@@ -65,7 +66,7 @@ ExtensionModule extensionModules[] = {
     {
 	MITMiscExtensionInit,
 	MITMISCNAME,
-	NULL,
+	&noMITMiscExtension,
 	NULL,
 	NULL
     },
@@ -83,7 +84,7 @@ ExtensionModule extensionModules[] = {
      {
 	BigReqExtensionInit,
 	XBigReqExtensionName,
-	NULL,
+	&noBigReqExtension,
 	NULL,
 	NULL
      },
@@ -92,7 +93,7 @@ ExtensionModule extensionModules[] = {
     {
 	SyncExtensionInit,
 	SYNC_NAME,
-	NULL,
+	&noSyncExtension,
 	NULL,
 	NULL
     },
@@ -101,7 +102,7 @@ ExtensionModule extensionModules[] = {
     {
 	ScreenSaverExtensionInit,
 	ScreenSaverName,
-	NULL,
+	&noScreenSaverExtension,
 	NULL,
 	NULL
     },
@@ -110,7 +111,7 @@ ExtensionModule extensionModules[] = {
     {
 	XCMiscExtensionInit,
 	XCMiscExtensionName,
-	NULL,
+	&noXCMiscExtension,
 	NULL,
 	NULL
     },
@@ -119,7 +120,7 @@ ExtensionModule extensionModules[] = {
     {
 	XFree86VidModeExtensionInit,
 	XF86VIDMODENAME,
-	NULL,
+	&noXFree86VidModeExtension,
 	NULL,
 	NULL
     },
@@ -128,7 +129,7 @@ ExtensionModule extensionModules[] = {
     {
 	XFree86MiscExtensionInit,
 	XF86MISCNAME,
-	NULL,
+	&noXFree86MiscExtension,
 	NULL,
 	NULL
     },
@@ -137,7 +138,7 @@ ExtensionModule extensionModules[] = {
     {
 	XFree86DGAExtensionInit,
 	XF86DGANAME,
-	NULL,
+	&noXFree86DGAExtension,
 	XFree86DGARegister,
 	NULL
     },
@@ -146,6 +147,7 @@ ExtensionModule extensionModules[] = {
     {
 	DPMSExtensionInit,
 	DPMSExtensionName,
+	&noDPMSExtension,
 	NULL,
 	NULL
     },
@@ -154,7 +156,7 @@ ExtensionModule extensionModules[] = {
     {
 	FontCacheExtensionInit,
 	FONTCACHENAME,
-	NULL,
+	&noFontCacheExtension,
 	NULL,
 	NULL
     },
@@ -163,7 +165,7 @@ ExtensionModule extensionModules[] = {
     {
 	XcupExtensionInit,
 	XCUPNAME,
-	NULL,
+	&noXcupExtension,
 	NULL,
 	NULL
     },
@@ -172,7 +174,7 @@ ExtensionModule extensionModules[] = {
     {
 	EVIExtensionInit,
 	EVINAME,
-	NULL,
+	&noEVIExtension,
 	NULL,
 	NULL
     },
@@ -181,14 +183,14 @@ ExtensionModule extensionModules[] = {
     {
 	XvExtensionInit,
 	XvName,
-	NULL,
+	&noXvExtension,
 	XvRegister,
 	NULL
     },
     {
         XvMCExtensionInit,
         XvMCName,
-        NULL,
+        &noXvExtension,
         NULL,
         NULL
     },
@@ -197,7 +199,7 @@ ExtensionModule extensionModules[] = {
     {
         ResExtensionInit,
         XRES_NAME, 
-        NULL,
+        &noResExtension,
         NULL,
         NULL
     },
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 962343011..4c163f70c 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -40,6 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86Module.h"
 #include "colormap.h"
 #include "micmap.h"
+#include "globals.h"
 
 static MODULESETUPPROTO(glxSetup);
 
@@ -53,7 +54,7 @@ ExtensionModule GLXExt =
 {
     GlxExtensionInit,
     "GLX",
-    NULL,
+    &noGlxExtension,
     NULL,
     initdeps
 };
diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c
index d68789771..de535d016 100644
--- a/hw/xfree86/dri/drimodule.c
+++ b/hw/xfree86/dri/drimodule.c
@@ -39,6 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "xf86Module.h"
+#include "globals.h"
 
 static MODULESETUPPROTO(driSetup);
 
@@ -64,7 +65,7 @@ ExtensionModule XF86DRIExt =
 {
     XFree86DRIExtensionInit,
     XF86DRINAME,
-    NULL,
+    &noXFree86DRIExtension,
     NULL,
     NULL
 };