Guids cleanup

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

32 files changed, 11 insertions, 170 deletions

diff --git a/plugins/AVS/main.cpp b/plugins/AVS/main.cpp
index cdd1c71b85..3de7a9a30a 100644
--- a/plugins/AVS/main.cpp
+++ b/plugins/AVS/main.cpp
@@ -112,13 +112,8 @@ PLUGININFOEX pluginInfoEx = {
 	"http://www.miranda-im.org",

 	UNICODE_AWARE,

 	0,

-#if defined(_UNICODE)

 // {E00F1643-263C-4599-B84B-053E5C511D29}

 	{ 0xe00f1643, 0x263c, 0x4599, { 0xb8, 0x4b, 0x5, 0x3e, 0x5c, 0x51, 0x1d, 0x29 } }

-#else

-// {C9E01EB0-A119-42d2-B340-E8678F5FEAD8}

-	{ 0xc9e01eb0, 0xa119, 0x42d2, { 0xb3, 0x40, 0xe8, 0x67, 0x8f, 0x5f, 0xea, 0xd8 } }

-#endif

 };

 

 extern INT_PTR CALLBACK DlgProcOptionsAvatars(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

diff --git a/plugins/BossKeyPlus/BossKey.cpp b/plugins/BossKeyPlus/BossKey.cpp
index 4bc8b49800..52eeb789f0 100644
--- a/plugins/BossKeyPlus/BossKey.cpp
+++ b/plugins/BossKeyPlus/BossKey.cpp
@@ -70,13 +70,8 @@ static PLUGININFOEX pluginInfo = {
 	__FL __PLUGIN_ID_STR,

 	UNICODE_AWARE,

 	0,

-#if defined( _UNICODE )

 	//4fac353d-0a36-44a4-9064-6759c53ae782

 	{0x4fac353d, 0x0a36, 0x44a4, { 0x90, 0x64, 0x67, 0x59, 0xc5, 0x3a, 0xe7, 0x82 }}

-#else

-	//0be17104-518f-411c-9bb7-7c1042a2ed02

-	{0x0be17104, 0x518f, 0x411c, { 0x9b, 0xb7, 0x7c, 0x10, 0x42, 0xa2, 0xed, 0x02 }}

-#endif

 };

 

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

diff --git a/plugins/ChangeKeyboardLayout/m_changekeyboardlayout.h b/plugins/ChangeKeyboardLayout/m_changekeyboardlayout.h
index 9e565ec2e1..8923dffa12 100644
--- a/plugins/ChangeKeyboardLayout/m_changekeyboardlayout.h
+++ b/plugins/ChangeKeyboardLayout/m_changekeyboardlayout.h
@@ -1,8 +1,6 @@
 #ifndef _M_CHANGEKEYBOARDLAYOUT_H

 #define _M_CHANGEKEYBOARDLAYOUT_H

 

-#define MIID_CKL_UNICODE {0xc5ef53a8, 0x80d4, 0x4ce9, { 0xb3, 0x41, 0xec, 0x90, 0xd3, 0xec, 0x91, 0x56 }} //{c5ef53a8-80d4-4ce9-b341-ec90d3ec9156}

-#define MIID_CKL_ANSI {0x87af74ba, 0x035c, 0x4d0d, { 0xb6, 0x8d, 0xd0, 0xd6, 0xae, 0x1e, 0xbf, 0xcd }} //{87af74ba-035c-4d0d-b68d-d0d6ae1ebfcd}

 // Ìåíÿåò ðàñêëàäêó òåêñòà äëÿ îêíà ñ óêàçàííûõ õýíäëîì

 // wParam - HWND îêíà, èëè NULL äëÿ îêíà â ôîêóñå

 // lParam äîëæåí áûòü 0

diff --git a/plugins/ChangeKeyboardLayout/main.c b/plugins/ChangeKeyboardLayout/main.c
index 5aabf34801..23bbb9359e 100644
--- a/plugins/ChangeKeyboardLayout/main.c
+++ b/plugins/ChangeKeyboardLayout/main.c
@@ -19,12 +19,7 @@ PLUGININFOEX pluginInfoEx={
 	"http://lemnews.com/forum/viewtopic.php?t=1493",

 	0,		//not transient

 	0,		//doesn't replace anything built-in

-	#if defined (_UNICODE)

-		MIID_CKL_UNICODE

-	#else

-		MIID_CKL_ANSI

-	#endif

-	

+	{0xc5ef53a8, 0x80d4, 0x4ce9, { 0xb3, 0x41, 0xec, 0x90, 0xd3, 0xec, 0x91, 0x56 }} //{c5ef53a8-80d4-4ce9-b341-ec90d3ec9156}

 };

 

 PLUGININFO pluginInfo={

diff --git a/plugins/Clist_nicer/SRC/init.cpp b/plugins/Clist_nicer/SRC/init.cpp
index 2ba6531b13..ee3bb78732 100644
--- a/plugins/Clist_nicer/SRC/init.cpp
+++ b/plugins/Clist_nicer/SRC/init.cpp
@@ -113,11 +113,7 @@ PLUGININFOEX pluginInfo = {
 		"Pixel, egoDust, cyreve, Nightwish", "", "Copyright 2000-2010 Miranda-IM project", "http://www.miranda-im.org",

 		UNICODE_AWARE,

 		DEFMOD_CLISTALL,

-#if defined(_UNICODE)

 		{0x8f79b4ee, 0xeb48, 0x4a03, { 0x87, 0x3e, 0x27, 0xbe, 0x6b, 0x7e, 0x9a, 0x25 }} //{8F79B4EE-EB48-4a03-873E-27BE6B7E9A25}

-#else

-		{0x5a070cec, 0xb2ab, 0x4bbe, { 0x8e, 0x48, 0x9c, 0x8d, 0xcd, 0xda, 0x14, 0xc3 }} //{5A070CEC-B2AB-4bbe-8E48-9C8DCDDA14C3}

-#endif

 };

 

 #if defined(_UNICODE)

diff --git a/plugins/Console/version.h b/plugins/Console/version.h
index f7a19ef2ce..04aced78b9 100644
--- a/plugins/Console/version.h
+++ b/plugins/Console/version.h
@@ -35,17 +35,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define __PLUGIN_FILE        "Console.dll"

 #define __PLUGIN_SHORTNAME   "Console"

 

+#define MIID_CONSOLE { 0x23d4f302, 0xd513, 0x45b7, { 0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11 }} // {23D4F302-D513-45b7-9027-445F29557311}

 

 #ifdef _UNICODE

-	// {23D4F302-D513-45b7-9027-445F29557311}

-	#define MIID_CONSOLE { 0x23d4f302, 0xd513, 0x45b7, { 0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11 }}

 	#define __PLUGIN_NAME __PLUGIN_SHORTNAME " (Unicode)"

 	#define __PLUGIN_URL "http://addons.miranda-im.org/details.php?action=viewfile&id=3791"

 #endif

 

 #ifndef _UNICODE

-	// {798A94B8-74F4-46fc-978B-353D22BD485E}

-	#define MIID_CONSOLE { 0x798a94b8, 0x74f4, 0x46fc, { 0x97, 0x8b, 0x35, 0x3d, 0x22, 0xbd, 0x48, 0x5e }}

 	#define __PLUGIN_NAME __PLUGIN_SHORTNAME " (ANSI)"

 	#define __PLUGIN_URL "http://addons.miranda-im.org/details.php?action=viewfile&id=3789"

 #endif

diff --git a/plugins/Gender/main.cpp b/plugins/Gender/main.cpp
index b764902812..2b4ad0f750 100644
--- a/plugins/Gender/main.cpp
+++ b/plugins/Gender/main.cpp
@@ -64,11 +64,7 @@ sizeof(PLUGININFOEX),
 	"http://thief.miranda.im/",

 	UNICODE_AWARE,

 	0,      //doesn't replace anything built-in

-#ifdef WIN64

-	{ 0x3a99592e, 0x20d5, 0x4b72, { 0xa5, 0x96, 0xe6, 0x7d, 0xd7, 0x13, 0xde, 0xfb } } 	// {3A99592E-20D5-4B72-A596-E67DD713DEFB}

-#else

 	{0xfb1c17e0, 0x77fc, 0x45a7, {0x9c, 0x8b, 0xe2, 0xbe, 0xf4, 0xf5, 0x6b, 0x28}} /* FB1C17E0-77FC-45A7-9C8B-E2BEF4F56B28 */

-#endif

 };

 

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

diff --git a/plugins/HistoryLinkListPlus/linklist.c b/plugins/HistoryLinkListPlus/linklist.c
index 4f32a7a4a9..94b3797143 100644
--- a/plugins/HistoryLinkListPlus/linklist.c
+++ b/plugins/HistoryLinkListPlus/linklist.c
@@ -67,13 +67,7 @@ PLUGININFOEX pluginInfo = {
 	"http://www.miranda-im.org",

 	UNICODE_AWARE,		//not transient

 	0,		//doesn't replace anything built-in

-	#ifdef _UNICODE

-	{ 0xDA0B09F5, 0x9C66, 0x488C, { 0xAE, 0x37, 0x8A, 0x5F, 0x19, 0x1C, 0x90, 0x79 } }

-	// {DA0B09F5-9C66-488C-AE37-8A5F191C9079}

-	#else

-	{ 0x06F23FA4, 0xABD4, 0x41CA, { 0xAD, 0xFA, 0x7B, 0xE8, 0x69, 0xC0, 0x63, 0x5A } }

-	// {06F23FA4-ABD4-41CA-ADFA-7BE869C0635A}

-	#endif

+	{ 0xDA0B09F5, 0x9C66, 0x488C, { 0xAE, 0x37, 0x8A, 0x5F, 0x19, 0x1C, 0x90, 0x79 } } // {DA0B09F5-9C66-488C-AE37-8A5F191C9079}

 };

 

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

diff --git a/plugins/MenuItemEx/version.h b/plugins/MenuItemEx/version.h
index b2860e5ad4..07b9cf78ef 100644
--- a/plugins/MenuItemEx/version.h
+++ b/plugins/MenuItemEx/version.h
@@ -23,10 +23,5 @@
 #define __EMAIL "micron@nexgo.de, baloo@bk.ru, tatarinov.sergey@gmail.com, robyer@seznam.cz"

 #define __COPYRIGHTS "© 2001-03 Heiko Schillinger, © 2006-08 Baloo, © 2009-10 Billy_Bons, © 2011-12 Robert Posel"

 

-#ifdef _UNICODE

 // {b1902a52-9114-4d7e-ac2e-b3a52e01d574}

 #define MIID_MENUEX		{0xb1902a52, 0x9114, 0x4d7e, { 0xac, 0x2e, 0xb3, 0xa5, 0x2e, 0x01, 0xd5, 0x74 }}

-#else

-// {0C9B8DDC-4894-4b28-ADF2-FAC071BBBD53}

-#define MIID_MENUEX		{0xc9b8ddc, 0x4894, 0x4b28, { 0xad, 0xf2, 0xfa, 0xc0, 0x71, 0xbb, 0xbd, 0x53 }}

-#endif

diff --git a/plugins/MirOTR/MirOTR/stdafx.h b/plugins/MirOTR/MirOTR/stdafx.h
index ea4dbe4a9c..3284939f41 100644
--- a/plugins/MirOTR/MirOTR/stdafx.h
+++ b/plugins/MirOTR/MirOTR/stdafx.h
@@ -74,15 +74,8 @@ extern "C" {
 // modified manual policy - so that users set to 'opportunistic' will automatically start OTR with users set to 'manual'

 #define OTRL_POLICY_MANUAL_MOD		(OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE | OTRL_POLICY_ERROR_START_AKE)

 

-// {030F37D6-DD32-434d-BC64-5B6541EB9299}

-static const MUUID MIID_OTR = { 0x30f37d6, 0xdd32, 0x434d, { 0xbc, 0x64, 0x5b, 0x65, 0x41, 0xeb, 0x92, 0x99 } };

-#ifdef _UNICODE

-	// {12D8FAAD-78AB-4e3c-9854-320E9EA5CC9F}

-	static const MUUID MIID_OTRPLUGIN = { 0x12d8faad, 0x78ab, 0x4e3c, { 0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f } };

-#else

-	// {16E2E7B0-D398-4ea8-A5CC-A0F3689C7608}

-	static const MUUID MIID_OTRPLUGIN = { 0x16e2e7b0, 0xd398, 0x4ea8, { 0xa5, 0xcc, 0xa0, 0xf3, 0x68, 0x9c, 0x76, 0x8 } };

-#endif

+// {12D8FAAD-78AB-4e3c-9854-320E9EA5CC9F}

+static const MUUID MIID_OTRPLUGIN = { 0x12d8faad, 0x78ab, 0x4e3c, { 0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f } };

 

 #define MODULENAME "MirOTR"

 

diff --git a/plugins/ModernOpt/main.cpp b/plugins/ModernOpt/main.cpp
index e4533b6434..982e3148cb 100644
--- a/plugins/ModernOpt/main.cpp
+++ b/plugins/ModernOpt/main.cpp
@@ -7,14 +7,6 @@ MM_INTERFACE mmi;
 LIST_INTERFACE li;

 int hLangpack;

 

-#if defined( _UNICODE )

-	// {621f886b-a7f6-457f-9d62-8ee84c275993}

-	#define MIID_MODERNOPTS { 0x621f886b, 0xa7f6, 0x457f, { 0x9d, 0x62, 0x8e, 0xe8, 0x4c, 0x27, 0x59, 0x93 }}

-#else

-	// {0a8e1133-d12d-4103-a912-39 96 3b 49 b3 5f}

-	#define MIID_MODERNOPTS { 0x0a8e1133, 0xd12d, 0x4103, { 0xa9, 0x12, 0x39, 0x96, 0x3b, 0x49, 0xb3, 0x5f }}

-#endif

-

 PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

 	"Support for new options design",

@@ -26,7 +18,7 @@ PLUGININFOEX pluginInfoEx = {
 	"http://www.miranda-im.org",

 	UNICODE_AWARE,

 	0,

-	MIID_MODERNOPTS

+	{ 0x621f886b, 0xa7f6, 0x457f, { 0x9d, 0x62, 0x8e, 0xe8, 0x4c, 0x27, 0x59, 0x93 }} // {621f886b-a7f6-457f-9d62-8ee84c275993}

 };

 

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

diff --git a/plugins/Mwclist/init.c b/plugins/Mwclist/init.c
index 84eb9f00b0..7f026bd95f 100644
--- a/plugins/Mwclist/init.c
+++ b/plugins/Mwclist/init.c
@@ -92,11 +92,7 @@ PLUGININFOEX pluginInfo = {
 	"http://www.miranda-im.org",

 	UNICODE_AWARE,

 	DEFMOD_CLISTALL,

-	#if defined( _UNICODE )

-		{0x2a417ab9, 0x16f2, 0x472d, { 0x9a, 0xe3, 0x41, 0x51, 0x3, 0xc7, 0x8a, 0x64 }} //{2A417AB9-16F2-472d-9AE3-415103C78A64}

-	#else

-		{0x7ab05d31, 0x9972, 0x4406, { 0x82, 0x3e, 0xe, 0xd7, 0x45, 0xef, 0x7c, 0x56 }} //{7AB05D31-9972-4406-823E-0ED745EF7C56}

-	#endif

+	{0x2a417ab9, 0x16f2, 0x472d, { 0x9a, 0xe3, 0x41, 0x51, 0x3, 0xc7, 0x8a, 0x64 }} //{2A417AB9-16F2-472d-9AE3-415103C78A64}

 };

 

 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved)

diff --git a/plugins/NewXstatusNotify/common.h b/plugins/NewXstatusNotify/common.h
index 0a939fe984..3cbb588379 100644
--- a/plugins/NewXstatusNotify/common.h
+++ b/plugins/NewXstatusNotify/common.h
@@ -74,13 +74,7 @@
 #include "m_toolbar.h"

 #include "resource.h"

 

-#if defined _WIN64

-#define	MIID_NXSN { 0x16f0674f, 0xc4e7, 0x494e, { 0xb7, 0x5e, 0x41, 0xbb, 0xf4, 0xaf, 0xe6, 0x11 } }

-#elif defined _UNICODE

 #define MIID_NXSN { 0xebf19652, 0xe434, 0x4d79, { 0x98, 0x97, 0x91, 0xa0, 0xff, 0x22, 0x6f, 0x51 } }

-#else

-#define	MIID_NXSN { 0x90887a8f, 0x9087, 0x44d6, { 0xb4, 0xcc, 0xa6, 0x9d, 0xe0, 0x2e, 0x15, 0x17 } }

-#endif

 

 #define MODULE "NewStatusNotify"

 

diff --git a/plugins/Nudge/main.cpp b/plugins/Nudge/main.cpp
index a82a6f6dc0..7f47b89173 100644
--- a/plugins/Nudge/main.cpp
+++ b/plugins/Nudge/main.cpp
@@ -40,13 +40,7 @@ PLUGININFOEX pluginInfo={
 	"http://addons.miranda-im.org/",		// www

 	UNICODE_AWARE,

 	0,		//doesn't replace anything built-in

-#ifdef WIN64

-	{ 0xf6f60ea4, 0xfa8e, 0x4d17, { 0xb2, 0x9d, 0xff, 0x74, 0x1a, 0x3c, 0xc, 0x51 } } // {F6F60EA4-FA8E-4D17-B29D-FF741A3C0C51}

-#elif UNICODE

 	{ 0xe47cc215, 0xd28, 0x462d, { 0xa0, 0xf6, 0x3a, 0xe4, 0x44, 0x3d, 0x29, 0x26 } } // {E47CC215-0D28-462D-A0F6-3AE4443D2926}

-#else

-	{ 0x9ceee701, 0x35cd, 0x4ff7, { 0x8c, 0xc4, 0xef, 0x7d, 0xd2, 0xac, 0x53, 0x5c } }	// {9CEEE701-35CD-4ff7-8CC4-EF7DD2AC535C}

-#endif

 };

 

 INT_PTR NudgeShowMenu(WPARAM wParam,LPARAM lParam)

diff --git a/plugins/QuickMessages/main.c b/plugins/QuickMessages/main.c
index 100107cceb..b1957c89eb 100644
--- a/plugins/QuickMessages/main.c
+++ b/plugins/QuickMessages/main.c
@@ -50,13 +50,8 @@ PLUGININFOEX pluginInfo = {
 	"http://miranda.radicaled.ru/index.php?plugin=3",

 	UNICODE_AWARE,

 	0,	

-#ifdef _UNICODE

 	// {37ED754B-6CF9-40ed-9EB6-0FEF8E822475}

 		{ 0x37ed754b, 0x6cf9, 0x40ed, { 0x9e, 0xb6, 0xf, 0xef, 0x8e, 0x82, 0x24, 0x75 } }

-#else

-	// {A15C6605-75F3-4be2-9193-6D3DDD0A13B7} 

-		{ 0xa15c6605, 0x75f3, 0x4be2, { 0x91, 0x93, 0x6d, 0x3d, 0xdd, 0xa, 0x13, 0xb7 } }

-#endif

 	};

 

 

diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index 8587ae010e..7ca99f5601 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -74,13 +74,8 @@ PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	0,	

-#ifdef _UNICODE

 	// {60558872-2AAB-45aa-888D-097691C9B683}

 		{ 0x60558872, 0x2aab, 0x45aa, { 0x88, 0x8d, 0x9, 0x76, 0x91, 0xc9, 0xb6, 0x83 } }

-#else

-	// {F929B07B-DC4D-43d6-A6F3-3AA51F9FF81A}

-		{ 0xf929b07b, 0xdc4d, 0x43d6, { 0xa6, 0xf3, 0x3a, 0xa5, 0x1f, 0x9f, 0xf8, 0x1a } }

-#endif

 };

 

 

