From f08c16820a6bf1b1e9087909d604efbca8520808 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 20 Oct 2012 16:19:36 +0000 Subject: version info standartization git-svn-id: http://svn.miranda-ng.org/main/trunk@1994 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AddContactPlus/res/Version.rc | 1 + plugins/Alarms/res/Version.rc | 1 + plugins/AssocMgr/res/version.rc | 1 + plugins/AuthState/res/version.rc | 1 + plugins/AutoRun/res/Version.rc | 1 + plugins/AutoShutdown/res/version.rc | 1 + plugins/AvatarHistory/res/Version.rc | 1 + plugins/BASS_interface/res/Version.rc | 4 ---- plugins/BASS_interface/src/Bass_interface.h | 2 -- plugins/BASS_interface/src/Main.cpp | 9 +++++---- plugins/BASS_interface/src/Version.h | 1 - plugins/BasicHistory/res/version.rc | 1 + plugins/Boltun/Boltun_10.vcxproj | 8 ++------ plugins/Boltun/Boltun_10.vcxproj.filters | 24 ++++++++++-------------- plugins/Boltun/src/boltun.cpp | 19 ++++++++++--------- plugins/Boltun/src/boltun.h | 2 -- 16 files changed, 35 insertions(+), 42 deletions(-) diff --git a/plugins/AddContactPlus/res/Version.rc b/plugins/AddContactPlus/res/Version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AddContactPlus/res/Version.rc +++ b/plugins/AddContactPlus/res/Version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO diff --git a/plugins/Alarms/res/Version.rc b/plugins/Alarms/res/Version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/Alarms/res/Version.rc +++ b/plugins/Alarms/res/Version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO diff --git a/plugins/AssocMgr/res/version.rc b/plugins/AssocMgr/res/version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AssocMgr/res/version.rc +++ b/plugins/AssocMgr/res/version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO diff --git a/plugins/AuthState/res/version.rc b/plugins/AuthState/res/version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AuthState/res/version.rc +++ b/plugins/AuthState/res/version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO diff --git a/plugins/AutoRun/res/Version.rc b/plugins/AutoRun/res/Version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AutoRun/res/Version.rc +++ b/plugins/AutoRun/res/Version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO diff --git a/plugins/AutoShutdown/res/version.rc b/plugins/AutoShutdown/res/version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AutoShutdown/res/version.rc +++ b/plugins/AutoShutdown/res/version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO diff --git a/plugins/AvatarHistory/res/Version.rc b/plugins/AvatarHistory/res/Version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AvatarHistory/res/Version.rc +++ b/plugins/AvatarHistory/res/Version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO diff --git a/plugins/BASS_interface/res/Version.rc b/plugins/BASS_interface/res/Version.rc index d741488c4f..5bfbab4754 100644 --- a/plugins/BASS_interface/res/Version.rc +++ b/plugins/BASS_interface/res/Version.rc @@ -7,10 +7,6 @@ #include "afxres.h" #include "..\src\version.h" -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#endif //_WIN32 - VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING PRODUCTVERSION __FILEVERSION_STRING diff --git a/plugins/BASS_interface/src/Bass_interface.h b/plugins/BASS_interface/src/Bass_interface.h index 1058037bea..61c3f367fd 100644 --- a/plugins/BASS_interface/src/Bass_interface.h +++ b/plugins/BASS_interface/src/Bass_interface.h @@ -34,8 +34,6 @@ Copyright (C) 2010, 2011 tico-tico #define LOADBASSFUNCTION(f) (*((void**)&f)=(void*)GetProcAddress(hBass,#f)) -#define MIID_BASSINT {0x2f07ea05, 0x05b5, 0x4ff0, { 0x87, 0x5d, 0xc5, 0x90, 0xda, 0x2d, 0xda, 0xc1 }} //2f07ea05-05b5-4ff0-875d-c590da2ddac1 - #define ModuleName "Bass Interface" #define OPT_VOLUME "Volume" diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 828babac15..e34d9da35f 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -7,7 +7,7 @@ Copyright (C) 2010, 2011 tico-tico HINSTANCE hInst; int hLangpack; -PLUGININFOEX pluginInfo={ +PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), @@ -17,16 +17,17 @@ PLUGININFOEX pluginInfo={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - MIID_BASSINT + //2f07ea05-05b5-4ff0-875d-c590da2ddac1 + {0x2f07ea05, 0x05b5, 0x4ff0, {0x87, 0x5d, 0xc5, 0x90, 0xda, 0x2d, 0xda, 0xc1}} }; static HANDLE hService; static HANDLE hTBButton; static HINSTANCE hBass = NULL; -extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - hInst=hinstDLL; + hInst = hinstDLL; return TRUE; } diff --git a/plugins/BASS_interface/src/Version.h b/plugins/BASS_interface/src/Version.h index 0735651c7d..817ecd1662 100644 --- a/plugins/BASS_interface/src/Version.h +++ b/plugins/BASS_interface/src/Version.h @@ -10,7 +10,6 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) - #define __PLUGIN_NAME "BASS_interface" #define __INTERNAL_NAME "BASS_interface" #define __FILENAME "BASS_interface.dll" diff --git a/plugins/BasicHistory/res/version.rc b/plugins/BasicHistory/res/version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/BasicHistory/res/version.rc +++ b/plugins/BasicHistory/res/version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO diff --git a/plugins/Boltun/Boltun_10.vcxproj b/plugins/Boltun/Boltun_10.vcxproj index 0c709d94c4..4bc1e66885 100644 --- a/plugins/Boltun/Boltun_10.vcxproj +++ b/plugins/Boltun/Boltun_10.vcxproj @@ -187,18 +187,14 @@ + - - - - - - + diff --git a/plugins/Boltun/Boltun_10.vcxproj.filters b/plugins/Boltun/Boltun_10.vcxproj.filters index 7c9835f7e1..b7d0de0d5f 100644 --- a/plugins/Boltun/Boltun_10.vcxproj.filters +++ b/plugins/Boltun/Boltun_10.vcxproj.filters @@ -86,25 +86,21 @@ Header Files\Engine + + Header Files + - + Resource Files - - + + Resource Files - - - - - - - Source Files - + - - Resource Files - + + Source Files\Enigne + \ No newline at end of file diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index e19e207c29..25968b15a7 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -37,6 +37,7 @@ #include "resource.h" #include "resource.h" +#include "version.h" #include "boltun.h" #include "config.h" @@ -57,18 +58,18 @@ BOOL blInit = FALSE; UINT pTimer = 0; TCHAR *path; -PLUGININFOEX pluginInfo={ +PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - BOLTUN_NAME, - PLUGIN_MAKE_VERSION(0,0,3,0), - PLUGIN_DESCRIPTION, - "Alexander S. Kiselev, Valentin Pavlyuchenko", - "Valentin.Pavlyuchenko@gmail.com", - "© 2003-2008 Alexander S. Kiselev A.K.A. KAS, Valentin Pavlyuchenko", - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, // {488C5C84-56DA-434F-96F1-B18900DEF760} - { 0x488c5c84, 0x56da, 0x434f, { 0x96, 0xf1, 0xb1, 0x89, 0x0, 0xde, 0xf7, 0x60 } } + {0x488c5c84, 0x56da, 0x434f, {0x96, 0xf1, 0xb1, 0x89, 0x0, 0xde, 0xf7, 0x60}} }; static HANDLE hEventDbEventAdded; diff --git a/plugins/Boltun/src/boltun.h b/plugins/Boltun/src/boltun.h index 914869387c..dc0cdcdb22 100644 --- a/plugins/Boltun/src/boltun.h +++ b/plugins/Boltun/src/boltun.h @@ -50,8 +50,6 @@ //Plugin name #define BOLTUN_NAME "Boltun" -#define PLUGIN_DESCRIPTION "Boltun, the chat bot in the russian language." - #define MIND_FILE_DESC _T("Mind Files") #define ALL_FILES_DESC _T("All Files") -- cgit v1.2.3