From 4fa696b9543d75bc455ae3c5e1fa832f517a62a0 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 3 Jan 2013 15:16:59 +0000 Subject: removed not used icon standard plugin description and version info git-svn-id: http://svn.miranda-ng.org/main/trunk@2928 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/res/aim.rc | 4 ++-- protocols/AimOscar/res/link.ico | Bin 2550 -> 0 bytes protocols/AimOscar/res/version.rc | 23 +++++++++++------------ protocols/AimOscar/src/aim.cpp | 21 ++++++++++----------- protocols/AimOscar/src/aim.h | 1 + protocols/AimOscar/src/version.h | 30 ++++++++++++------------------ 6 files changed, 36 insertions(+), 43 deletions(-) delete mode 100644 protocols/AimOscar/res/link.ico (limited to 'protocols/AimOscar') diff --git a/protocols/AimOscar/res/aim.rc b/protocols/AimOscar/res/aim.rc index 090e47836b..707aff6a6f 100644 --- a/protocols/AimOscar/res/aim.rc +++ b/protocols/AimOscar/res/aim.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "windows.h" +#include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""windows.h""\r\n" + "#include ""afxres.h""\r\n" "\0" END diff --git a/protocols/AimOscar/res/link.ico b/protocols/AimOscar/res/link.ico deleted file mode 100644 index 20de139547..0000000000 Binary files a/protocols/AimOscar/res/link.ico and /dev/null differ diff --git a/protocols/AimOscar/res/version.rc b/protocols/AimOscar/res/version.rc index 73d2f698fa..5bfbab4754 100644 --- a/protocols/AimOscar/res/version.rc +++ b/protocols/AimOscar/res/version.rc @@ -1,35 +1,34 @@ +// Microsoft Visual C++ generated resource script. +// #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED -#include +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING PRODUCTVERSION __FILEVERSION_STRING - FILEFLAGSMASK 0x3fL + FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L #endif - FILEOS 0x40004L - FILETYPE 0x1L + FILEOS 0x4L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", "Boris Krasnovskiy, Aaron Myles Landwehr" - VALUE "FileDescription", "Miranda NG AIM Protocol" - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", "aim" - VALUE "LegalCopyright", "Copyright (c) 2008-2009 Boris Krasnovskiy, 2005-2006 Aaron Myles Landwehr" - VALUE "OriginalFilename", "aim.dll" - VALUE "ProductName", "Miranda NG AIM Protocol" - VALUE "ProductVersion", __VERSION_STRING + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME END END BLOCK "VarFileInfo" diff --git a/protocols/AimOscar/src/aim.cpp b/protocols/AimOscar/src/aim.cpp index c619194e18..4af78fae52 100644 --- a/protocols/AimOscar/src/aim.cpp +++ b/protocols/AimOscar/src/aim.cpp @@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "aim.h" -#include "version.h" char AIM_CAP_MIRANDA[16] = "MirandaA"; @@ -37,7 +36,6 @@ OBJLIST g_Instances(1, sttCompareProtocols); ///////////////////////////////////////////////////////////////////////////////////////// // Dll entry point -extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD /*fdwReason*/,LPVOID /*lpvReserved*/) { hInstance = hinstDLL; @@ -50,21 +48,22 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD /*fdwReason*/,LPVOID /*lpvReserved* static const PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "AIM Protocol", - __VERSION_DWORD, - "Provides support for AOL Instant Messenger (AIM) protocol.", - "Boris Krasnovskiy, Aaron Myles Landwehr", - "borkra@miranda-im.org", - "© 2008-2011 Boris Krasnovskiy, 2005-2006 Aaron Myles Landwehr", - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, - {0x3750a5a3, 0xbf0d, 0x490e, {0xb6, 0x5d, 0x41, 0xac, 0x4d, 0x29, 0xae, 0xb3}} // {3750A5A3-BF0D-490e-B65D-41AC4D29AEB3} + // {3750A5A3-BF0D-490e-B65D-41AC4D29AEB3} + {0x3750a5a3, 0xbf0d, 0x490e, {0xb6, 0x5d, 0x41, 0xac, 0x4d, 0x29, 0xae, 0xb3}} }; extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { *(unsigned long*)(&AIM_CAP_MIRANDA[8]) = _htonl(mirandaVersion); - *(unsigned long*)(&AIM_CAP_MIRANDA[12]) = _htonl(__VERSION_DWORD); + *(unsigned long*)(&AIM_CAP_MIRANDA[12]) = _htonl(PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)); return &pluginInfo; } diff --git a/protocols/AimOscar/src/aim.h b/protocols/AimOscar/src/aim.h index fb6d1071ee..e764ff3dc5 100644 --- a/protocols/AimOscar/src/aim.h +++ b/protocols/AimOscar/src/aim.h @@ -89,6 +89,7 @@ along with this program. If not, see . #include "proto.h" #include "theme.h" #include "ui.h" +#include "version.h" // Protocol limits #define MAX_SCREEN_NAME_LENGTH 97 diff --git a/protocols/AimOscar/src/version.h b/protocols/AimOscar/src/version.h index cd1ad86ac6..27ca00fb92 100644 --- a/protocols/AimOscar/src/version.h +++ b/protocols/AimOscar/src/version.h @@ -1,20 +1,14 @@ -/* -Plugin of Miranda IM for communicating with users of the AIM protocol. -Copyright (c) 2008-2009 Boris Krasnovskiy +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 11 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#define __FILEVERSION_STRING 0,11,0,1 -#define __VERSION_STRING "0.11.0.1" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0,11,0,1) +#define __PLUGIN_NAME "AIM protocol" +#define __FILENAME "AIM.dll" +#define __DESCRIPTION "Provides support for AOL Instant Messenger (AIM) protocol." +#define __AUTHOR "Boris Krasnovskiy, Aaron Myles Landwehr" +#define __AUTHOREMAIL "borkra@miranda-im.org" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2008-2011 Boris Krasnovskiy, 2005-2006 Aaron Myles Landwehr" -- cgit v1.2.3