diff --git a/plugins/SmileyAdd/main.cpp b/plugins/SmileyAdd/main.cpp
index b38154d1db..dd328cfff3 100644
--- a/plugins/SmileyAdd/main.cpp
+++ b/plugins/SmileyAdd/main.cpp
@@ -68,14 +68,8 @@ static const PLUGININFOEX pluginInfoEx =
 	0,

 #endif

 	0,		//doesn't replace anything built-in

-#if defined(UNICODE) | defined(_UNICODE)

 	// {BD542BB4-5AE4-4d0e-A435-BA8DBE39607F}

 	{ 0xbd542bb4, 0x5ae4, 0x4d0e, { 0xa4, 0x35, 0xba, 0x8d, 0xbe, 0x39, 0x60, 0x7f } }

-#else

-	// {9817B76A-603A-4616-806C-86ECB97EA05B}

-	{ 0x9817b76a, 0x603a, 0x4616, { 0x80, 0x6c, 0x86, 0xec, 0xb9, 0x7e, 0xa0, 0x5b } }

-#endif

-

 };

 

 static SKINICONDESC skinDesc = 

diff --git a/plugins/SpellChecker/spellchecker.cpp b/plugins/SpellChecker/spellchecker.cpp
index 218a50f1be..6c81f480b5 100644
--- a/plugins/SpellChecker/spellchecker.cpp
+++ b/plugins/SpellChecker/spellchecker.cpp
@@ -40,13 +40,7 @@ PLUGININFOEX pluginInfo={
 	"http://pescuma.org/miranda/spellchecker",
 	UNICODE_AWARE,
 	0,		//doesn't replace anything built-in
-#ifdef WIN64
-	{ 0x77c4713f, 0xd544, 0x4b53, { 0xbf, 0x1f, 0xe, 0x47, 0x3e, 0xe9, 0xc4, 0x8c } } // {77C4713F-D544-4b53-BF1F-0E473EE9C48C}
-#elif UNICODE
 	{ 0x36753ae3, 0x840b, 0x4797, { 0x94, 0xa5, 0xfd, 0x9f, 0x58, 0x52, 0xb9, 0x42 } } // {36753AE3-840B-4797-94A5-FD9F5852B942}
-#else
-	{ 0x3cdbcd92, 0x94d7, 0x466a, { 0x94, 0x7f, 0x4e, 0xe0, 0x1c, 0xca, 0xf4, 0x89 } } // {3CDBCD92-94D7-466a-947F-4EE01CCAF489}
-#endif
 };
 
 typedef struct
