Fix various problems with unloading ClientPrefs and SourceMod (bug 5874, r=ds).

--HG--
extra : rebase_source : 0a35f8380d651ca65fac9dd402c5cd3625e3105c

extensions/clientprefs/sdk/smsdk_config.h

@@ -67,7 +67,7 @@
 //#define SMEXT_ENABLE_MEMUTILS
 #define SMEXT_ENABLE_GAMEHELPERS
 //#define SMEXT_ENABLE_TIMERSYS
-#define SMEXT_ENABLE_THREADER
+//#define SMEXT_ENABLE_THREADER
 //#define SMEXT_ENABLE_LIBSYS
 #define SMEXT_ENABLE_MENUS
 //#define SMEXT_ENABLE_ADTFACTORY

extensions/clientprefs/sdk/smsdk_ext.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet:
  * =============================================================================
  * SourceMod Base Extension Code
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -97,6 +97,12 @@ IUserMessages *usermsgs = NULL;
 #if defined SMEXT_ENABLE_TRANSLATOR
 ITranslator *translator = NULL;
 #endif
+#if defined SMEXT_ENABLE_NINVOKE
+INativeInterface *ninvoke = NULL;
+#endif
+#if defined SMEXT_ENABLE_ROOTCONSOLEMENU
+IRootConsole *rootconsole = NULL;
+#endif
 
 /** Exports the main interface */
 PLATFORM_EXTERN_C IExtensionInterface *GetSMExtAPI()
@@ -185,6 +191,12 @@ bool SDKExtension::OnExtensionLoad(IExtension *me, IShareSys *sys, char *error,
 #if defined SMEXT_ENABLE_TRANSLATOR
 	SM_GET_IFACE(TRANSLATOR, translator);
 #endif
+#if defined SMEXT_ENABLE_NINVOKE
+	SM_GET_IFACE(NINVOKE, ninvoke);
+#endif
+#if defined SMEXT_ENABLE_ROOTCONSOLEMENU
+	SM_GET_IFACE(ROOTCONSOLE, rootconsole);
+#endif
 
 	if (SDK_OnLoad(error, maxlength, late))
 	{
@@ -227,6 +239,11 @@ void SDKExtension::OnExtensionUnload()
 	SDK_OnUnload();
 }
 
+void SDKExtension::OnDependenciesDropped()
+{
+	SDK_OnDependenciesDropped();
+}
+
 const char *SDKExtension::GetExtensionAuthor()
 {
 	return SMEXT_CONF_AUTHOR;
@@ -279,6 +296,10 @@ void SDKExtension::SDK_OnAllLoaded()
 {
 }
 
+void SDKExtension::SDK_OnDependenciesDropped()
+{
+}
+
 #if defined SMEXT_CONF_METAMOD
 
 PluginId g_PLID = 0;						/**< Metamod plugin ID */

extensions/clientprefs/sdk/smsdk_ext.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet:
  * =============================================================================
  * SourceMod Base Extension Code
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -91,6 +91,12 @@
 #if defined SMEXT_ENABLE_TRANSLATOR
 #include <ITranslator.h>
 #endif
+#if defined SMEXT_ENABLE_NINVOKE
+#include <INativeInvoker.h>
+#endif
+#if defined SMEXT_ENABLE_ROOTCONSOLEMENU
+#include <IRootConsoleMenu.h>
+#endif
 
 #if defined SMEXT_CONF_METAMOD
 #include <ISmmPlugin.h>
@@ -121,7 +127,7 @@ public:
 	virtual bool SDK_OnLoad(char *error, size_t maxlength, bool late);
 	
 	/**
-	 * @brief This is called right before the extension is unloaded.
+	 * @brief This is called once the extension unloading process begins.
 	 */
 	virtual void SDK_OnUnload();
 
@@ -135,6 +141,12 @@ public:
 	 */
 	virtual void SDK_OnPauseChange(bool paused);
 
+	/**
+	 * @brief Called after SDK_OnUnload, once all dependencies have been
+	 * removed, and the extension is about to be removed from memory.
+	 */
+	virtual void SDK_OnDependenciesDropped();
+
 #if defined SMEXT_CONF_METAMOD
 	/**
 	 * @brief Called when Metamod is attached, before the extension version is called.
@@ -197,6 +209,9 @@ public: //IExtensionInterface
 	virtual const char *GetExtensionDescription();
 	/** Returns date string */
 	virtual const char *GetExtensionDateString();
+
+	/** Called after OnExtensionUnload, once dependencies have been dropped. */
+	virtual void OnDependenciesDropped();
 #if defined SMEXT_CONF_METAMOD
 public: //ISmmPlugin
 	/** Called when the extension is attached to Metamod. */
@@ -289,6 +304,12 @@ extern IUserMessages *usermsgs;
 #if defined SMEXT_ENABLE_TRANSLATOR
 extern ITranslator *translator;
 #endif
+#if defined SMEXT_ENABLE_NINVOKE
+extern INativeInterface *ninvoke;
+#endif
+#if defined SMEXT_ENABLE_ROOTCONSOLEMENU
+extern IRootConsole *rootconsole;
+#endif
 
 #if defined SMEXT_CONF_METAMOD
 PLUGIN_GLOBALVARS();