From 09f03e95bb19fc43fdb3e9f6db6156a8d89f09ee Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 24 Feb 2013 16:43:27 +0000 Subject: added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3757 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FloatingContacts/FltCont_10.vcxproj | 8 +-- plugins/FloatingContacts/FltCont_11.vcxproj | 8 +-- plugins/FloatingContacts/res/version.rc | 19 ++++--- plugins/FloatingContacts/src/bitmap_funcs.cpp | 4 -- plugins/FloatingContacts/src/main.cpp | 71 +++++++-------------------- plugins/FloatingContacts/src/options.cpp | 3 -- plugins/FloatingContacts/src/stdhdr.h | 36 ++------------ plugins/FloatingContacts/src/thumbs.cpp | 1 - plugins/FloatingContacts/src/version.h | 25 +++------- 9 files changed, 48 insertions(+), 127 deletions(-) diff --git a/plugins/FloatingContacts/FltCont_10.vcxproj b/plugins/FloatingContacts/FltCont_10.vcxproj index 98768cfd7e..61039594c4 100644 --- a/plugins/FloatingContacts/FltCont_10.vcxproj +++ b/plugins/FloatingContacts/FltCont_10.vcxproj @@ -88,7 +88,7 @@ ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true false $(IntDir)$(TargetName).lib @@ -113,7 +113,7 @@ ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true false $(IntDir)$(TargetName).lib @@ -140,7 +140,7 @@ ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true true true @@ -170,7 +170,7 @@ ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true true true diff --git a/plugins/FloatingContacts/FltCont_11.vcxproj b/plugins/FloatingContacts/FltCont_11.vcxproj index 9738045590..1eadd5d3b3 100644 --- a/plugins/FloatingContacts/FltCont_11.vcxproj +++ b/plugins/FloatingContacts/FltCont_11.vcxproj @@ -92,7 +92,7 @@ ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true false $(IntDir)$(TargetName).lib @@ -117,7 +117,7 @@ ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true false $(IntDir)$(TargetName).lib @@ -144,7 +144,7 @@ ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true true true @@ -174,7 +174,7 @@ ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true true true diff --git a/plugins/FloatingContacts/res/version.rc b/plugins/FloatingContacts/res/version.rc index 007e8fd533..5bfbab4754 100644 --- a/plugins/FloatingContacts/res/version.rc +++ b/plugins/FloatingContacts/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 FILE_VERSION - PRODUCTVERSION PRODUCT_VERSION - FILEFLAGSMASK 0x3fL + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + 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 "Author", __AUTHOR - VALUE "FileDescription", __DESC - VALUE "FileVersion", FILE_VERSION_STR + VALUE "FileDescription", __DESCRIPTION VALUE "InternalName", __PLUGIN_NAME VALUE "LegalCopyright", __COPYRIGHT VALUE "OriginalFilename", __FILENAME VALUE "ProductName", __PLUGIN_NAME - VALUE "ProductVersion", PRODUCT_VERSION_STR END END BLOCK "VarFileInfo" diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp index 334bf98abe..422fc13c33 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp @@ -20,10 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "stdhdr.h" -#include "bitmap_funcs.h" - -#include -#include #define PU_FONT_THRESHOLD 96 #define PU_BMP_ACCURATE_ARITHMETICS diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index 20e55b2e83..900e6e7c7b 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -15,18 +15,6 @@ No warranty for any misbehaviour. */ #include "stdhdr.h" -#include "shlwapi.h" - -#include "version.h" - -#pragma comment ( lib, "comctl32.lib" ) -#pragma comment ( lib, "shlwapi.lib" ) - -#pragma warning ( default : 4201 ) - -//#define DB_POS_GETX(pos) LOWORD(pos) -//#define DB_POS_GETY(pos) HIWORD(pos) -//#define DB_POS_MAKE_XY(x, y) MAKELONG(x, y) BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND, COLORREF, BYTE, DWORD); BOOL (WINAPI *pUpdateLayeredWindow) @@ -143,53 +131,36 @@ static void InitOptions() { fcOpt.bShowIdle = TRUE; } - - PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - __PLUGIN_NAME, - 0, - __DESC, - __AUTHOR, - __AUTHOREMAIL, - __COPYRIGHT, - __AUTHORWEB, - UNICODE_AWARE, - { 0x53c715a8, 0xeb01, 0x4136, { 0xa7, 0x3c, 0x44, 0x18, 0x68, 0x61, 0x0, 0x74 } } // {53C715A8-EB01-4136-A73C-441868610074} + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + // {53C715A8-EB01-4136-A73C-441868610074} + {0x53c715a8, 0xeb01, 0x4136, {0xa7, 0x3c, 0x44, 0x18, 0x68, 0x61, 0x0, 0x74}} }; -_inline unsigned int MakeVer(int a, int b, int c, int d) -{ - return PLUGIN_MAKE_VERSION(a, b, c, d); -} - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { return &pluginInfoEx; } - /////////////////////////////////////////////////////// // Load / unload -BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInst = hinstDLL; - - switch ( fdwReason ) - { - case DLL_PROCESS_ATTACH: - break; - - case DLL_PROCESS_DETACH: - break; - } - - return( TRUE ); + return TRUE; } -extern "C" int __declspec(dllexport) Load( ) +extern "C" int __declspec(dllexport) Load() { - SetLastError( 0 ); + SetLastError(0); InitOptions(); mir_getLP(&pluginInfoEx); @@ -213,16 +184,12 @@ extern "C" int __declspec(dllexport) Load( ) return 0; } - - extern "C" int __declspec(dllexport) Unload() { CleanUp(); return 0; } - - static void CleanUp() { int nFontId; @@ -446,7 +413,7 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) if ( hContact == NULL ) { - if (( 0 == stricmp( pdbcws->szModule, "CLC" )) || ( 0 == stricmp( pdbcws->szModule, sModule )) ) { + if (( 0 == _stricmp( pdbcws->szModule, "CLC" )) || ( 0 == _stricmp( pdbcws->szModule, sModule )) ) { LoadDBSettings(); ApplyOptionsChanges(); } @@ -457,19 +424,19 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) if ( pThumb == NULL ) return( 0 ); // Only on these 2 events we need to refresh - if ( 0 == stricmp( pdbcws->szSetting, "Status" )) + if ( 0 == _stricmp( pdbcws->szSetting, "Status" )) { idStatus = pdbcws->value.wVal; } - else if ( 0 == stricmp( pdbcws->szSetting, "Nick" )) + else if ( 0 == _stricmp( pdbcws->szSetting, "Nick" )) { idStatus = GetContactStatus( hContact ); } - else if ( 0 == stricmp( pdbcws->szSetting, "MyHandle" )) + else if ( 0 == _stricmp( pdbcws->szSetting, "MyHandle" )) { idStatus = GetContactStatus( hContact ); } - else if ( fcOpt.bShowIdle && 0 == stricmp( pdbcws->szSetting, "IdleTS" )) + else if ( fcOpt.bShowIdle && 0 == _stricmp( pdbcws->szSetting, "IdleTS" )) { idStatus = GetContactStatus( hContact ); } diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index fd1ebe6e9c..b794b79156 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -1,9 +1,6 @@ #include "stdhdr.h" -#include "resource.h" -#include "fltcont.h" - ///////////////////////////////////////////////////////////////////////////// // diff --git a/plugins/FloatingContacts/src/stdhdr.h b/plugins/FloatingContacts/src/stdhdr.h index 03b671515f..2a9e49c535 100644 --- a/plugins/FloatingContacts/src/stdhdr.h +++ b/plugins/FloatingContacts/src/stdhdr.h @@ -2,59 +2,31 @@ #ifndef __STDHDR_H__ #define __STDHDR_H__ -// disable security warnings about "*_s" functions -#define _CRT_SECURE_NO_DEPRECATE - -// disable warnings about underscore in stdc functions -#pragma warning(disable: 4996) - -// Unreferenced formal parameter -#pragma warning(disable: 4100) - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -///////////////////////////////////////////////////////////////////////////// -// - -#define STRICT +#define _CRT_SECURE_NO_WARNINGS #include -#include #include - -#pragma warning ( disable : 4201 ) //nonstandard extension used : nameless struct/union -#include - -#define MIRANDA_VER 0x0A00 +#include #include -#include #include #include -#include #include -#include #include #include #include -//#include "../../include/msgs.h" -#include -#include #include #include -#include -//#include "../../include/clc.h" #include #include +#include #include "bitmap_funcs.h" - #include "fltcont.h" #include "thumbs.h" #include "filedrop.h" #include "resource.h" +#include "version.h" ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index af4a18acf9..1a427c4e86 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -1,5 +1,4 @@ #include "stdhdr.h" -#include "Wingdi.h" ThumbList thumbList; diff --git a/plugins/FloatingContacts/src/version.h b/plugins/FloatingContacts/src/version.h index 3e3f50b218..ba57a6dbae 100644 --- a/plugins/FloatingContacts/src/version.h +++ b/plugins/FloatingContacts/src/version.h @@ -1,23 +1,14 @@ -#define BUILD_NUM 2 -#define BUILD_NUM_STR "2" -#define REVISION "$Revision: 1136 $" +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 6 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 2 -#define COREVERSION_NUM 1, 0, 2, -#define COREVERSION_NUM_STR "1, 0, 2" +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define MINIMAL_COREVERSION 0, 6, 0, 0 -#define MINIMAL_COREVERSION_STR "0, 6, 0, 0" - -#define FILE_VERSION COREVERSION_NUM BUILD_NUM -#define FILE_VERSION_STR COREVERSION_NUM_STR " build " BUILD_NUM_STR " " REVISION - -#define PRODUCT_VERSION FILE_VERSION -#define PRODUCT_VERSION_STR FILE_VERSION_STR - -#define __PLUGIN_NAME "Floating Contacts" +#define __PLUGIN_NAME "Floating contacts" #define __FILENAME "FltContacts.dll" -#define __DESC "Floating Contacts plugin for Miranda." +#define __DESCRIPTION "Floating Contacts plugin for Miranda." #define __AUTHOR "Iavor Vajarov, Kosh&chka, Victor Pavlychko" #define __AUTHOREMAIL "ell-6@ya.ru" #define __AUTHORWEB "http://miranda-ng.org/" -#define __COPYRIGHT "© 2002-2004 I. Vajarov (ivajarov@code.bg), © 2008 Kosh&chka, V. Pavlychko" +#define __COPYRIGHT "© 2002-2004 I. Vajarov (ivajarov@code.bg)6 2008 Kosh&chka, V. Pavlychko" -- cgit v1.2.3