diff --git a/plugins/TipperYM/common.h b/plugins/TipperYM/common.h
index 90482fbac1..201f8740c5 100644
--- a/plugins/TipperYM/common.h
+++ b/plugins/TipperYM/common.h
@@ -86,16 +86,8 @@ Boston, MA 02111-1307, USA.
 #include "m_updater.h"

 #include "m_smileyadd.h"

 

-#if defined _WIN64

-// {605103E8-27A1-4d41-B385-BE652047A833}

-#define	MIID_TIPPER { 0x605103e8, 0x27a1, 0x4d41, { 0xb3, 0x85, 0xbe, 0x65, 0x20, 0x47, 0xa8, 0x33 } }

-#elif defined _UNICODE

 // {8392DF1D-9090-4f8e-9DF6-2FE058EDD800}

 #define MIID_TIPPER	{ 0x8392df1d, 0x9090, 0x4f8e, { 0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00 } }

-#else

-// {63FD0B98-43AD-4c13-BD6E-2B550B9B20EF}

-#define	MIID_TIPPER { 0x63fd0b98, 0x43ad, 0x4c13, { 0xbd, 0x6e, 0x2b, 0x55, 0xb0, 0x9b, 0x20, 0xef } }

-#endif

 

 #define MODULE					"Tipper"

 #define MODULE_ITEMS			"Tipper_Items"

