From 357af8c5a3cf922818ee014a8f2b54a799917eea Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 5 Jun 2012 15:39:50 +0000 Subject: removed old PLUGININFO. plugin info cleanup starts git-svn-id: http://svn.miranda-ng.org/main/trunk@312 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AddContactPlus/main.cpp | 12 +--- plugins/Alarms/alarms.cpp | 8 +-- plugins/AssocMgr/main.c | 25 +------- plugins/Bonsai/Bonsai.cpp | 12 +--- plugins/Bonsai/commonheaders.h | 22 ------- plugins/BuddyExpectator/BuddyExpectator.cpp | 20 +----- plugins/CSList/cslist.h | 1 - plugins/Chat/main.c | 5 -- plugins/ClientChangeNotify/ClientChangeNotify.cpp | 61 ++----------------- plugins/ClientChangeNotify/Resources.rc2 | 17 ++---- plugins/ClientChangeNotify/VersionNo.h | 16 +++-- plugins/Clist/init.c | 8 +-- plugins/Clist_nicer/skineditor/main.cpp | 50 +++------------ plugins/ContactsPlus/main.cpp | 43 ++----------- plugins/CountryFlags/main.c | 27 +-------- plugins/CountryFlags/version.h | 3 - plugins/CryptoPP/commonheaders.cpp | 12 ---- plugins/CryptoPP/commonheaders.h | 1 - plugins/CryptoPP/main.cpp | 7 --- plugins/Db3x_mmap/init.c | 4 -- plugins/Db_autobackups/main.c | 4 -- plugins/Dbx_mmap_SA/Import_SA/main.c | 5 +- plugins/Dbx_mmap_SA/init.c | 5 -- plugins/ExtraIcons/extraicons.cpp | 9 +-- plugins/FloatingContacts/main.cpp | 25 -------- plugins/Folders/commonheaders.h | 18 ------ plugins/Folders/folders.cpp | 9 +-- plugins/HistoryLinkListPlus/linklist.c | 2 +- plugins/HistoryLinkListPlus/linklist.h | 1 - plugins/HistoryLinkListPlus/linklist_dlg.c | 1 - plugins/IgnoreState/main.cpp | 6 -- plugins/Import/main.c | 3 - plugins/KeyboardNotify/main.cpp | 22 +------ plugins/LangMan/main.cpp | 9 +-- plugins/LangMan/options.cpp | 10 ++- plugins/LangMan/version.h | 3 - plugins/ListeningTo/listeningto.cpp | 15 ----- plugins/MenuItemEx/menuex.h | 1 - plugins/Modernb/init.cpp | 7 --- plugins/NewAwaySysMod/AwaySys.cpp | 55 +---------------- plugins/Rate/main.cpp | 8 +-- plugins/SRMM/srmm.c | 6 -- plugins/Scriver/srmm.c | 12 +--- plugins/SimpleStatusMsg/main.cpp | 10 --- plugins/TooltipNotify/src/main.cpp | 74 +++++------------------ plugins/Updater/updater.cpp | 11 +--- plugins/UserInfoEx/init.cpp | 4 -- plugins/Variables/main.cpp | 34 +---------- plugins/WhenWasIt/WhenWasIt.cpp | 8 +-- plugins/WhenWasIt/commonheaders.h | 18 ------ plugins/YAMN/main.cpp | 10 --- plugins/YAPP/popups2.cpp | 7 --- plugins/ZeroNotification/main.c | 11 ---- plugins/mTextControl/src/headers.h | 1 - plugins/mTextControl/src/main.cpp | 21 ------- plugins/mTextControl/src/services.cpp | 2 +- 56 files changed, 77 insertions(+), 724 deletions(-) diff --git a/plugins/AddContactPlus/main.cpp b/plugins/AddContactPlus/main.cpp index fb772537dc..201da5572f 100644 --- a/plugins/AddContactPlus/main.cpp +++ b/plugins/AddContactPlus/main.cpp @@ -38,20 +38,15 @@ PLUGININFOEX pluginInfo = { "AddContact+ (ANSI)", #endif PLUGIN_MAKE_VERSION(0, 9, 9, 0), - "Provides the ability to quickly add new contacts", + "Provides the ability to quickly add new contacts.", "Bartosz 'Dezeath' Bia³ek", "dezred"/*antispam*/"@"/*antispam*/"gmail"/*antispam*/"."/*antispam*/"com", "© 2007-2011 Bartosz 'Dezeath' Bia³ek", "http://code.google.com/p/dezeath", UNICODE_AWARE, 0, -#ifdef _UNICODE // {6471D451-2FE0-4ee2-850E-9F84F3C0D187} { 0x6471d451, 0x2fe0, 0x4ee2, { 0x85, 0xe, 0x9f, 0x84, 0xf3, 0xc0, 0xd1, 0x87 } } -#else - // {64B41F85-A2D1-4cac-AA35-658DF950FE05} - { 0x64b41f85, 0xa2d1, 0x4cac, { 0xaa, 0x35, 0x65, 0x8d, 0xf9, 0x50, 0xfe, 0x5 } } -#endif }; static const MUUID interfaces[] = {MIID_ADDCONTACTPLUS, MIID_LAST}; @@ -64,11 +59,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 9, 0, 0)) - { - MessageBox(NULL, _T("The AddContact+ plugin cannot be loaded. It requires Miranda IM 0.9 or later."), _T("AddContact+ Plugin"), MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST); - return NULL; - } return &pluginInfo; } diff --git a/plugins/Alarms/alarms.cpp b/plugins/Alarms/alarms.cpp index 7882173482..626b917178 100644 --- a/plugins/Alarms/alarms.cpp +++ b/plugins/Alarms/alarms.cpp @@ -40,7 +40,7 @@ PLUGININFOEX pluginInfo={ "mail@scottellis.com.au", "© 2005 Scott Ellis", "http://www.scottellis.com.au", - 0, //not transient + UNICODE_AWARE, //not transient 0, //doesn't replace anything built-in { 0x4dd7762b, 0xd612, 0x4f84, { 0xaa, 0x86, 0x6, 0x8f, 0x17, 0x85, 0x9b, 0x6d } } // {4DD7762B-D612-4f84-AA86-068F17859B6D} }; @@ -56,12 +56,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - pluginInfo.cbSize = sizeof(PLUGININFO); - return (PLUGININFO*)&pluginInfo; -} - static const MUUID interfaces[] = {MIID_ALARMS, MIID_LAST}; extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) { diff --git a/plugins/AssocMgr/main.c b/plugins/AssocMgr/main.c index 55c93fa40d..a689ad654d 100644 --- a/plugins/AssocMgr/main.c +++ b/plugins/AssocMgr/main.c @@ -29,29 +29,19 @@ struct UTF8_INTERFACE utfi; static HANDLE hHookModulesLoaded; int hLangpack; -static char szPluginInfoEmail[]=PLUGIN_EMAIL; PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), "File Association Manager", PLUGIN_VERSION, -#if defined(_DEBUG) - "Development build not intended for release. ("__DATE__")", /* autotranslated */ -#else "Handles file type associations and URLs like aim, ymsgr, xmpp, wpmsg, gg, tlen.", /* autotranslated */ -#endif "H. Herkenrath", - szPluginInfoEmail, /* @ will be set later */ + "hrathh@users.sourceforge.net", "© 2005-2007 H. Herkenrath", PLUGIN_WEBSITE, UNICODE_AWARE, 0, -#if defined(_UNICODE) // {52685CD7-0EC7-44c1-A1A6-381612418202} - {0x52685cd7,0xec7,0x44c1,{0xa1,0xa6,0x38,0x16,0x12,0x41,0x82,0x2}}, -#else - // {48692828-D4BA-43b5-BF81-44F384811569} - {0x48692828,0xd4ba,0x43b5,{0xbf,0x81,0x44,0xf3,0x84,0x81,0x15,0x69}} -#endif + {0x52685cd7,0xec7,0x44c1,{0xa1,0xa6,0x38,0x16,0x12,0x41,0x82,0x2}} }; static const MUUID interfaces[]={MIID_ASSOCMGR,MIID_AUTORUN,MIID_LAST}; @@ -110,19 +100,8 @@ static int AssocMgrModulesLoaded(WPARAM wParam,LPARAM lParam) extern "C" { #endif -__declspec(dllexport) const PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - if(mirandaVersion hHooks, hServices; COptPage *g_PreviewOptPage; // we need to show popup even for the NULL contact if g_PreviewOptPage is not NULL (used for popup preview) - -// my_make_version is required to break up #define PRODUCTVER from VersionNo.h -DWORD my_make_version(const int a, const int b, const int c, const int d) -{ - return PLUGIN_MAKE_VERSION(a, b, c, d); -} - PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "ClientChangeNotify (" -#ifdef _DEBUG - "DEBUG " -#endif -#ifdef _UNICODE - "Unicode" -#else - "ANSI" -#endif - ")", - 0, // see VersionNo.h - "ClientChangeNotify plugin for Miranda IM. Build #"STRSPECIALBUILD" [ "__DATE__" "__TIME__ -#ifdef _DEBUG - " DEBUG" -#endif -#ifdef _UNICODE - " Unicode" -#else - " ANSI" -#endif - " ]", + "ClientChangeNotify", + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + "ClientChangeNotify plugin for Miranda IM.", "Deathdemon", "dchervov@yahoo.com", "© 2006-2008 Chervov Dmitry", "http://deathdemon.int.ru/", UNICODE_AWARE, 0, -#ifdef _UNICODE + // {B68A8906-748B-435d-930E-21CC6E8F3B3F} {0xb68a8906, 0x748b, 0x435d, {0x93, 0xe, 0x21, 0xcc, 0x6e, 0x8f, 0x3b, 0x3f}} -// {B68A8906-748B-435d-930E-21CC6E8F3B3F} -#else - {0x4e8d06c6, 0xde4f, 0x4b72, {0x9c, 0x52, 0xc2, 0x78, 0x72, 0xed, 0x3, 0xb9}} -// {4E8D06C6-DE4F-4b72-9C52-C27872ED03B9} -#endif -}; - -PLUGININFO oldPluginInfo = { - sizeof(PLUGININFO), - pluginInfo.shortName, - pluginInfo.version, - pluginInfo.description, - pluginInfo.author, - pluginInfo.authorEmail, - pluginInfo.copyright, - pluginInfo.homepage, - pluginInfo.flags, - pluginInfo.replacesDefaultModule }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -115,17 +72,9 @@ extern "C" __declspec(dllexport) const MUUID *MirandaPluginInterfaces(void) extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) { - pluginInfo.version = my_make_version(PRODUCTVER); return &pluginInfo; } -extern "C" __declspec(dllexport) PLUGININFO *MirandaPluginInfo(DWORD mirandaVersion) -{ - oldPluginInfo.version = my_make_version(PRODUCTVER); - return &oldPluginInfo; -} - - static int CALLBACK MenuWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) @@ -464,7 +413,7 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam) char szVersion[16]; update.cbSize = sizeof(Update); update.szComponentName = pluginInfo.shortName; - update.pbVersion = (BYTE*)CreateVersionString(my_make_version(PRODUCTVER), szVersion); + update.pbVersion = (BYTE*)CreateVersionString(PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), szVersion); update.cpbVersion = (int)strlen((char*)update.pbVersion); update.szUpdateURL = "http://deathdemon.int.ru/projects/ClientChangeNotify" #ifdef _UNICODE diff --git a/plugins/ClientChangeNotify/Resources.rc2 b/plugins/ClientChangeNotify/Resources.rc2 index 2a2e6517dd..7a6a4c4a18 100644 --- a/plugins/ClientChangeNotify/Resources.rc2 +++ b/plugins/ClientChangeNotify/Resources.rc2 @@ -17,8 +17,8 @@ // #include "VersionNo.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION FILEVER - PRODUCTVERSION PRODUCTVER + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x21L @@ -34,20 +34,11 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Deathdemon" - VALUE "FileDescription", "ClientChangeNotify plugin for Miranda IM" - VALUE "FileVersion", STRFILEVER + VALUE "FileDescription", "ClientChangeNotify plugin for Miranda IM." VALUE "LegalCopyright", "© 2006-2008 Chervov Dmitry" -#ifdef _UNICODE - VALUE "InternalName", "ClientChangeNotifyW" + VALUE "InternalName", "ClientChangeNotify" VALUE "OriginalFilename", "ClientChangeNotifyW.dll" VALUE "ProductName", "ClientChangeNotify (Unicode)" -#else - VALUE "InternalName", "ClientChangeNotify" - VALUE "OriginalFilename", "ClientChangeNotify.dll" - VALUE "ProductName", "ClientChangeNotify (ANSI)" -#endif - VALUE "ProductVersion", STRPRODUCTVER - VALUE "SpecialBuild", STRSPECIALBUILD END END BLOCK "VarFileInfo" diff --git a/plugins/ClientChangeNotify/VersionNo.h b/plugins/ClientChangeNotify/VersionNo.h index a393471376..13ba7afb9f 100644 --- a/plugins/ClientChangeNotify/VersionNo.h +++ b/plugins/ClientChangeNotify/VersionNo.h @@ -1,5 +1,11 @@ -#define STRSPECIALBUILD "62" -#define FILEVER 0, 1, 1, 3 -#define STRFILEVER "0, 1, 1, 3" -#define PRODUCTVER FILEVER -#define STRPRODUCTVER STRFILEVER +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 1 +#define __RELEASE_NUM 1 +#define __BUILD_NUM 3 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM +#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM + +#define __STRINGIFY_IMPL(x) #x +#define __STRINGIFY(x) __STRINGIFY_IMPL(x) +#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) diff --git a/plugins/Clist/init.c b/plugins/Clist/init.c index e898a5c72e..319e3a6f1f 100644 --- a/plugins/Clist/init.c +++ b/plugins/Clist/init.c @@ -64,24 +64,18 @@ PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), "Classic contact list", __VERSION_DWORD, - "Display contacts, event notifications, protocol status", + "Display contacts, event notifications, protocol status.", "Miranda IM project", "ghazan@miranda-im.org", "Copyright 2000-2008 Miranda IM project", "http://www.miranda-im.org", UNICODE_AWARE, DEFMOD_CLISTALL, - #if defined( _UNICODE ) {0x240a91dc, 0x9464, 0x457a, { 0x97, 0x87, 0xff, 0x1e, 0xa8, 0x8e, 0x77, 0xe3 }} //{240A91DC-9464-457a-9787-FF1EA88E77E3} - #else - {0x552cf71a, 0x249f, 0x4650, { 0xbb, 0x2b, 0x7c, 0xdb, 0x1f, 0xe7, 0xd1, 0x78 }} //{552CF71A-249F-4650-BB2B-7CDB1FE7D178} - #endif }; __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < MIRANDA_VERSION_CORE) - return NULL; return &pluginInfo; } diff --git a/plugins/Clist_nicer/skineditor/main.cpp b/plugins/Clist_nicer/skineditor/main.cpp index fc496c1cc9..929b083c2d 100644 --- a/plugins/Clist_nicer/skineditor/main.cpp +++ b/plugins/Clist_nicer/skineditor/main.cpp @@ -26,36 +26,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ID_EXTBKSEPARATOR 40200 -/* -PLUGININFO pluginInfo = { - sizeof(PLUGININFO), - "Skin editor", - PLUGIN_MAKE_VERSION(0, 0, 0, 4), - "Skin editor for clist_nicer+", - "Nightwish", - "", - "Copyright 2000-2006 Miranda-IM project", - "http://www.miranda-im.org", - 0, - 0 -}; -*/ - PLUGININFOEX pluginInfo = { -#if defined(_UNICODE) - sizeof(PLUGININFOEX), "Skin editor for clist_nicer+ (unicode)", PLUGIN_MAKE_VERSION(0, 0, 0, 4), -#else - sizeof(PLUGININFOEX), "Skin editor for clist_nicer+", PLUGIN_MAKE_VERSION(0, 0, 0, 4), -#endif - "Allow inline skin item editing for clist nicer+", - "Nightwish, Pixel", "", "Copyright 2000-2006 Miranda-IM project", "http://www.miranda-im.org", + sizeof(PLUGININFOEX), + "Skin editor for clist_nicer+ (unicode)", + PLUGIN_MAKE_VERSION(0, 0, 0, 4), + "Allow inline skin item editing for clist nicer+.", + "Nightwish, Pixel", + "", + "Copyright 2000-2006 Miranda-IM project", + "http://www.miranda-im.org", UNICODE_AWARE, 0, -#if defined(_UNICODE) {0x21948c89, 0xb549, 0x4c9d, { 0x8b, 0x4f, 0x3f, 0x37, 0x26, 0xec, 0x6b, 0x4b }} -#else - {0xa0c06bfe, 0x64cf, 0x487e, { 0x82, 0x87, 0x8c, 0x9b, 0x1, 0x97, 0x7d, 0xff }} -#endif }; HINSTANCE g_hInst = 0; @@ -943,13 +925,6 @@ static int LoadModule() extern "C" __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD mirandaVersion) { -#if defined(_UNICODE) - pluginInfo.flags |= UNICODE_AWARE; - if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 7, 0, 0)) -#else - if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 7, 0, 0)) -#endif - return NULL; return &pluginInfo; } @@ -962,15 +937,6 @@ extern "C" __declspec(dllexport) const MUUID * MirandaPluginInterfaces(void) return interfaces; } -/* -extern "C" __declspec(dllexport) PLUGININFO * MirandaPluginInfo(DWORD mirandaVersion) -{ - if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 4, 0, 0)) - return NULL; - return &pluginInfo; -} -*/ - static int ModulesLoaded(WPARAM wParam, LPARAM lParam) { return 0; diff --git a/plugins/ContactsPlus/main.cpp b/plugins/ContactsPlus/main.cpp index b312850cd9..de33f9338e 100644 --- a/plugins/ContactsPlus/main.cpp +++ b/plugins/ContactsPlus/main.cpp @@ -29,10 +29,10 @@ HINSTANCE hInst; PLUGINLINK *pluginLink; int hLangpack; -int g_NewProtoAPI = FALSE; +int g_NewProtoAPI = TRUE; -int g_SendAckSupported = FALSE; -int g_Utf8EventsSupported = FALSE; +int g_SendAckSupported = TRUE; +int g_Utf8EventsSupported = TRUE; HANDLE ghSendWindowList; HANDLE ghRecvWindowList; @@ -64,7 +64,7 @@ PLUGININFOEX pluginInfo = { "jokusoftware@miranda-im.org", "(C) 2004-2008 Joe Kucera, Original Code (C) 2002 Dominus Procellarum", "http://addons.miranda-im.org/details.php?action=viewfile&id=1253", - 0, //no flags by default + UNICODE_AWARE, //no flags by default 0, //doesn't replace anything built-in {0x0324785E, 0x74CE, 0x4600, {0xB7, 0x81, 0x85, 0x17, 0x73, 0xB3, 0xEF, 0xC5 } } // {0324785E-74CE-4600-B781-851773B3EFC5} }; @@ -277,42 +277,9 @@ static INT_PTR ServiceReceiveCommand(WPARAM wParam, LPARAM lParam) return 0; } - -static void* PrepareMirandaPluginInfo(DWORD mirandaVersion) -{ - if (!(mirandaVersion >= PLUGIN_MAKE_VERSION(0,4,0,0))) - pluginInfo.description = "Allows you to send and receive contacts; Please upgrade your Miranda IM to version 0.4 for better functionality."; - else - g_SendAckSupported = TRUE; - - if (mirandaVersion >= PLUGIN_MAKE_VERSION(0,7,0,0)) - g_Utf8EventsSupported = TRUE; - - if (mirandaVersion >= PLUGIN_MAKE_VERSION(0,8,0,8)) - g_NewProtoAPI = TRUE; - - if (mirandaVersion >= PLUGIN_MAKE_VERSION(0,3,3,0)) - { - // Are we running under Unicode Windows version ? - if ((GetVersion() & 0x80000000) == 0) - { - pluginInfo.flags = 1; // UNICODE_AWARE - } - return &pluginInfo; - } - return NULL; -} - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - pluginInfo.cbSize = sizeof(PLUGININFOEX); - return (PLUGININFOEX*)PrepareMirandaPluginInfo(mirandaVersion); -} - -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - pluginInfo.cbSize = sizeof(PLUGININFO); - return (PLUGININFO*)PrepareMirandaPluginInfo(mirandaVersion); + return &pluginInfo; } static const MUUID interfaces[] = {MIID_SRCONTACTS, MIID_LAST}; diff --git a/plugins/CountryFlags/main.c b/plugins/CountryFlags/main.c index 5496f0fdbd..cb2f36b2e8 100644 --- a/plugins/CountryFlags/main.c +++ b/plugins/CountryFlags/main.c @@ -26,30 +26,20 @@ struct MM_INTERFACE mmi; int nCountriesCount; struct CountryListEntry *countries; int hLangpack; -static char szEmail[100] = PLUGIN_EMAIL; static PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), "Country Flags", PLUGIN_VERSION, -#if defined(_DEBUG) - "Development build not intended for release. ("__DATE__")", /* autotranslated */ -#else "Service offering misc country utilities as flag icons and a IP-to-Country database.", /* autotranslated */ -#endif "H. Herkenrath", - szEmail, /* @ will be set later */ + "hrathh@users.sourceforge.net", "© 2006-2007 H. Herkenrath", PLUGIN_WEBSITE, UNICODE_AWARE, 0, -#if defined(_UNICODE) // {68C36842-3D95-4f4a-AB81-014D6593863B} - {0x68c36842,0x3d95,0x4f4a,{0xab,0x81,0x1,0x4d,0x65,0x93,0x86,0x3b}}, -#else - // {E0C4681C-E680-4262-8B44-7A9540C064FF} - {0xe0c4681c,0xe680,0x4262,{0x8b,0x44,0x7a,0x95,0x40,0xc0,0x64,0xff}} -#endif + {0x68c36842,0x3d95,0x4f4a,{0xab,0x81,0x1,0x4d,0x65,0x93,0x86,0x3b}} }; static const MUUID interfaces[]={MIID_FLAGS,MIID_LAST}; @@ -96,21 +86,8 @@ static void InstallFile(const TCHAR *pszFileName,const TCHAR *pszDestSubDir) extern "C" { #endif -__declspec(dllexport) const PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - if(mirandaVersion= 1300 - Log("%s", "Entering function " __FUNCTION__); - Log("%s", "Leaving function " __FUNCTION__); -#endif - pluginInfo.cbSize = sizeof(PLUGININFOEX); return &pluginInfo; } diff --git a/plugins/HistoryLinkListPlus/linklist.c b/plugins/HistoryLinkListPlus/linklist.c index cd4f59f056..4f32a7a4a9 100644 --- a/plugins/HistoryLinkListPlus/linklist.c +++ b/plugins/HistoryLinkListPlus/linklist.c @@ -260,7 +260,7 @@ static INT_PTR LinkList_Main(WPARAM wParam,LPARAM lParam) { free(dbe.pBlob); RemoveList(listStart); - MessageBox(NULL, TranslateTS("Could not allocate memory!"), TranslateT("Error"), MB_OK | MB_ICONEXCLAMATION); + MessageBox(NULL, TranslateT("Could not allocate memory!"), TranslateT("Error"), MB_OK | MB_ICONEXCLAMATION); return -1; } } diff --git a/plugins/HistoryLinkListPlus/linklist.h b/plugins/HistoryLinkListPlus/linklist.h index 297ee3fd8f..4d56733a7d 100644 --- a/plugins/HistoryLinkListPlus/linklist.h +++ b/plugins/HistoryLinkListPlus/linklist.h @@ -131,7 +131,6 @@ typedef struct{ BOOL WINAPI DllMain(HINSTANCE ,DWORD ,LPVOID ); int __declspec(dllexport) Load(PLUGINLINK*); -__declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD); int __declspec(dllexport) Unload(void); static INT_PTR LinkList_Main(WPARAM, LPARAM); int InitOptionsDlg(WPARAM, LPARAM); diff --git a/plugins/HistoryLinkListPlus/linklist_dlg.c b/plugins/HistoryLinkListPlus/linklist_dlg.c index c416e0121a..150e7d7d29 100644 --- a/plugins/HistoryLinkListPlus/linklist_dlg.c +++ b/plugins/HistoryLinkListPlus/linklist_dlg.c @@ -40,7 +40,6 @@ extern HINSTANCE hInst; extern HANDLE hWindowList; -extern PLUGININFO pluginInfo; extern HCURSOR splitCursor; MYCOLOURSET colourSet; diff --git a/plugins/IgnoreState/main.cpp b/plugins/IgnoreState/main.cpp index ac75d51e8a..824569c959 100644 --- a/plugins/IgnoreState/main.cpp +++ b/plugins/IgnoreState/main.cpp @@ -69,12 +69,6 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese // ïëàãèíèíôî extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 8, 0, 29)) - { - MessageBox( NULL, TranslateT("The plugin requires Miranda IM 0.8.0.29 or later for correct applying its preferences."), TranslateT("IgnoreState"), - MB_OK|MB_ICONWARNING|MB_SETFOREGROUND|MB_TOPMOST ); - } - return &pluginInfo; } diff --git a/plugins/Import/main.c b/plugins/Import/main.c index 844f75d292..6777702db0 100644 --- a/plugins/Import/main.c +++ b/plugins/Import/main.c @@ -86,9 +86,6 @@ static INT_PTR ImportCommand(WPARAM wParam,LPARAM lParam) __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < MIRANDA_VERSION_CORE) - return NULL; - return &pluginInfo; } diff --git a/plugins/KeyboardNotify/main.cpp b/plugins/KeyboardNotify/main.cpp index ff131f0c89..b1e61b278d 100644 --- a/plugins/KeyboardNotify/main.cpp +++ b/plugins/KeyboardNotify/main.cpp @@ -307,7 +307,7 @@ BYTE bMetaProtoEnabled = 0; PLUGININFOEX pluginInfo={ - sizeof(PLUGININFO), + sizeof(PLUGININFOEX), "Keyboard Notify Ext.", PLUGIN_MAKE_VERSION(1,5,7,7), "Flashes your keyboard LEDs when a message has arrived", @@ -1134,40 +1134,20 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } - - -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - - pluginInfo.cbSize = sizeof(PLUGININFO); - return (PLUGININFO*)&pluginInfo; - -} - - - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - - pluginInfo.cbSize = sizeof(PLUGININFOEX); return &pluginInfo; - } - - #define MIID_KBDNOTIFY {0x119d7288, 0x2050, 0x448d, { 0x99, 0x00, 0xd8, 0x6a, 0xc7, 0x04, 0x26, 0xbf }} static const MUUID interfaces[] = {MIID_KBDNOTIFY, MIID_LAST}; extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) { - return interfaces; - } extern "C" __declspec(dllexport) int Load(PLUGINLINK *link) { - pluginLink = link; mir_getLP(&pluginInfo); mir_getMMI(&mmi); diff --git a/plugins/LangMan/main.cpp b/plugins/LangMan/main.cpp index bcd3dba640..cc023a91fa 100644 --- a/plugins/LangMan/main.cpp +++ b/plugins/LangMan/main.cpp @@ -28,19 +28,13 @@ struct MM_INTERFACE mmi; static HANDLE hHookModulesLoaded; int hLangpack; -static char szEmail[100] = PLUGIN_EMAIL; - static PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), "Language Pack Manager", PLUGIN_VERSION, -#if defined(_DEBUG) - "Development build not intended for release. ("__DATE__")", /* autotranslated */ -#else "Helps you manage Language Packs of different languages.", /* autotranslated */ -#endif "H. Herkenrath", - szEmail, /* @ will be set later */ + "hrathh@users.sourceforge.net", "© 2005-2007 H. Herkenrath", PLUGIN_WEBSITE, UNICODE_AWARE, @@ -98,7 +92,6 @@ extern "C" { __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD) { - szEmail[PLUGIN_EMAIL_ATT_POS-1] = '@'; return &pluginInfo; } diff --git a/plugins/LangMan/options.cpp b/plugins/LangMan/options.cpp index e0646c17fe..a6acdd9aea 100644 --- a/plugins/LangMan/options.cpp +++ b/plugins/LangMan/options.cpp @@ -177,8 +177,8 @@ static void DisplayNotIncludedPlugins(HWND hwndListBox, const LANGPACK_INFO *pac char buf[128]; TCHAR buf2[128]; DWORD mirandaVersion; - PLUGININFO *pluginInfo; - PLUGININFO *(__cdecl *MirandaPluginInfo)(DWORD); + PLUGININFOEX *pluginInfo; + PLUGININFOEX *(__cdecl *MirandaPluginInfo)(DWORD); /* enum plugins */ if (!(pack->flags&LPF_DEFAULT) && GetModuleFileName(NULL, szDir, SIZEOF(szDir))) { @@ -215,12 +215,10 @@ static void DisplayNotIncludedPlugins(HWND hwndListBox, const LANGPACK_INFO *pac if (hModule == NULL) continue; } /* plugin info */ - *(PROC*)&MirandaPluginInfo = GetProcAddress(hModule, "MirandaPluginInfo"); - if (MirandaPluginInfo == NULL) /* v0.8 support */ - *(PROC*)&MirandaPluginInfo = GetProcAddress(hModule, "MirandaPluginInfoEx"); + *(PROC*)&MirandaPluginInfo = GetProcAddress(hModule, "MirandaPluginInfoEx"); if (MirandaPluginInfo!=NULL) { /* both structs have the same header */ pluginInfo = MirandaPluginInfo(mirandaVersion); - if (pluginInfo!=NULL && pluginInfo->cbSize >= sizeof(PLUGININFO) && pluginInfo->shortName!=NULL) { + if (pluginInfo!=NULL && pluginInfo->cbSize >= sizeof(PLUGININFOEX) && pluginInfo->shortName!=NULL) { lstrcpynA(buf, pluginInfo->shortName, sizeof(buf)); /* buffer safe */ CleanupPluginName(buf); mir_sntprintf(buf2, SIZEOF(buf2), TranslateT("%hs (%s)"), buf, CharLower(wfd.cFileName)); diff --git a/plugins/LangMan/version.h b/plugins/LangMan/version.h index 10ebf964ff..296ad97e87 100644 --- a/plugins/LangMan/version.h +++ b/plugins/LangMan/version.h @@ -32,9 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define USERAGENT_VERSION "1.0.2.3" #endif -#define PLUGIN_EMAIL "hrathh users.sourceforge.net" -#define PLUGIN_EMAIL_ATT_POS 7 /* position of the @-sign in the email adress above */ - #if defined(_UNICODE) #define PLUGIN_WEBSITE "http://addons.miranda-im.org/details.php?action = viewfile&id = 3003" #else diff --git a/plugins/ListeningTo/listeningto.cpp b/plugins/ListeningTo/listeningto.cpp index 575c28dcb6..ca89e587f9 100644 --- a/plugins/ListeningTo/listeningto.cpp +++ b/plugins/ListeningTo/listeningto.cpp @@ -40,11 +40,7 @@ int hLangpack; PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), -#ifdef UNICODE - "ListeningTo (Unicode)", -#else "ListeningTo", -#endif PLUGIN_MAKE_VERSION(0,3,0,0), "Handle listening information to/for contacts", "Ricardo Pescuma Domenecci", @@ -53,11 +49,7 @@ PLUGININFOEX pluginInfo={ "http://pescuma.org/miranda/listeningto", UNICODE_AWARE, 0, //doesn't replace anything built-in -#ifdef UNICODE { 0xf981f3f5, 0x35a, 0x444f, { 0x98, 0x92, 0xca, 0x72, 0x2c, 0x19, 0x5a, 0xda } } // {F981F3F5-035A-444f-9892-CA722C195ADA} -#else - { 0xa4a8ff7a, 0xc48a, 0x4d2a, { 0xb5, 0xa9, 0x46, 0x46, 0x84, 0x43, 0x26, 0x3d } } // {A4A8FF7A-C48A-4d2a-B5A9-46468443263D} -#endif }; @@ -134,13 +126,6 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvRe } -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - pluginInfo.cbSize = sizeof(PLUGININFO); - return (PLUGININFO*) &pluginInfo; -} - - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { pluginInfo.cbSize = sizeof(PLUGININFOEX); diff --git a/plugins/MenuItemEx/menuex.h b/plugins/MenuItemEx/menuex.h index 6e738c04a6..9b831ea489 100644 --- a/plugins/MenuItemEx/menuex.h +++ b/plugins/MenuItemEx/menuex.h @@ -40,7 +40,6 @@ #define MIIM_STRING 0x00000040 extern PLUGINLINK *pluginLink; -extern PLUGININFO pluginInfo; extern PLUGININFOEX pluginInfoEx; extern MUUID interfaces[]; diff --git a/plugins/Modernb/init.cpp b/plugins/Modernb/init.cpp index 849cb767a5..6ff21f5963 100644 --- a/plugins/Modernb/init.cpp +++ b/plugins/Modernb/init.cpp @@ -67,11 +67,7 @@ PLUGININFOEX pluginInfo = { "http://miranda-im.org/development", UNICODE_AWARE, DEFMOD_CLISTALL, -#ifdef UNICODE {0x43909b6, 0xaad8, 0x4d82, { 0x8e, 0xb5, 0x9f, 0x64, 0xcf, 0xe8, 0x67, 0xcd }} //{043909B6-AAD8-4d82-8EB5-9F64CFE867CD} -#else - {0xf6588c56, 0x15dc, 0x4cd7, { 0x8c, 0xf9, 0x48, 0xab, 0x6c, 0x5f, 0xd2, 0xf }} //{F6588C56-15DC-4cd7-8CF9-48AB6C5FD20F} -#endif }; static const MUUID interfaces[] = {MIID_CLIST, MIID_LAST}; @@ -94,9 +90,6 @@ inline int MakeVer(int a, int b, int c, int d) PLUGININTERFACE PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if ( mirandaVersion < MINIMAL_COREVERSION_NUM ) - return NULL; - pluginInfo.version=MakeVer(PRODUCT_VERSION); return &pluginInfo; } diff --git a/plugins/NewAwaySysMod/AwaySys.cpp b/plugins/NewAwaySysMod/AwaySys.cpp index ee6badfbbf..26bb4bdd5b 100644 --- a/plugins/NewAwaySysMod/AwaySys.cpp +++ b/plugins/NewAwaySysMod/AwaySys.cpp @@ -84,58 +84,16 @@ DWORD my_make_version(const int a, const int b, const int c, const int d) PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "New Away System Mod (" -#ifdef _DEBUG - "DEBUG " -#endif -#ifdef _UNICODE - "Unicode" -#else - "ANSI" -#endif - ")", - 0, // see VersionNo.h - "New Away System Mod plugin for Miranda IM. Build #"STRSPECIALBUILD" [ "__DATE__" "__TIME__ -#ifdef _DEBUG - " DEBUG" -#endif -#ifdef _UNICODE - " Unicode" -#else - " ANSI" -#endif - " ]", + "New Away System Mod", + my_make_version(PRODUCTVER), // see VersionNo.h + "New Away System Mod plugin for Miranda IM.", "NightFox; Deathdemon; XF007; Goblineye Entertainment", "NightFox@myied.org", "© 2010 NightFox; © 2005-2007 Chervov Dmitry; © 2004-2005 Iksaif; © 2002-2003 Goblineye Entertainment", "http://MyiEd.org/packs", UNICODE_AWARE, DEFMOD_SRAWAY, // mwawawawa. -#ifdef _UNICODE -// {0x75cc4fef, 0xb038, 0x4224, {0xb3, 0x75, 0x7, 0x21, 0xf9, 0x76, 0x18, 0x13}} -// {75CC4FEF-B038-4224-B375-0721F9761813} {0xb2dd9270, 0xce5e, 0x11df, {0xbd, 0x3d, 0x8, 0x0, 0x20, 0xc, 0x9a, 0x66}} -// {b2dd9270-ce5d-11df-bd3b-0800200c9a66} -#else -// {0x313e808f, 0x7162, 0x4319, {0xae, 0xe, 0xcc, 0xad, 0x4d, 0xe5, 0xeb, 0x71}} -// {313E808F-7162-4319-AE0E-CCAD4DE5EB71} - {0x14254a00, 0xce5e, 0x11df, {0xbd, 0x3d, 0x8, 0x0, 0x20, 0xc, 0x9a, 0x66}} -// {14254a00-ce5e-11df-bd3b-0800200c9a66} - -#endif -}; - -PLUGININFO oldPluginInfo = { - sizeof(PLUGININFO), - pluginInfo.shortName, - pluginInfo.version, - pluginInfo.description, - pluginInfo.author, - pluginInfo.authorEmail, - pluginInfo.copyright, - pluginInfo.homepage, - pluginInfo.flags, - pluginInfo.replacesDefaultModule }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -152,16 +110,9 @@ extern "C" __declspec(dllexport) const MUUID *MirandaPluginInterfaces(void) extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) { - pluginInfo.version = my_make_version(PRODUCTVER); return &pluginInfo; } -extern "C" __declspec(dllexport) PLUGININFO *MirandaPluginInfo(DWORD mirandaVersion) -{ - oldPluginInfo.version = my_make_version(PRODUCTVER); - return &oldPluginInfo; -} - //NightFox int ModernOptInitialise(WPARAM wParam,LPARAM lParam); diff --git a/plugins/Rate/main.cpp b/plugins/Rate/main.cpp index e140e33d80..d5a7fcbf71 100644 --- a/plugins/Rate/main.cpp +++ b/plugins/Rate/main.cpp @@ -69,7 +69,7 @@ PLUGININFOEX pluginInfo={ "kostia@ngs.ru", "© 2006-2009 Kostia Romanov, based on AuthState by Alexander Turyak", "http://kildor.miranda.im/", - 0, // is not unicode + UNICODE_AWARE, // is not unicode 0, //doesn't replace anything built-in {0x45230488, 0x977b, 0x405b, {0x85, 0x6d, 0xea, 0x27, 0x6d, 0x70, 0x83, 0xb7}} /* 45230488-977b-405b-856d-ea276d7083b7 */ @@ -85,12 +85,6 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese // ïëàãèíèíôî extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 8, 0, 29)) - { - MessageBox( NULL, TranslateT("The plugin requires Miranda IM 0.8.0.29 or later for correct applying its preferences."), TranslateT("Contact` Rate"), - MB_OK|MB_ICONWARNING|MB_SETFOREGROUND|MB_TOPMOST ); - } - return &pluginInfo; } diff --git a/plugins/SRMM/srmm.c b/plugins/SRMM/srmm.c index a8e3949040..801b856a61 100644 --- a/plugins/SRMM/srmm.c +++ b/plugins/SRMM/srmm.c @@ -43,11 +43,7 @@ PLUGININFOEX pluginInfo = { "http://www.miranda-im.org", UNICODE_AWARE, DEFMOD_SRMESSAGE, // replace internal version (if any) -#ifdef _UNICODE {0x657fe89b, 0xd121, 0x40c2, { 0x8a, 0xc9, 0xb9, 0xfa, 0x57, 0x55, 0xb3, 0xc }} //{657FE89B-D121-40c2-8AC9-B9FA5755B30C} -#else - {0xd53dd778, 0x16d2, 0x49ac, { 0x8f, 0xb3, 0x6f, 0x9a, 0x96, 0x1c, 0x9f, 0xd2 }} //{D53DD778-16D2-49ac-8FB3-6F9A961C9FD2} -#endif }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -58,8 +54,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < MIRANDA_VERSION_CORE ) - return NULL; return &pluginInfo; } diff --git a/plugins/Scriver/srmm.c b/plugins/Scriver/srmm.c index fc3d85b055..d635fe47c5 100644 --- a/plugins/Scriver/srmm.c +++ b/plugins/Scriver/srmm.c @@ -38,24 +38,16 @@ ITaskbarList3 * pTaskbarInterface; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), -#ifdef _UNICODE - "Scriver (Unicode)", -#else "Scriver", -#endif PLUGIN_MAKE_VERSION(2, 10, 0, 2), - "Scriver - send and receive instant messages", + "Scriver - send and receive instant messages.", "Miranda IM Development Team", "the_leech@users.berlios.de", "Copyright (c) 2000-2012 Miranda IM Project", "http://www.miranda-im.org", UNICODE_AWARE, DEFMOD_SRMESSAGE, // replace internal version (if any) -#ifdef _UNICODE {0x84636f78, 0x2057, 0x4302, { 0x8a, 0x65, 0x23, 0xa1, 0x6d, 0x46, 0x84, 0x4c }} //{84636F78-2057-4302-8A65-23A16D46844C} -#else - {0x1e91b6c9, 0xe040, 0x4a6f, { 0xab, 0x56, 0xdf, 0x76, 0x98, 0xfa, 0xcb, 0xf1 }} //{1E91B6C9-E040-4a6f-AB56-DF7698FACBF1} -#endif }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -67,8 +59,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 8, 0, 0)) - return NULL; return &pluginInfo; } diff --git a/plugins/SimpleStatusMsg/main.cpp b/plugins/SimpleStatusMsg/main.cpp index 63a9aebcfc..47a3e38eb0 100644 --- a/plugins/SimpleStatusMsg/main.cpp +++ b/plugins/SimpleStatusMsg/main.cpp @@ -51,13 +51,8 @@ PLUGININFOEX pluginInfo = { "http://code.google.com/p/dezeath", UNICODE_AWARE, DEFMOD_SRAWAY, -#ifdef _UNICODE // {768CE156-34AC-45a3-B53B-0083C47615C4} { 0x768ce156, 0x34ac, 0x45a3, { 0xb5, 0x3b, 0x0, 0x83, 0xc4, 0x76, 0x15, 0xc4 } } -#else - // {7D548A69-05E7-4d00-89BC-ACCE781022C1} - { 0x7d548a69, 0x5e7, 0x4d00, { 0x89, 0xbc, 0xac, 0xce, 0x78, 0x10, 0x22, 0xc1 } } -#endif }; static const MUUID interfaces[] = {MIID_SRAWAY, MIID_LAST}; @@ -70,11 +65,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 9, 0, 0)) - { - MessageBox(NULL, _T("The Simple Status Message plugin cannot be loaded. It requires Miranda IM 0.9.0 or later."), _T("Simple Status Message Plugin"), MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST); - return NULL; - } return &pluginInfo; } diff --git a/plugins/TooltipNotify/src/main.cpp b/plugins/TooltipNotify/src/main.cpp index 14af3714fe..85e73351a6 100644 --- a/plugins/TooltipNotify/src/main.cpp +++ b/plugins/TooltipNotify/src/main.cpp @@ -10,10 +10,6 @@ static const MUUID MIID_TOOLTIPNOTIFY_UNICODE = { 0x5906a545, 0xf31a, 0x4726, { 0xb4, 0x8f, 0x3, 0xa0, 0x9f, 0x6, 0x3, 0x18 } }; -// {C4475C65-630F-4e70-980F-C0CA98767110} -static const MUUID MIID_TOOLTIPNOTIFY_ANSI = -{ 0xc4475c65, 0x630f, 0x4e70, { 0x98, 0xf, 0xc0, 0xca, 0x98, 0x76, 0x71, 0x10 } }; - // {03CD82B6-0BB5-4f26-8EB4-06CD8ECD36FF} static const MUUID MIID_TOOLTIPNOTIFY = { 0x3cd82b6, 0xbb5, 0x4f26, { 0x8e, 0xb4, 0x6, 0xcd, 0x8e, 0xcd, 0x36, 0xff } }; @@ -80,68 +76,26 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) return interfaces; } - static char szWrongUsage9x[] = - "Warning! You are trying to use unicode version of the plugin on win9x system! " - "It can not be working here. You must use ansi version of the plugin."; - - static char szWrongUsageNt[] = - "Warning! You are using ansi version of the plugin on a unicode-aware system. " - "It is recommended to use unicode version of the plugin."; - - static char szFunctionalDescription[] = - "Shows a small tooltip above system tray area when a contact status is changed."; - - - static PLUGININFOEX sPluginInfo = - { - sizeof(PLUGININFOEX), - "Tooltip Notify", - PLUGIN_MAKE_VERSION(MAJOR,MINOR,BUILD,REVISION), // major, minor, revision, build -#ifdef _UNICODE - g_bRightModule ? szFunctionalDescription : szWrongUsage9x, -#else - g_bRightModule ? szFunctionalDescription : szWrongUsageNt, -#endif - "perf", - "perf@mail333.com", - "© 2004-2008 Gneedah software", - "http://addons.miranda-im.org/details.php?action=viewfile&id=1290", - UNICODE_AWARE, - 0, //doesn't replace anything built-in -#ifdef _UNICODE - MIID_TOOLTIPNOTIFY_UNICODE -#else - MIID_TOOLTIPNOTIFY_ANSI -#endif - }; - -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +static PLUGININFOEX sPluginInfo = { - return &sPluginInfo; -} + sizeof(PLUGININFOEX), + "Tooltip Notify", + PLUGIN_MAKE_VERSION(MAJOR,MINOR,BUILD,REVISION), // major, minor, revision, build + "Shows a small tooltip above system tray area when a contact status is changed.", + "perf", + "perf@mail333.com", + "© 2004-2008 Gneedah software", + "http://addons.miranda-im.org/details.php?action=viewfile&id=1290", + UNICODE_AWARE, + 0, //doesn't replace anything built-in + MIID_TOOLTIPNOTIFY_UNICODE +}; -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - PLUGININFOEX* pPluginInfoEx = MirandaPluginInfoEx(mirandaVersion); - - static PLUGININFO sPluginInfo = - { - sizeof(PLUGININFO), - pPluginInfoEx->shortName, - pPluginInfoEx->version, - pPluginInfoEx->description, - pPluginInfoEx->author, - pPluginInfoEx->authorEmail, - pPluginInfoEx->copyright, - pPluginInfoEx->homepage, - pPluginInfoEx->flags, - pPluginInfoEx->replacesDefaultModule - }; - return &sPluginInfo; } - extern "C" int __declspec(dllexport) Load(PLUGINLINK *pLink) { #ifdef _UNICODE diff --git a/plugins/Updater/updater.cpp b/plugins/Updater/updater.cpp index a560966c27..69abd97330 100644 --- a/plugins/Updater/updater.cpp +++ b/plugins/Updater/updater.cpp @@ -21,11 +21,7 @@ bool is_idle = false; PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), __PLUGIN_NAME, -#ifdef TESTING - 0x00000001, -#else PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), -#endif __DESC, __AUTHOR, __AUTHOREMAIL, @@ -33,12 +29,7 @@ PLUGININFOEX pluginInfo={ __AUTHORWEB, UNICODE_AWARE, //not transient 0, //doesn't replace anything built-in - -#ifdef _UNICODE { 0x66dceb80, 0x384, 0x4507, { 0x97, 0x74, 0xcc, 0x20, 0xa7, 0xef, 0x1d, 0x6d } } // {66DCEB80-0384-4507-9774-CC20A7EF1D6D} -#else - { 0x37f59333, 0x8c51, 0x4886, { 0x96, 0xdb, 0xb9, 0xd9, 0xe3, 0x7c, 0xad, 0x38 } } // {37F59333-8C51-4886-96DB-B9D9E37CAD38} -#endif }; extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) @@ -49,7 +40,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - return mirandaVersion < PLUGIN_MAKE_VERSION(0, 8, 0, 0) ? NULL :&pluginInfo; + return &pluginInfo; } static const MUUID interfaces[] = {MIID_UPDATER, MIID_LAST}; diff --git a/plugins/UserInfoEx/init.cpp b/plugins/UserInfoEx/init.cpp index 9f320de376..886f3edb6c 100644 --- a/plugins/UserInfoEx/init.cpp +++ b/plugins/UserInfoEx/init.cpp @@ -266,10 +266,6 @@ static BOOL CoreCheck() **/ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion < PLUGIN_MAKE_VERSION(0,8,0,45)) - { - return NULL; - } myGlobals.mirandaVersion = mirandaVersion; return &pluginInfo; } diff --git a/plugins/Variables/main.cpp b/plugins/Variables/main.cpp index f2718b8b03..42663d69a0 100644 --- a/plugins/Variables/main.cpp +++ b/plugins/Variables/main.cpp @@ -59,36 +59,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) return TRUE; } -///////////////////////////////////////////////////////////////////////////////////////// -// MirandaPluginInfo - returns an information about a plugin - -PLUGININFO pluginInfo = { - sizeof(PLUGININFO), -#ifdef _WIN64 - "Variables (x64, Unicode)", -#else -#ifdef UNICODE - "Variables (Unicode)", -#else - "Variables", -#endif -#endif - __VERSION_DWORD, - "Adds support for dynamic variables in strings for plugins", - "P Boon", - "unregistered@users.sourceforge.net", - "© 2003-2008 P. Boon, Ricardo Pescuma, George Hazan", - "http://www.miranda-im.org/", - UNICODE_AWARE, - 0 -}; - -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - g_mirandaVersion = mirandaVersion; - return &pluginInfo; -} - ///////////////////////////////////////////////////////////////////////////////////////// // MirandaPluginInfoEx - returns the extended information about a plugin @@ -104,7 +74,7 @@ PLUGININFOEX pluginInfoEx = { #endif #endif __VERSION_DWORD, - "Adds support for dynamic variables in strings for plugins", + "Adds support for dynamic variables in strings for plugins.", "P Boon", "unregistered@users.sourceforge.net", "© 2003-2008 P. Boon, Ricardo Pescuma, George Hazan", @@ -135,7 +105,7 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces( void ) extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink = link; - if (UnicodeCheck(pluginInfo.shortName, FALSE)) + if (UnicodeCheck(pluginInfoEx.shortName, FALSE)) return 0; mir_getMMI( &mmi ); diff --git a/plugins/WhenWasIt/WhenWasIt.cpp b/plugins/WhenWasIt/WhenWasIt.cpp index 3c956d7e56..92ab0662a5 100644 --- a/plugins/WhenWasIt/WhenWasIt.cpp +++ b/plugins/WhenWasIt/WhenWasIt.cpp @@ -43,14 +43,8 @@ PLUGININFOEX pluginInfo = { __AUTHORWEB, UNICODE_AWARE, 0, -#ifdef _UNICODE {0x2ff96c84, 0xb0b5, 0x470e, {0xbb, 0xf9, 0x90, 0x7b, 0x9f, 0x3f, 0x5d, 0x2f}} //{2ff96c84-b0b5-470e-bbf9-907b9f3f5d2f} -#else - {0x2f369a01, 0x211a, 0x4f13, {0xbe, 0x3c, 0xbf, 0x4f, 0x8c, 0x62, 0xca, 0xce}} //{2f369a01-211a-4f13-be3c-bf4f8c62cace} -#endif -}; //not used - -OLD_MIRANDAPLUGININFO_SUPPORT; +}; extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) { diff --git a/plugins/WhenWasIt/commonheaders.h b/plugins/WhenWasIt/commonheaders.h index f61d5fe547..2b1a3550cb 100644 --- a/plugins/WhenWasIt/commonheaders.h +++ b/plugins/WhenWasIt/commonheaders.h @@ -75,24 +75,6 @@ extern HWND hBirthdaysDlg; extern HWND hUpcomingDlg; extern HANDLE hAddBirthdayWndsList; -#define OLD_MIRANDAPLUGININFO_SUPPORT PLUGININFO oldPluginInfo = { \ - sizeof(PLUGININFO), \ - pluginInfo.shortName, \ - pluginInfo.version, \ - pluginInfo.description, \ - pluginInfo.author, \ - pluginInfo.authorEmail, \ - pluginInfo.copyright, \ - pluginInfo.homepage, \ - pluginInfo.flags, \ - pluginInfo.replacesDefaultModule \ -}; \ -\ -extern "C" __declspec(dllexport) PLUGININFO *MirandaPluginInfo(DWORD mirandaVersion) \ -{ \ - return &oldPluginInfo; \ -} - struct CommonData{ DWORD foreground; DWORD background; diff --git a/plugins/YAMN/main.cpp b/plugins/YAMN/main.cpp index b9ff072410..be537a4f26 100644 --- a/plugins/YAMN/main.cpp +++ b/plugins/YAMN/main.cpp @@ -171,16 +171,6 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvRe ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - if (mirandaVersion >= PLUGIN_MAKE_VERSION(0, 7, 0, 3)) - bIcolibEmbededInCore = TRUE; - pluginInfo.cbSize = sizeof(PLUGININFO);//Miranda pre-0.7.0.17 does not load the plugin if cbSize does not match. - return (PLUGININFO *) &pluginInfo; -} - -///////////////////////////////////////////////////////////////////////////////////////// - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { if (mirandaVersion >= PLUGIN_MAKE_VERSION(0, 7, 0, 3)) diff --git a/plugins/YAPP/popups2.cpp b/plugins/YAPP/popups2.cpp index 3029ed709f..fa50b14164 100644 --- a/plugins/YAPP/popups2.cpp +++ b/plugins/YAPP/popups2.cpp @@ -62,13 +62,6 @@ extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LP extern "C" POPUPS2_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - pluginInfo.cbSize = sizeof(PLUGININFOEX); - if (!IsWinVerNT() && !GetModuleHandle(_T("unicows.dll"))) - { - MessageBox(NULL, _T("The yapp plugin cannot be loaded. It requires unicows.dll."), - _T("Miranda IM"), MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST); - return NULL; - } return &pluginInfo; } diff --git a/plugins/ZeroNotification/main.c b/plugins/ZeroNotification/main.c index bcbe63159e..2f278b4c01 100644 --- a/plugins/ZeroNotification/main.c +++ b/plugins/ZeroNotification/main.c @@ -46,22 +46,11 @@ PLUGININFOEX pluginInfoEx = { "", COPYRIGHT, "", -#if defined(UNICODE) | defined(_UNICODE) UNICODE_AWARE, //not transient -#else - 0, -#endif 0, UID }; -__declspec(dllexport) PLUGININFO * MirandaPluginInfo(DWORD mirandaVersion) -{ - pluginInfoEx.cbSize = sizeof(PLUGININFO); - return (PLUGININFO*)&pluginInfoEx; - //return &pluginInfo; -} - __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD mirandaVersion) { if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 7, 0, 0)) diff --git a/plugins/mTextControl/src/headers.h b/plugins/mTextControl/src/headers.h index cc2f4579b9..a2ff0df6ab 100644 --- a/plugins/mTextControl/src/headers.h +++ b/plugins/mTextControl/src/headers.h @@ -100,7 +100,6 @@ extern "C" { // globals extern HINSTANCE hInst; -extern PLUGININFO pluginInfo; extern PLUGININFOEX pluginInfoEx; // dlls diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp index 285a3f2c8d..5418a7373b 100644 --- a/plugins/mTextControl/src/main.cpp +++ b/plugins/mTextControl/src/main.cpp @@ -52,20 +52,6 @@ PLUGININFOEX pluginInfoEx = MTEXT_UUID }; -PLUGININFO pluginInfo = -{ - sizeof(PLUGININFO), - pluginInfoEx.shortName, - pluginInfoEx.version, - pluginInfoEx.description, - pluginInfoEx.author, - pluginInfoEx.authorEmail, - pluginInfoEx.copyright, - pluginInfoEx.homepage, - pluginInfoEx.flags, - pluginInfoEx.replacesDefaultModule -}; - extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) { hInst=hinstDLL; @@ -75,15 +61,8 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese static HANDLE hModulesLoaded = 0; static int ModulesLoaded(WPARAM wParam,LPARAM lParam); -extern "C" __declspec(dllexport) PLUGININFO *MirandaPluginInfo(DWORD mirandaVersion) -{ - pluginInfo.cbSize = sizeof(PLUGININFO); - return &pluginInfo; -} - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - pluginInfoEx.cbSize = sizeof(PLUGININFOEX); return &pluginInfoEx; } diff --git a/plugins/mTextControl/src/services.cpp b/plugins/mTextControl/src/services.cpp index cb0b2a9e48..8970969ec4 100644 --- a/plugins/mTextControl/src/services.cpp +++ b/plugins/mTextControl/src/services.cpp @@ -336,7 +336,7 @@ INT_PTR MText_GetInterface(WPARAM wParam, LPARAM lParam) { if ( MText == NULL ) return CALLSERVICE_NOTFOUND; - MText->version = pluginInfo.version; + MText->version = pluginInfoEx.version; MText->Register = MTI_TextUserAdd; MText->Create = MTI_MTextCreate; MText->CreateW = MTI_MTextCreateW; -- cgit v1.2.3