MeasurePlugin: Add plugin loading/unloading debug messages (only in d…

…ebug mode)

Library/MeasurePlugin.cpp

@@ -11,6 +11,8 @@
 #include "Export.h"
 #include "System.h"
 
+std::unordered_map<std::wstring, UINT> MeasurePlugin::s_PluginReferences;
+
 MeasurePlugin::MeasurePlugin(Skin* skin, const WCHAR* name) : Measure(skin, name),
 	m_Plugin(),
 	m_ReloadFunc(),
@@ -40,6 +42,27 @@ MeasurePlugin::~MeasurePlugin()
 			}
 		}
 
+		WCHAR pluginPath[MAX_PATH];
+		if (GetModuleFileName(m_Plugin, pluginPath, MAX_PATH) > 0UL)
+		{
+			std::wstring tmpStr = pluginPath;
+			StringUtil::ToLowerCase(tmpStr);
+
+			auto iter = s_PluginReferences.find(tmpStr);
+			if (iter != s_PluginReferences.end())
+			{
+				--iter->second;
+				if (iter->second == 0)
+				{
+					if (GetRainmeter().GetDebug())
+					{
+						LogDebugF(L"Plugin unloaded: %s", pluginPath);
+					}
+					s_PluginReferences.erase(tmpStr);
+				}
+			}
+		}
+
 		FreeLibrary(m_Plugin);
 		m_Plugin = nullptr;
 	}
@@ -129,6 +152,53 @@ void MeasurePlugin::ReadOptions(ConfigParser& parser, const WCHAR* section)
 		}
 	}
 
+	// Log plugin references
+	{
+		WCHAR pluginPath[MAX_PATH];
+		if (GetModuleFileName(m_Plugin, pluginPath, MAX_PATH) > 0UL)
+		{
+			std::wstring tmpStr = pluginPath;
+			StringUtil::ToLowerCase(tmpStr);
+
+			auto iter = s_PluginReferences.find(tmpStr);
+			if (iter == s_PluginReferences.end())
+			{
+				s_PluginReferences.insert(std::make_pair<std::wstring&, UINT>(tmpStr, 1U));
+				if (GetRainmeter().GetDebug())
+				{
+					LogDebugF(L"Plugin loaded: %s", pluginPath);
+				}
+			}
+			else
+			{
+				++iter->second;
+			}
+		}
+
+		/*size_t pluginNameSize = pluginFile.size();
+		if (pluginNameSize > 3 && pluginFile.substr(pluginFile.size() - 4) != L".dll")
+		{
+			pluginFile += L".dll";
+		}
+
+		WCHAR plugin[MAX_PATH];
+		wcsncpy_s(plugin, MAX_PATH, pluginFile.c_str(), pluginFile.size());
+
+		auto iter = s_PluginReferences.find(plugin);
+		if (iter == s_PluginReferences.end())
+		{
+			s_PluginReferences.insert(std::make_pair<std::wstring, UINT>(plugin, 1U));
+			if (GetRainmeter().GetDebug())
+			{
+				LogDebugF(this, L"Plugin loaded: &s", plugin);
+			}
+		}
+		else
+		{
+			++iter->second;
+		}*/
+	}
+
 	FARPROC initializeFunc = GetProcAddress(m_Plugin, "Initialize");
 	m_ReloadFunc = GetProcAddress(m_Plugin, "Reload");
 	m_UpdateFunc = GetProcAddress(m_Plugin, "Update");

Library/MeasurePlugin.h

@@ -71,6 +71,8 @@ class MeasurePlugin : public Measure
 	void* m_UpdateFunc;
 	void* m_GetStringFunc;
 	void* m_ExecuteBangFunc;
+
+	static std::unordered_map<std::wstring, UINT> s_PluginReferences;
 };
 
 #endif