diff --git a/plugins/Variables/main.cpp b/plugins/Variables/main.cpp
index 42663d69a0..06d830259c 100644
--- a/plugins/Variables/main.cpp
+++ b/plugins/Variables/main.cpp
@@ -26,13 +26,8 @@ PLUGINLINK *pluginLink;
 DWORD g_mirandaVersion;

 int hLangpack = 0;

 

-#ifdef UNICODE

-	// {59B0036E-5403-422e-883B-C9AAF425682B}

-	#define MIID_VARIABLES { 0x59b0036e, 0x5403, 0x422e, { 0x88, 0x3b, 0xc9, 0xaa, 0xf4, 0x25, 0x68, 0x2b } }

-#else

-	// {352A6BA9-5636-4db0-B92F-7A3289F57902}

-	#define MIID_VARIABLES { 0x352a6ba9, 0x5636, 0x4db0, { 0xb9, 0x2f, 0x7a, 0x32, 0x89, 0xf5, 0x79, 0x2 } }

-#endif

+// {59B0036E-5403-422e-883B-C9AAF425682B}

+#define MIID_VARIABLES { 0x59b0036e, 0x5403, 0x422e, { 0x88, 0x3b, 0xc9, 0xaa, 0xf4, 0x25, 0x68, 0x2b } }

 

 static HANDLE hExitHook, hModulesLoadedHook;

 

