dynamic dll checker

git-svn-id: http://svn.miranda-ng.org/main/trunk@989 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

18 files changed, 24 insertions, 94 deletions

diff --git a/protocols/AimOscar/aim.cpp b/protocols/AimOscar/aim.cpp
index 66605e2796..d69995a92c 100644
--- a/protocols/AimOscar/aim.cpp
+++ b/protocols/AimOscar/aim.cpp
@@ -74,11 +74,7 @@ extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD m
 /////////////////////////////////////////////////////////////////////////////////////////

 // Interface information

 

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 ////////////////////////////////////////////////////////////////////////////////////////

 //	OnModulesLoaded - finalizes plugin's configuration on load

diff --git a/protocols/FacebookRM/main.cpp b/protocols/FacebookRM/main.cpp
index ecdab519bc..beb301527e 100644
--- a/protocols/FacebookRM/main.cpp
+++ b/protocols/FacebookRM/main.cpp
@@ -69,11 +69,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 /////////////////////////////////////////////////////////////////////////////////////////

 // Interface information

 

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // Load

diff --git a/protocols/Gadu-Gadu/gg.cpp b/protocols/Gadu-Gadu/gg.cpp
index 1ec516f8da..6208619fe9 100644
--- a/protocols/Gadu-Gadu/gg.cpp
+++ b/protocols/Gadu-Gadu/gg.cpp
@@ -37,7 +37,7 @@ PLUGININFOEX pluginInfo = {
 	// {F3FF65F3-250E-416A-BEE9-58C93F85AB33}

 	{ 0xf3ff65f3, 0x250e, 0x416a, { 0xbe, 0xe9, 0x58, 0xc9, 0x3f, 0x85, 0xab, 0x33 } }

 };

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 // Other variables

 HINSTANCE hInstance;

@@ -141,10 +141,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;

 }

 

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 //////////////////////////////////////////////////////////

 // Cleanups from last plugin

diff --git a/protocols/IRCG/main.cpp b/protocols/IRCG/main.cpp
index eb79398471..ea802d43cd 100644
--- a/protocols/IRCG/main.cpp
+++ b/protocols/IRCG/main.cpp
@@ -69,12 +69,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;

 }

 

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

diff --git a/protocols/IcqOscarJ/init.cpp b/protocols/IcqOscarJ/init.cpp
index 41554cd665..338c53a9a9 100644
--- a/protocols/IcqOscarJ/init.cpp
+++ b/protocols/IcqOscarJ/init.cpp
@@ -58,11 +58,7 @@ extern "C" PLUGININFOEX __declspec(dllexport) *MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;

 }

 

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

 {

diff --git a/protocols/JabberG/docs/changelog_jabber.txt b/protocols/JabberG/docs/changelog_jabber.txt
index 51b177858f..fcde5a6c8e 100644
--- a/protocols/JabberG/docs/changelog_jabber.txt
+++ b/protocols/JabberG/docs/changelog_jabber.txt
@@ -32,7 +32,7 @@ Version 0.7.0.4
 Version 0.7.0.3

 ===============

 [+] XEP-0048 support (Bookmark Storage)

-[+] Added MirandaPluginInterfaces

+[+] Added MirandaInterfaces

 [+] Implement UUID plugin info

 [+] added Windows Vista OS version detection

 [+] added ability of sending messages to the specific resource

diff --git a/protocols/JabberG/jabber.cpp b/protocols/JabberG/jabber.cpp
index 99b3ce796b..479afdaa59 100644
--- a/protocols/JabberG/jabber.cpp
+++ b/protocols/JabberG/jabber.cpp
@@ -96,16 +96,7 @@ extern "C" BOOL WINAPI DllMain( HINSTANCE hModule, DWORD, LPVOID )
 	return TRUE;

 }

 

-extern "C" __declspec( dllexport ) PLUGININFOEX *MirandaPluginInfoEx( DWORD mirandaVersion )

-{

-	return &pluginInfo;

-}

-

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 ///////////////////////////////////////////////////////////////////////////////

 // OnPreShutdown - prepares Miranda to be shut down

diff --git a/protocols/MRA/Mra.cpp b/protocols/MRA/Mra.cpp
index 99458125f5..e57e40d587 100644
--- a/protocols/MRA/Mra.cpp
+++ b/protocols/MRA/Mra.cpp
@@ -18,8 +18,6 @@ PLUGININFOEX pluginInfoEx={
 	{ 0xe7c48bab, 0x8ace, 0x4cb3, { 0x84, 0x46, 0xd4, 0xb7, 0x34, 0x81, 0xf4, 0x97 } }

 };

 

-static const MUUID interfaces[]={MIID_PROTOCOL,MIID_LAST};

-

 

 int		OnModulesLoaded		(WPARAM wParam,LPARAM lParam);

 int		OnPreShutdown		(WPARAM wParam,LPARAM lParam);

@@ -49,18 +47,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD dwReason,LPVOID Reserved)
 	return(TRUE);

 }

 

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL,MIID_LAST};

 

 extern "C" MRA_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	return(&pluginInfoEx);

 }

 

-extern "C" MRA_API const MUUID* MirandaPluginInterfaces()

-{

-	return(interfaces);

-}

-

-

 extern "C" MRA_API int Load(void)

 {

 	SIZE_T dwBuffLen;

diff --git a/protocols/MSN/msn.cpp b/protocols/MSN/msn.cpp
index 9eefa6aac7..598466ba23 100644
--- a/protocols/MSN/msn.cpp
+++ b/protocols/MSN/msn.cpp
@@ -153,9 +153,6 @@ extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD m
 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

-// MirandaPluginInterfaces - returns the protocol interface to the core

-static const MUUID interfaces[] = { MIID_PROTOCOL, MIID_LAST };

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+// MirandaInterfaces - returns the protocol interface to the core

+

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST };

