From 2bc706393a8c7abcea515ffb1da885c6dad5b1cb Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 8 Feb 2013 19:01:20 +0000 Subject: removed not needed interfaces git-svn-id: http://svn.miranda-ng.org/main/trunk@3481 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Folders/src/folders.cpp | 16 +++++----------- plugins/Popup/src/main.cpp | 7 ++----- plugins/TipperYM/src/tipper.cpp | 8 +++----- plugins/VersionInfo/src/main.cpp | 8 +++----- plugins/WhenWasIt/src/WhenWasIt.cpp | 11 ++--------- plugins/WhenWasIt/src/commonheaders.h | 1 + plugins/YAPP/src/yapp.cpp | 13 +++++-------- plugins/YAPP/src/yapp.h | 12 ------------ plugins/YAPP/yapp_11.vcxproj | 1 - plugins/YAPP/yapp_11.vcxproj.filters | 3 --- 10 files changed, 21 insertions(+), 59 deletions(-) delete mode 100644 plugins/YAPP/src/yapp.h (limited to 'plugins') diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp index 3dfa8e4b89..586510ae28 100644 --- a/plugins/Folders/src/folders.cpp +++ b/plugins/Folders/src/folders.cpp @@ -43,8 +43,8 @@ PLUGININFOEX pluginInfo = { __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - {0x2f129563, 0x2c7d, 0x4a9a, {0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7}} - //{2f129563-2c7d-4a9a-b948-97dfcc0afdd7} + // {2f129563-2c7d-4a9a-b948-97dfcc0afdd7} + {0x2f129563, 0x2c7d, 0x4a9a, {0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7}} }; extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) @@ -52,9 +52,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_FOLDERS, MIID_LAST}; - -extern "C" int __declspec(dllexport) Load(void) +extern "C" __declspec(dllexport) int Load(void) { mir_getLP(&pluginInfo); @@ -64,20 +62,16 @@ extern "C" int __declspec(dllexport) Load(void) return 0; } -extern "C" int __declspec(dllexport) Unload() +extern "C" __declspec(dllexport) int Unload() { -// DestroyServiceFunction(MS_HISTORY_SHOWCONTACTHISTORY); DestroyServices(); DestroyEvents(); UnhookEvents(); return 0; } -bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInstance = hinstDLL; - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - return TRUE; } diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 543a904445..12e2c88c9f 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -376,9 +376,9 @@ static int ModulesLoaded(WPARAM wParam,LPARAM lParam) //=== DllMain ===== //DLL entry point, Required to store the instance handle -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - hInst=hinstDLL; + hInst = hinstDLL; return TRUE; } @@ -393,9 +393,6 @@ MIRAPI PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) return &pluginInfoEx; } -//Miranda PluginInterfaces -MIRAPI const MUUID MirandaInterfaces[] = { MIID_POPUPS, MIID_LAST }; - //ME_SYSTEM_OKTOEXIT event //called before the app goes into shutdown routine to make sure everyone is happy to exit static int OkToExit(WPARAM wParam, LPARAM lParam) diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index 33895c7035..a661c24705 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -57,14 +57,14 @@ PLUGININFOEX pluginInfoEx = "yaho@miranda-easy.net", "© 2005-2007 Scott Ellis, 2007-2011 Jan Holub", "http://miranda-ng.org/", - UNICODE_AWARE, //doesn't replace anything built-in - { 0x8392df1d, 0x9090, 0x4f8e, { 0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00 } } // {8392DF1D-9090-4f8e-9DF6-2FE058EDD800} + UNICODE_AWARE, + // {8392DF1D-9090-4f8e-9DF6-2FE058EDD800} + {0x8392df1d, 0x9090, 0x4f8e, {0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00}} }; extern "C" bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInst = hinstDLL; - DisableThreadLibraryCalls(hInst); return TRUE; } @@ -73,8 +73,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_TOOLTIPS, MIID_LAST}; - int ReloadFont(WPARAM wParam, LPARAM lParam) { LOGFONT logFont; diff --git a/plugins/VersionInfo/src/main.cpp b/plugins/VersionInfo/src/main.cpp index 4427ca5827..5068fceece 100644 --- a/plugins/VersionInfo/src/main.cpp +++ b/plugins/VersionInfo/src/main.cpp @@ -59,13 +59,11 @@ PLUGININFOEX pluginInfo={ {0x2f174488, 0x489c, 0x4fe1, {0x94, 0x0d, 0x59, 0x6c, 0xf0, 0xf3, 0x5e, 0x65}} }; -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_VERSIONINFO, MIID_SERVICEMODE, MIID_LAST}; +extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_SERVICEMODE, MIID_LAST}; -bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - hInst=hinstDLL; - if (fdwReason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls(hinstDLL); - EnglishLocale = MAKELCID(MAKELANGID(0x09, 0x01), SORT_DEFAULT); //create our english locale and use it everywhere it's needed + hInst = hinstDLL; return TRUE; } diff --git a/plugins/WhenWasIt/src/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp index 07d7ce0548..093c4b33c0 100644 --- a/plugins/WhenWasIt/src/WhenWasIt.cpp +++ b/plugins/WhenWasIt/src/WhenWasIt.cpp @@ -39,7 +39,7 @@ PLUGININFOEX pluginInfo = { __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - //{2ff96c84-b0b5-470e-bbf9-907b9f3f5d2f} + // {2ff96c84-b0b5-470e-bbf9-907b9f3f5d2f} {0x2ff96c84, 0xb0b5, 0x470e, {0xbb, 0xf9, 0x90, 0x7b, 0x9f, 0x3f, 0x5d, 0x2f}} }; @@ -48,10 +48,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_BIRTHDAYNOTIFY, MIID_LAST}; - -#include - extern "C" int __declspec(dllexport) Load(void) { Log("%s", "Entering function " __FUNCTION__); @@ -103,11 +99,8 @@ extern "C" int __declspec(dllexport) Unload() return 0; } -bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInstance = hinstDLL; - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - return TRUE; } diff --git a/plugins/WhenWasIt/src/commonheaders.h b/plugins/WhenWasIt/src/commonheaders.h index 9576d787c1..a4d54b019b 100644 --- a/plugins/WhenWasIt/src/commonheaders.h +++ b/plugins/WhenWasIt/src/commonheaders.h @@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include #include #include diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp index 9b94400299..b9aacd198b 100644 --- a/plugins/YAPP/src/yapp.cpp +++ b/plugins/YAPP/src/yapp.cpp @@ -2,7 +2,6 @@ // #include "common.h" -#include "yapp.h" #include "version.h" #include "message_pump.h" #include "options.h" @@ -37,23 +36,21 @@ PLUGININFOEX pluginInfo={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - { 0xefd15f16, 0x7ae4, 0x40d7, { 0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5 } } // {EFD15F16-7AE4-40d7-A8E3-A411ED747BD5} + // {EFD15F16-7AE4-40d7-A8E3-A411ED747BD5} + {0xefd15f16, 0x7ae4, 0x40d7, {0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5 }} }; extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { hInst = hModule; - DisableThreadLibraryCalls(hInst); return TRUE; } -extern "C" YAPP_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { return &pluginInfo; } -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_POPUPS, MIID_LAST}; - int ReloadFont(WPARAM wParam, LPARAM lParam) { LOGFONT log_font; @@ -172,7 +169,7 @@ int PreShutdown(WPARAM wParam, LPARAM lParam) return 0; } -extern "C" int YAPP_API Load(void) { +extern "C" int __declspec(dllexport) Load(void) { mir_getLP(&pluginInfo); @@ -186,7 +183,7 @@ extern "C" int YAPP_API Load(void) { return 0; } -extern "C" int YAPP_API Unload() +extern "C" int __declspec(dllexport) Unload() { DeinitNotify(); DeleteObject(hFontFirstLine); diff --git a/plugins/YAPP/src/yapp.h b/plugins/YAPP/src/yapp.h deleted file mode 100644 index de86e26295..0000000000 --- a/plugins/YAPP/src/yapp.h +++ /dev/null @@ -1,12 +0,0 @@ -// The following ifdef block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the POPUPS2_EXPORTS -// symbol defined on the command line. this symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// POPUPS2_API functions as being imported from a DLL, whereas this DLL sees symbols -// defined with this macro as being exported. -#ifdef YAPP_EXPORTS -#define YAPP_API __declspec(dllexport) -#else -#define YAPP_API __declspec(dllimport) -#endif - diff --git a/plugins/YAPP/yapp_11.vcxproj b/plugins/YAPP/yapp_11.vcxproj index 77151538a1..c083bada83 100644 --- a/plugins/YAPP/yapp_11.vcxproj +++ b/plugins/YAPP/yapp_11.vcxproj @@ -202,7 +202,6 @@ - diff --git a/plugins/YAPP/yapp_11.vcxproj.filters b/plugins/YAPP/yapp_11.vcxproj.filters index e1420633dc..872e1a2ec4 100644 --- a/plugins/YAPP/yapp_11.vcxproj.filters +++ b/plugins/YAPP/yapp_11.vcxproj.filters @@ -59,9 +59,6 @@ Header Files - - Header Files - Header Files -- cgit v1.2.3