diff --git a/plugins/W7UI/main.cpp b/plugins/W7UI/main.cpp
index 3e50ca234a..31cfcc1c2e 100644
--- a/plugins/W7UI/main.cpp
+++ b/plugins/W7UI/main.cpp
@@ -48,13 +48,8 @@ PLUGININFOEX pluginInfo = {
 	"http://nullbie.miranda.im",

 	UNICODE_AWARE,

 	0,	           // replace internal version (if any)

-#ifdef _UNICODE

 	// {D38EEB0B-B8EE-4177-B9E5-91EBE101E054}

 	{ 0xd38eeb0b, 0xb8ee, 0x4177, { 0xb9, 0xe5, 0x91, 0xeb, 0xe1, 0x1, 0xe0, 0x54 } }

-#else

-	// {DEB3FAFA-6B24-4db3-AA34-9EC27B868B50}

-	{ 0xdeb3fafa, 0x6b24, 0x4db3, { 0xaa, 0x34, 0x9e, 0xc2, 0x7b, 0x86, 0x8b, 0x50 } }

-#endif

 };

 

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

diff --git a/plugins/YAPP/popups2.cpp b/plugins/YAPP/popups2.cpp
index fa50b14164..9ebee50070 100644
--- a/plugins/YAPP/popups2.cpp
+++ b/plugins/YAPP/popups2.cpp
@@ -40,12 +40,7 @@ PLUGININFOEX pluginInfo={
 	__AUTHORWEB,

 	UNICODE_AWARE,		//not transient

 	0,					//doesn't replace anything built-in

-

-#ifndef _UNICODE

 	{ 0xefd15f16, 0x7ae4, 0x40d7, { 0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5 } } // {EFD15F16-7AE4-40d7-A8E3-A411ED747BD5}

-#else

-	{ 0x563780ef, 0xac7e, 0x40ba, { 0xa8, 0xa, 0xd, 0xcd, 0x4f, 0xd2, 0xf, 0x9 } } // {563780EF-AC7E-40ba-A80A-0DCD4FD20F09}

-#endif

 };

 

 PLUGINLINK *pluginLink;