diff --git a/protocols/NewsAggregator/Src/NewsAggregator.cpp b/protocols/NewsAggregator/Src/NewsAggregator.cpp
index 00c9fb61a4..c6d1cb735e 100644
--- a/protocols/NewsAggregator/Src/NewsAggregator.cpp
+++ b/protocols/NewsAggregator/Src/NewsAggregator.cpp
@@ -57,12 +57,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfoEx;

 }

 

-static const MUUID interfaces[] = {{0x29517be5, 0x779a, 0x48e5, {0x89, 0x50, 0xcb, 0x4d, 0xe1, 0xd4, 0x31, 0x72}}, MIID_LAST};

-

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {{0x29517be5, 0x779a, 0x48e5, {0x89, 0x50, 0xcb, 0x4d, 0xe1, 0xd4, 0x31, 0x72}}, MIID_LAST};

 

 extern "C" __declspec(dllexport) int Load(void)

 {

diff --git a/protocols/Omegle/main.cpp b/protocols/Omegle/main.cpp
index 1e5686a316..65de0e8a90 100644
--- a/protocols/Omegle/main.cpp
+++ b/protocols/Omegle/main.cpp
@@ -69,11 +69,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 /////////////////////////////////////////////////////////////////////////////////////////

 // Interface information

 

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // Load

diff --git a/protocols/Quotes/Forex.cpp b/protocols/Quotes/Forex.cpp
index 4c5b1f1ca2..05d1ecaabb 100644
--- a/protocols/Quotes/Forex.cpp
+++ b/protocols/Quotes/Forex.cpp
@@ -400,13 +400,9 @@ extern "C"
 	}

 

 

-#define MIID_QUOTES	{0x723243c2, 0x8d4b, 0x4c29, { 0x8a, 0x37, 0xc0, 0x11, 0x48, 0x65, 0xb0, 0x80}}

+	#define MIID_QUOTES	{0x723243c2, 0x8d4b, 0x4c29, { 0x8a, 0x37, 0xc0, 0x11, 0x48, 0x65, 0xb0, 0x80}}

 

-	__declspec(dllexport) const MUUID* MirandaPluginInterfaces()

-	{

-		static const MUUID interfaces[] = {MIID_PROTOCOL,MIID_QUOTES,MIID_LAST};

-		return interfaces;

-	}

+	__declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL,MIID_QUOTES,MIID_LAST};

 

 	int __declspec(dllexport) Load(void)

 	{

diff --git a/protocols/Tlen/tlen.c b/protocols/Tlen/tlen.c
index 027e7add2e..2f8d860a64 100644
--- a/protocols/Tlen/tlen.c
+++ b/protocols/Tlen/tlen.c
@@ -106,7 +106,7 @@ __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx( DWORD mirandaVersion )
 	return &pluginInfoEx;

 }

 

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

+extern "C" __declspec(dllexport) const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

 __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

 {

 	return interfaces;

diff --git a/protocols/Tlen/tlen_czaty/mucc.cpp b/protocols/Tlen/tlen_czaty/mucc.cpp
index 46b0155d70..e5c35c070a 100644
--- a/protocols/Tlen/tlen_czaty/mucc.cpp
+++ b/protocols/Tlen/tlen_czaty/mucc.cpp
@@ -84,7 +84,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda
 #define MIID_TLEN_MUCC	{ 0xba658997, 0x0bce, 0x4f96, { 0xba, 0x48, 0x54, 0x55, 0x34, 0x16, 0x73, 0xea } }

 #endif

 

-static const MUUID interfaces[] = {

+extern "C" __declspec(dllexport) const MUUID interfaces[] = {

 		MIID_TLEN_MUCC,

 		MIID_LAST

 	};

diff --git a/protocols/Twitter/main.cpp b/protocols/Twitter/main.cpp
index 9972de9236..0987de5963 100644
--- a/protocols/Twitter/main.cpp
+++ b/protocols/Twitter/main.cpp
@@ -65,11 +65,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 /////////////////////////////////////////////////////////////////////////////////////////

 // Interface information

 

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // Load

diff --git a/protocols/Weather/weather.cpp b/protocols/Weather/weather.cpp
index d0527b794e..9c6f762683 100644
--- a/protocols/Weather/weather.cpp
+++ b/protocols/Weather/weather.cpp
@@ -81,12 +81,8 @@ extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD m
 	return &pluginInfoEx;

 }

 

-// MirandaPluginInterfaces - returns the protocol interface to the core

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+// MirandaInterfaces - returns the protocol interface to the core

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) 

 {

diff --git a/protocols/YAMN/main.cpp b/protocols/YAMN/main.cpp
index 2dd7f050b6..7e55eb236a 100644
--- a/protocols/YAMN/main.cpp
+++ b/protocols/YAMN/main.cpp
@@ -157,12 +157,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static const MUUID interfaces[] = {MUUID_YAMN_FORCECHECK, MIID_LAST};

-

-extern "C" __declspec(dllexport) const MUUID * MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MUUID_YAMN_FORCECHECK, MIID_LAST};

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

diff --git a/protocols/Yahoo/main.cpp b/protocols/Yahoo/main.cpp
index 74f5285461..bb66cf0206 100644
--- a/protocols/Yahoo/main.cpp
+++ b/protocols/Yahoo/main.cpp
@@ -146,12 +146,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 }

 

 /*

- * MirandaPluginInterfaces - Notifies the core of interfaces implemented

+ * MirandaInterfaces - Notifies the core of interfaces implemented

  * Parameters: none

  */

-static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};