From 3c8c91e6df3fae6a4290aeeedc0170731f672320 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 29 Jan 2013 14:12:40 +0000 Subject: - muuid standardization (patch from Basil) git-svn-id: http://svn.miranda-ng.org/main/trunk@3338 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/New_GPG/src/init.cpp | 11 +++-------- plugins/PasteIt/src/PasteIt.cpp | 6 ++---- plugins/SMS/src/SMSConstans.h | 2 -- plugins/SMS/src/main.cpp | 5 ++--- plugins/SendScreenshotPlus/src/Main.cpp | 4 ++-- plugins/SendScreenshotPlus/src/version.h | 3 --- plugins/StopSpamMod/src/init.cpp | 14 ++------------ 7 files changed, 11 insertions(+), 34 deletions(-) diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 2abe389d1e..3b6c662032 100755 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -33,7 +33,6 @@ bool gpg_valid = false, gpg_keyexist = false; std::map hcontact_data; -#define MIID_GPG { 0x4227c050, 0x8d97, 0x48d2, { 0x91, 0xec, 0x6a, 0x95, 0x2b, 0x3d, 0xab, 0x94 } } PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), @@ -44,8 +43,9 @@ PLUGININFOEX pluginInfo={ "sss123next@list.ru", "© 2010-2012 sss", "http://sss.chaoslab.ru/tracker/mim_plugs/", - 1, //unicode - MIID_GPG + UNICODE_AWARE, + // {4227c050-8d97-48d2-91ec-6a952b3dab94} + { 0x4227c050, 0x8d97, 0x48d2, { 0x91, 0xec, 0x6a, 0x95, 0x2b, 0x3d, 0xab, 0x94 } } }; BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) @@ -60,11 +60,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -static const MUUID interfaces[] = {MIID_GPG, MIID_LAST}; -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} INT_PTR LoadKey(WPARAM w, LPARAM l); INT_PTR ToggleEncryption(WPARAM w, LPARAM l); diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index 0297d056f9..2386c96302 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -23,8 +23,6 @@ along with this program. If not, see . #include "resource.h" #include "Options.h" -// {1AAC15E8-DCEC-4050-B66F-2AA0E6120C22} -#define MIID_PASTEIT { 0x1aac15e8, 0xdcec, 0x4050, { 0xb6, 0x6f, 0x2a, 0xa0, 0xe6, 0x12, 0xc, 0x22 } } PasteToWeb* pasteToWebs[PasteToWeb::pages]; std::map* contactWindows; @@ -57,7 +55,8 @@ PLUGININFOEX pluginInfo={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - MIID_PASTEIT + // {1AAC15E8-DCEC-4050-B66F-2AA0E6120C22} + { 0x1aac15e8, 0xdcec, 0x4050, { 0xb6, 0x6f, 0x2a, 0xa0, 0xe6, 0x12, 0xc, 0x22 } } }; static IconItem icon = { LPGEN("Paste It"), "PasteIt_main", IDI_MENU }; @@ -80,7 +79,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PASTEIT, MIID_LAST}; std::wstring GetFile() { diff --git a/plugins/SMS/src/SMSConstans.h b/plugins/SMS/src/SMSConstans.h index 2642a56c7d..308cfbfdca 100644 --- a/plugins/SMS/src/SMSConstans.h +++ b/plugins/SMS/src/SMSConstans.h @@ -10,8 +10,6 @@ -// {CF97FD5D-B911-47a8-AF03-D21968B5B894} -#define SMS_GUID { 0xcf97fd5d, 0xb911, 0x47a8, { 0xaf, 0x3, 0xd2, 0x19, 0x68, 0xb5, 0xb8, 0x94 } } #define MIN_MIR_VER_VERSION_DWORD PLUGIN_MAKE_VERSION(0,8,0,0) diff --git a/plugins/SMS/src/main.cpp b/plugins/SMS/src/main.cpp index 2467838e46..bf75398a1b 100644 --- a/plugins/SMS/src/main.cpp +++ b/plugins/SMS/src/main.cpp @@ -158,12 +158,11 @@ PLUGININFOEX pluginInfo = { __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - // {70AC2AC9-85C6-4624-9B05-24733FEBB052} - SMS_GUID + // {CF97FD5D-B911-47a8-AF03-D21968B5B894} + { 0xcf97fd5d, 0xb911, 0x47a8, { 0xaf, 0x3, 0xd2, 0x19, 0x68, 0xb5, 0xb8, 0x94 } } }; -extern "C" __declspec(dllexport) const MUUID interfaces[] = {SMS_GUID,MIID_LAST}; extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 1eb2bc387d..4cb19a1e5b 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -46,7 +46,8 @@ PLUGININFOEX pluginInfo={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, //doesn't replace anything built-in - MIID_PLUGIN + // {ED39AF7C-BECD-404e-9499-4D04F711B9CB} + { 0xed39af7c, 0xbecd, 0x404e, { 0x94, 0x99, 0x4d, 0x04, 0xf7, 0x11, 0xb9, 0xcb } } }; //static char szSendSS[]=SZ_SENDSS; @@ -86,7 +87,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PLUGIN, MIID_LAST }; /*--------------------------------------------------------------------------- * Initializes the services provided and the link to those needed diff --git a/plugins/SendScreenshotPlus/src/version.h b/plugins/SendScreenshotPlus/src/version.h index 3b88228a1e..85f72f59f1 100644 --- a/plugins/SendScreenshotPlus/src/version.h +++ b/plugins/SendScreenshotPlus/src/version.h @@ -19,9 +19,6 @@ #define __COPYRIGHT "© 2010 Merlin, © 2004-2006 Sergio Vieira Rolanski" #define __AUTHORWEB "http://miranda-ng.org/" -#ifndef MIID_PLUGIN // {ED39AF7C-BECD-404e-9499-4D04F711B9CB} -#define MIID_PLUGIN { 0xed39af7c, 0xbecd, 0x404e, { 0x94, 0x99, 0x4d, 0x04, 0xf7, 0x11, 0xb9, 0xcb } } -#endif #define __PLUGIN_NAME "Send Screenshot+" #define __FLVersionURL "http://miranda-ng.org/" diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp index 2d1da2bf5d..8e3f1fca46 100755 --- a/plugins/StopSpamMod/src/init.cpp +++ b/plugins/StopSpamMod/src/init.cpp @@ -63,8 +63,6 @@ extern int RemoveTmp(WPARAM,LPARAM); ///////////////////////////////////////////////////////////////////////////////////////// // returns plugin's extended information -// {553811EE-DEB6-48b8-8902-A8A00C1FD679} -#define MIID_STOPSPAM { 0x553811ee, 0xdeb6, 0x48b8, { 0x89, 0x2, 0xa8, 0xa0, 0xc, 0x1f, 0xd6, 0x79 } } PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), @@ -76,7 +74,8 @@ PLUGININFOEX pluginInfoEx = { "© 2004-2012 Roman Miklashevsky, A. Petkevich, Kosh&chka, sss, Elzor", "http://sss.chaoslab.ru/tracker/mim_plugs/", UNICODE_AWARE, - MIID_STOPSPAM + // {553811EE-DEB6-48b8-8902-A8A00C1FD679} + { 0x553811ee, 0xdeb6, 0x48b8, { 0x89, 0x2, 0xa8, 0xa0, 0xc, 0x1f, 0xd6, 0x79 } } }; extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) @@ -150,15 +149,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) return TRUE; } -///////////////////////////////////////////////////////////////////////////////////////// -// returns plugin's interfaces information - -static const MUUID interfaces[] = { MIID_STOPSPAM, MIID_LAST }; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} int hLangpack = 0; -- cgit v1.2.3