diff --git a/plugins/ZeroNotification/version.h b/plugins/ZeroNotification/version.h
index 729522483f..0c06f4da3b 100644
--- a/plugins/ZeroNotification/version.h
+++ b/plugins/ZeroNotification/version.h
@@ -15,10 +15,5 @@
 #define AUTHOR "bidyut (<0.0.0.5), Maat"

 #define COPYRIGHT "© 2005 bidyut, © 2009 Maat"

 

-#if defined(_UNICODE)

-	// {47D489D3-310D-4ef6-BD05-699FFFD5A4AA}

-	#define UID { 0x47d489d3, 0x310d, 0x4ef6, { 0xbd, 0x5, 0x69, 0x9f, 0xff, 0xd5, 0xa4, 0xaa } }

-#else

-	// {C92FA511-EACE-4add-99B1-FDB7AA150E14}

-	#define UID { 0xc92fa511, 0xeace, 0x4add, { 0x99, 0xb1, 0xfd, 0xb7, 0xaa, 0x15, 0xe, 0x14 } }

-#endif

+// {47D489D3-310D-4ef6-BD05-699FFFD5A4AA}

+#define UID { 0x47d489d3, 0x310d, 0x4ef6, { 0xbd, 0x5, 0x69, 0x9f, 0xff, 0xd5, 0xa4, 0xaa } }

