From 50eb80e6116dda8fb97da91146092328d0950622 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 3 Aug 2012 19:44:57 +0000 Subject: removed the Unicode core verification git-svn-id: http://svn.miranda-ng.org/main/trunk@1342 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/main.cpp | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'plugins/SmileyAdd/src') diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp index d4be17b804..4165553cad 100644 --- a/plugins/SmileyAdd/src/main.cpp +++ b/plugins/SmileyAdd/src/main.cpp @@ -41,9 +41,9 @@ static HANDLE hService[13]; int hLangpack; -static const PLUGININFOEX pluginInfoEx = +static const PLUGININFOEX pluginInfoEx = { - sizeof(PLUGININFOEX), + sizeof(PLUGININFOEX), "SmileyAdd", __VERSION_DWORD, "Smiley support for Miranda Instant Messanger", @@ -57,14 +57,14 @@ static const PLUGININFOEX pluginInfoEx = { 0xbd542bb4, 0x5ae4, 0x4d0e, { 0xa4, 0x35, 0xba, 0x8d, 0xbe, 0x39, 0x60, 0x7f } } }; -static SKINICONDESC skinDesc = -{ - sizeof(SKINICONDESC), "SmileyAdd", NULL, - "SmileyAdd_ButtonSmiley", NULL, -IDI_SMILINGICON +static SKINICONDESC skinDesc = +{ + sizeof(SKINICONDESC), "SmileyAdd", NULL, + "SmileyAdd_ButtonSmiley", NULL, -IDI_SMILINGICON }; -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD /* mirandaVersion */) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD /* mirandaVersion */) { return (PLUGININFOEX*)&pluginInfoEx; } @@ -82,7 +82,7 @@ static int ModulesLoaded(WPARAM, LPARAM) HANDLE hSkinIcon = Skin_AddIcon(&skinDesc); INT_PTR temp = CallService(MS_MC_GETPROTOCOLNAME, 0, 0); - metaProtoName = mir_strdup(temp == CALLSERVICE_NOTFOUND ? NULL : (char*)temp); + metaProtoName = mir_strdup(temp == CALLSERVICE_NOTFOUND ? NULL : (char*)temp); CLISTMENUITEM mi = {0}; mi.cbSize = sizeof(mi); @@ -97,7 +97,7 @@ static int ModulesLoaded(WPARAM, LPARAM) DownloadInit(); //install hooks if enabled - InstallDialogBoxHook(); + InstallDialogBoxHook(); g_SmileyCategories.AddAllProtocolsAsCategory(); g_SmileyCategories.ClearAndLoadAll(); @@ -119,23 +119,12 @@ extern "C" __declspec(dllexport) int Load(void) if (ServiceExists(MS_SMILEYADD_REPLACESMILEYS)) { static const TCHAR errmsg[] = _T("Only one instance of SmileyAdd could be executed.\n") - _T("Remove duplicate instances from 'Plugins' directory"); + _T("Remove duplicate instances from 'Plugins' directory"); ReportError(TranslateTS(errmsg)); return 1; } - char temp[80]; - CallService(MS_SYSTEM_GETVERSIONTEXT, (WPARAM)SIZEOF(temp), (LPARAM)temp); - - - if (strstr(temp, "Unicode") == NULL) - { - ReportError(TranslateT("Please update SmileyAdd to ANSI Version")); - return 1; - } - - InitImageCache(); g_SmileyCategories.SetSmileyPackStore(&g_SmileyPacks); @@ -165,7 +154,7 @@ extern "C" __declspec(dllexport) int Load(void) hService[8] = CreateServiceFunction(MS_SMILEYADD_BATCHFREE, FreeTextBatch); hService[9] = CreateServiceFunction(MS_SMILEYADD_CUSTOMCATMENU, CustomCatMenu); hService[10] = CreateServiceFunction(MS_SMILEYADD_RELOAD, ReloadPack); - hService[11] = CreateServiceFunction(MS_SMILEYADD_LOADCONTACTSMILEYS, LoadContactSmileys); + hService[11] = CreateServiceFunction(MS_SMILEYADD_LOADCONTACTSMILEYS, LoadContactSmileys); hService[12] = CreateServiceFunction(MS_SMILEYADD_PARSEW, ParseTextW); -- cgit v1.2.3