Closed UxTheme.dll library

Author: nickgammon

MUSHclient.cpp

@@ -1177,6 +1177,9 @@ void CMUSHclientApp::RestoreColumnConfiguration (LPCTSTR strName,
 
   } // end of RestoreColumnConfiguration
 
+extern HMODULE HModUXT;
+#define THEMEGLUE_FREE() if (HModUXT != NULL) { FreeLibrary(HModUXT); HModUXT = NULL; }
+
 int CMUSHclientApp::ExitInstance() 
 {
   if (!bWine)
@@ -1211,6 +1214,8 @@ int CMUSHclientApp::ExitInstance()
   if (db)
     sqlite3_close(db);
 
+  THEMEGLUE_FREE ();
+
   // free the resources DLL
   FreeLibrary (m_hInstDLL);
 	return CWinApp::ExitInstance();

dialogs/world_prefs/TreePropertySheet.cpp

@@ -3,7 +3,6 @@
 
 #include "stdafx.h"
 #include "TreePropertySheet.h"
-#include "themeglue.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -18,6 +17,9 @@ static char THIS_FILE[] = __FILE__;
 #define SPACEBOTTOM	15
 #define CAPTIONHEIGHT 20
 
+HMODULE HModUXT = NULL;
+#include "themeglue.h"
+
 /////////////////////////////////////////////////////////////////////////////
 // CTreePropertySheet
 

dialogs/world_prefs/themeglue.h

@@ -22,8 +22,6 @@ extern "C" {
 
 #include <windows.h>
 
-HMODULE HModUXT = NULL;
-
 #define THEMEGLUE_FUNC(FuncStr, params, result, FuncName, formal_params) \
 result FuncName formal_params  \
 {   \
@@ -47,7 +45,6 @@ result FuncName formal_params  \
 
 THEMEGLUE_FUNC("EnableThemeDialogTexture", (hwnd, dwFlags), HRESULT, ThemeGlue_EnableThemeDialogTexture, (HWND hwnd, DWORD dwFlags))
 
-
 /* 2010-09-26: Yes, all this work for a single function. =)
  * But we might need more in the future, so I made it relatively easy to expand upon.
  * TODO: support for static linking against uxtheme.lib, but ideally we refactor