diff --git a/protocols/AimOscar/aim.cpp b/protocols/AimOscar/aim.cpp
index 42b1b83e96..e59bdbf395 100644
--- a/protocols/AimOscar/aim.cpp
+++ b/protocols/AimOscar/aim.cpp
@@ -66,11 +66,7 @@ static const PLUGININFOEX pluginInfo =
 	"http://www.miranda-im.org",

 	UNICODE_AWARE,		//not transient

 	0,		//doesn't replace anything built-in

-	#if defined( _UNICODE )

 	{0x3750a5a3, 0xbf0d, 0x490e, {0xb6, 0x5d, 0x41, 0xac, 0x4d, 0x29, 0xae, 0xb3}} // {3750A5A3-BF0D-490e-B65D-41AC4D29AEB3}

-	#else

-	{0x591af304, 0xcf40, 0x47ad, {0x8c, 0xed, 0x58, 0xcd, 0x89, 0x8b, 0x1e, 0x69}} // {591AF304-CF40-47ad-8CED-58CD898B1E69}

-	#endif

 };

 

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

diff --git a/protocols/FacebookRM/main.cpp b/protocols/FacebookRM/main.cpp
index e12bf8fac9..736393e247 100644
--- a/protocols/FacebookRM/main.cpp
+++ b/protocols/FacebookRM/main.cpp
@@ -50,13 +50,8 @@ PLUGININFOEX pluginInfo = {
 	"http://code.google.com/p/robyer/",

 	UNICODE_AWARE, //not transient

 	0,             //doesn't replace anything built-in

-  #ifdef _WIN64

-	// {8808C20C-5404-48A6-8390-232AAE5E793A}

-	{ 0x8808c20c, 0x5404, 0x48a6, { 0x83, 0x90, 0x23, 0x2a, 0xae, 0x5e, 0x79, 0x3a } }

-  #else

 	// {8432B009-FF32-4727-AAE6-A9035038FD58}

 	{ 0x8432b009, 0xff32, 0x4727, { 0xaa, 0xe6, 0xa9, 0x3, 0x50, 0x38, 0xfd, 0x58 } }

-  #endif

 };

 

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

diff --git a/protocols/IRCG/main.cpp b/protocols/IRCG/main.cpp
index ab48fd4f1b..a44217abc9 100644
--- a/protocols/IRCG/main.cpp
+++ b/protocols/IRCG/main.cpp
@@ -60,11 +60,7 @@ PLUGININFOEX pluginInfo =
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	0,

-    #if defined( _UNICODE )

     {0x92382b4d, 0x5572, 0x48a0, {0xb0, 0xb9, 0x13, 0x36, 0xa6, 0x1, 0xd6, 0x89}} // {92382B4D-5572-48a0-B0B9-1336A601D689}

-    #else

-    {0xc0ef6b61, 0xb3b0, 0x4fb7, {0xa2, 0x9e, 0x56, 0x32, 0xdd, 0x98, 0xae, 0x1c}} // {C0EF6B61-B3B0-4fb7-A29E-5632DD98AE1C}

-    #endif

 };

 

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

diff --git a/protocols/IcqOscarJ/init.cpp b/protocols/IcqOscarJ/init.cpp
index 44adc3efbc..c9413ab977 100644
--- a/protocols/IcqOscarJ/init.cpp
+++ b/protocols/IcqOscarJ/init.cpp
@@ -63,11 +63,7 @@ PLUGININFOEX pluginInfo = {
 	"http://addons.miranda-im.org/details.php?action=viewfile&id=1683",

 	UNICODE_AWARE,

 	0,   //doesn't replace anything built-in

-#if defined( _UNICODE )

 	{0x73a9615c, 0x7d4e, 0x4555, {0xba, 0xdb, 0xee, 0x5, 0xdc, 0x92, 0x8e, 0xff}} // {73A9615C-7D4E-4555-BADB-EE05DC928EFF}

-#else

-	{0x89cf4c3d, 0x7014, 0x4658, {0xa1, 0x3b, 0x46, 0xdb, 0x49, 0x68, 0xc7, 0x3b}} // {89CF4C3D-7014-4658-A13B-46DB4968C73B}

-#endif

 };

 

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

diff --git a/protocols/JabberG/jabber.cpp b/protocols/JabberG/jabber.cpp
index f0dc9290f2..ec417502f0 100644
--- a/protocols/JabberG/jabber.cpp
+++ b/protocols/JabberG/jabber.cpp
@@ -61,11 +61,7 @@ PLUGININFOEX pluginInfo = {
 	"http://miranda-im.org",

 	UNICODE_AWARE,

 	0,

-    #if defined( _UNICODE )

     {0x144e80a2, 0xd198, 0x428b, {0xac, 0xbe, 0x9d, 0x55, 0xda, 0xcc, 0x7f, 0xde}} // {144E80A2-D198-428b-ACBE-9D55DACC7FDE}

-    #else

-    {0x74eb8cce, 0xc3e7, 0x4c32, {0x88, 0x9f, 0xd, 0xe7, 0xc8, 0x82, 0xbf, 0x7f}} // {74EB8CCE-C3E7-4c32-889F-0DE7C882BF7F}

-    #endif

 };

 

 MM_INTERFACE    mmi;

diff --git a/protocols/MSN/msn.cpp b/protocols/MSN/msn.cpp
index 7b70c396a4..4554de8538 100644
--- a/protocols/MSN/msn.cpp
+++ b/protocols/MSN/msn.cpp
@@ -59,11 +59,7 @@ static const PLUGININFOEX pluginInfo =
 	"http://miranda-im.org",

 	UNICODE_AWARE,	

 	0,

-	#if defined(_UNICODE)

 	{0x97724af9, 0xf3fb, 0x47d3, {0xa3, 0xbf, 0xea, 0xa9, 0x35, 0xc7, 0x4e, 0x6d}} // {97724AF9-F3FB-47d3-A3BF-EAA935C74E6D}

-	#else

-	{0x0f0eddc9, 0xa46a, 0x40de, {0xbe, 0x7a, 0xe5, 0xaa, 0xb9, 0xb6, 0x14, 0x59}} // {0F0EDDC9-A46A-40de-BE7A-E5AAB9B61459}

-	#endif

 };

 

 int MSN_GCEventHook(WPARAM wParam, LPARAM lParam);

diff --git a/protocols/Omegle/main.cpp b/protocols/Omegle/main.cpp
index d433e48e86..ec78eb5efe 100644
--- a/protocols/Omegle/main.cpp
+++ b/protocols/Omegle/main.cpp
@@ -49,13 +49,8 @@ PLUGININFOEX pluginInfo = {
 	"http://code.google.com/p/robyer/",

 	UNICODE_AWARE, //not transient

 	0,             //doesn't replace anything built-in

-  #ifdef _WIN64

-	// {95A3FF9B-0124-4A34-A123-E3262858010F}

-	{ 0x95a3ff9b, 0x124, 0x4a34, { 0xa1, 0x23, 0xe3, 0x26, 0x28, 0x58, 0x1, 0xf } }

-  #else

 	// {9E1D9244-606C-4ef4-99A0-1D7D23CB7601}

 	{ 0x9e1d9244, 0x606c, 0x4ef4, { 0x99, 0xa0, 0x1d, 0x7d, 0x23, 0xcb, 0x76, 0x1 } }

-  #endif

 };

 

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

diff --git a/protocols/Quotes/Forex.cpp b/protocols/Quotes/Forex.cpp
index 3bb25a9f99..e0df9c34fd 100644
--- a/protocols/Quotes/Forex.cpp
+++ b/protocols/Quotes/Forex.cpp
@@ -65,13 +65,8 @@ namespace
 		__AUTHORWEB,

 		UNICODE_AWARE,

 		0

-#ifdef _UNICODE

 		// {E882056D-0D1D-4131-9A98-404CBAEA6A9C}

 		,{0xe882056d, 0xd1d, 0x4131, { 0x9a, 0x98, 0x40, 0x4c, 0xba, 0xea, 0x6a, 0x9c } }

-#else

-		// {8CE16273-89EA-4e12-8CF1-2D38AB6BF431}

-		,{0x8ce16273, 0x89ea, 0x4e12, { 0x8c, 0xf1, 0x2d, 0x38, 0xab, 0x6b, 0xf4, 0x31 } }

-#endif

 	};

 

 	INT_PTR QuotesMenu_RefreshAll(WPARAM wp,LPARAM lp)

diff --git a/protocols/Yahoo/main.cpp b/protocols/Yahoo/main.cpp
index 2814db5512..6205ea92e6 100644
--- a/protocols/Yahoo/main.cpp
+++ b/protocols/Yahoo/main.cpp
@@ -46,11 +46,7 @@ PLUGININFOEX pluginInfo={
 		"http://www.miranda-im.org",

 		UNICODE_AWARE, //not transient

 		0, //DEFMOD_PROTOCOLYAHOO - no core yahoo protocol

-        #if defined( _UNICODE )

         {0xaa7bfea, 0x1fc7, 0x45f0, {0x90, 0x6e, 0x2a, 0x46, 0xb6, 0xe1, 0x19, 0xcf}} // {0AA7BFEA-1FC7-45f0-906E-2A46B6E119CF}

-        #else

-        {0x6151b6e6, 0x3a7b, 0x45e6, {0x9a, 0x51, 0x18, 0x72, 0xc1, 0x7b, 0x5, 0xa9}} // {6151B6E6-3A7B-45e6-9A51-1872C17B05A9}

-        #endif

 };

 

 void YmsgrLinksInit(void);