From 349641ecaeaff4b7d652333ebba518c760ade8e9 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 10 Mar 2013 14:41:13 +0000 Subject: added precompiled header added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3960 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TrafficCounter/TrafficCounter_10.vcxproj | 402 ++------------------ .../TrafficCounter_10.vcxproj.filters | 8 +- plugins/TrafficCounter/TrafficCounter_11.vcxproj | 404 ++------------------- .../TrafficCounter_11.vcxproj.filters | 8 +- plugins/TrafficCounter/res/Version.rc | 38 ++ plugins/TrafficCounter/res/resource.rc | 98 +---- plugins/TrafficCounter/src/TrafficCounter.cpp | 17 +- plugins/TrafficCounter/src/TrafficCounter.h | 76 ++-- plugins/TrafficCounter/src/commonheaders.h | 114 ++---- plugins/TrafficCounter/src/opttree.cpp | 1 - plugins/TrafficCounter/src/statistics.cpp | 1 - plugins/TrafficCounter/src/vars.cpp | 3 - plugins/TrafficCounter/src/version.h | 17 +- 13 files changed, 236 insertions(+), 951 deletions(-) create mode 100644 plugins/TrafficCounter/res/Version.rc diff --git a/plugins/TrafficCounter/TrafficCounter_10.vcxproj b/plugins/TrafficCounter/TrafficCounter_10.vcxproj index 479cbce7bf..f681882f1e 100644 --- a/plugins/TrafficCounter/TrafficCounter_10.vcxproj +++ b/plugins/TrafficCounter/TrafficCounter_10.vcxproj @@ -21,186 +21,99 @@ TrafficCounter {885010EA-D008-4E38-85D4-487693F0BA00} - TrafficCounter DynamicLibrary - false Unicode - false DynamicLibrary - false Unicode true - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - Unicode - DynamicLibrary - false - Unicode - - - DynamicLibrary - false Unicode - true DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false Unicode true - - + + + + + + + + + + + - <_ProjectFileVersion>10.0.20506.1 + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - true - true + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - true - true - ..\..\..\..\VC\atlmfc\include;$(IncludePath) - ..\..\..\..\VC\atlmfc\include;$(IncludePath) - true - true - true - false - false + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/TrafficCounter.tlb - - - Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL commonheaders.h - true Level3 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) false + EditAndContinue + Use _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - ..\..\include\msapi Msimg32.lib;comctl32.lib;%(AdditionalDependencies) - true false true - true false - - $(IntDir)$(TargetName).lib - MachineX86 - $(IntDir)$(TargetName)$(TargetExt).intermediate.manifest $(ProfileDir)..\..\bin10\lib + Windows - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/TrafficCounter.tlb - - - Full OnlyExplicitInline Size - true ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - MultiThreadedDLL true commonheaders.h Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) NotSet false + Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - ..\..\include\msapi @@ -209,256 +122,55 @@ true true true - UseLinkTimeCodeGeneration false - - $(IntDir)$(TargetName).lib - MachineX86 - $(IntDir)$(TargetName)$(TargetExt).intermediate.manifest $(ProfileDir)..\..\bin10\lib /PDBALTPATH:%_PDB% %(AdditionalOptions) - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/TrafficCounter.tlb - - - - - Full - OnlyExplicitInline - Size - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - commonheaders.h - Level3 - true - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - true - true - UseLinkTimeCodeGeneration - false - - - $(IntDir)$(TargetName).lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/TrafficCounter.tlb - - - - - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - commonheaders.h - Level3 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - false - - - $(IntDir)$(TargetName).lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/TrafficCounter.tlb - - - - - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - commonheaders.h - Level3 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - false - - - $(IntDir)$(TargetName).lib - MachineX64 + Windows - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/TrafficCounter.tlb - - - Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL commonheaders.h Level3 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) false + Use _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - ..\..\include\msapi Msimg32.lib;comctl32.lib;%(AdditionalDependencies) - true true false - - $(IntDir)$(TargetName).lib - MachineX64 $(ProfileDir)..\..\bin10\lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/TrafficCounter.tlb - - - - - Full - OnlyExplicitInline - Size - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - commonheaders.h - Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - true - UseLinkTimeCodeGeneration - false - - - $(IntDir)$(TargetName).lib - MachineX64 + Windows - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/TrafficCounter.tlb - - - Full OnlyExplicitInline Size - true ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true commonheaders.h Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) false + Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - ..\..\include\msapi @@ -466,61 +178,17 @@ true true true - UseLinkTimeCodeGeneration false - - $(IntDir)$(TargetName).lib - MachineX64 $(ProfileDir)..\..\bin10\lib /PDBALTPATH:%_PDB% %(AdditionalOptions) - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/TrafficCounter.tlb - - - - - Full - OnlyExplicitInline - Size - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - commonheaders.h - Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - true - UseLinkTimeCodeGeneration - false - - - $(IntDir)$(TargetName).lib - MachineX64 + Windows - + + Create + @@ -538,11 +206,9 @@ - - - + diff --git a/plugins/TrafficCounter/TrafficCounter_10.vcxproj.filters b/plugins/TrafficCounter/TrafficCounter_10.vcxproj.filters index a184e52246..19e970c487 100644 --- a/plugins/TrafficCounter/TrafficCounter_10.vcxproj.filters +++ b/plugins/TrafficCounter/TrafficCounter_10.vcxproj.filters @@ -63,14 +63,12 @@ Header Files - - - Resource Files - - Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/TrafficCounter/TrafficCounter_11.vcxproj b/plugins/TrafficCounter/TrafficCounter_11.vcxproj index 110b4fd61e..f61a30125a 100644 --- a/plugins/TrafficCounter/TrafficCounter_11.vcxproj +++ b/plugins/TrafficCounter/TrafficCounter_11.vcxproj @@ -21,190 +21,103 @@ TrafficCounter {885010EA-D008-4E38-85D4-487693F0BA00} - TrafficCounter DynamicLibrary - false Unicode - false v110_xp DynamicLibrary - false Unicode true v110_xp - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - Unicode - DynamicLibrary - false Unicode v110_xp - - DynamicLibrary - false - Unicode - true - DynamicLibrary - false Unicode true v110_xp - - DynamicLibrary - false - Unicode - true - - - + + + + + + + + + + + - <_ProjectFileVersion>10.0.20506.1 + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - true - true + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - true - true - ..\..\..\..\VC\atlmfc\include;$(IncludePath) - ..\..\..\..\VC\atlmfc\include;$(IncludePath) - true - true - true - false - false + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/TrafficCounter.tlb - - - Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL commonheaders.h - true Level3 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) false + EditAndContinue + Use _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - ..\..\include\msapi - Msimg32.lib;comctl32.lib;%(AdditionalDependencies) - true + Msimg32.lib;%(AdditionalDependencies) false true - true false - - $(IntDir)$(TargetName).lib - MachineX86 - $(IntDir)$(TargetName)$(TargetExt).intermediate.manifest $(ProfileDir)..\..\bin11\lib + Windows - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/TrafficCounter.tlb - - - Full OnlyExplicitInline Size - true ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - MultiThreadedDLL true commonheaders.h Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) NotSet false + Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - ..\..\include\msapi @@ -213,256 +126,55 @@ true true true - UseLinkTimeCodeGeneration false - - $(IntDir)$(TargetName).lib - MachineX86 - $(IntDir)$(TargetName)$(TargetExt).intermediate.manifest $(ProfileDir)..\..\bin11\lib /PDBALTPATH:%_PDB% %(AdditionalOptions) - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/TrafficCounter.tlb - - - - - Full - OnlyExplicitInline - Size - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - commonheaders.h - Level3 - true - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - true - true - UseLinkTimeCodeGeneration - false - - - $(IntDir)$(TargetName).lib - MachineX64 + Windows - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/TrafficCounter.tlb - - - - - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - commonheaders.h - Level3 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - false - - - $(IntDir)$(TargetName).lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/TrafficCounter.tlb - - - - - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - commonheaders.h - Level3 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - false - - - $(IntDir)$(TargetName).lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/TrafficCounter.tlb - - - Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL commonheaders.h Level3 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) false + Use _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - ..\..\include\msapi Msimg32.lib;comctl32.lib;%(AdditionalDependencies) - true true false - - $(IntDir)$(TargetName).lib - MachineX64 $(ProfileDir)..\..\bin11\lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/TrafficCounter.tlb - - - - - Full - OnlyExplicitInline - Size - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - commonheaders.h - Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - true - UseLinkTimeCodeGeneration - false - - - $(IntDir)$(TargetName).lib - MachineX64 + Windows - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/TrafficCounter.tlb - - - Full OnlyExplicitInline Size - true ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true commonheaders.h Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) false + Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - ..\..\include\msapi @@ -470,61 +182,17 @@ true true true - UseLinkTimeCodeGeneration false - - $(IntDir)$(TargetName).lib - MachineX64 $(ProfileDir)..\..\bin11\lib /PDBALTPATH:%_PDB% %(AdditionalOptions) - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/TrafficCounter.tlb - - - - - Full - OnlyExplicitInline - Size - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - commonheaders.h - Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;%(AdditionalDependencies) - true - true - true - UseLinkTimeCodeGeneration - false - - - $(IntDir)$(TargetName).lib - MachineX64 + Windows - + + Create + @@ -542,11 +210,9 @@ - - - + diff --git a/plugins/TrafficCounter/TrafficCounter_11.vcxproj.filters b/plugins/TrafficCounter/TrafficCounter_11.vcxproj.filters index a184e52246..19e970c487 100644 --- a/plugins/TrafficCounter/TrafficCounter_11.vcxproj.filters +++ b/plugins/TrafficCounter/TrafficCounter_11.vcxproj.filters @@ -63,14 +63,12 @@ Header Files - - - Resource Files - - Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/TrafficCounter/res/Version.rc b/plugins/TrafficCounter/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/TrafficCounter/res/Version.rc @@ -0,0 +1,38 @@ +// Microsoft Visual C++ generated resource script. +// +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + +#include "afxres.h" +#include "..\src\version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/plugins/TrafficCounter/res/resource.rc b/plugins/TrafficCounter/res/resource.rc index 5e33d3d57b..55fdeb9e68 100644 --- a/plugins/TrafficCounter/res/resource.rc +++ b/plugins/TrafficCounter/res/resource.rc @@ -1,14 +1,12 @@ // Microsoft Visual C++ generated resource script. // #include "..\src\resource.h" -#include "..\src\version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include #include @@ -30,17 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_UNINSTALL_ICON ICON "network.ico" -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// Russian (Russia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -#pragma code_page(1251) - ///////////////////////////////////////////////////////////////////////////// // // Dialog @@ -62,39 +51,6 @@ BEGIN PUSHBUTTON "Clear statistics",IDC_BUTTON_CLEAR,243,13,62,14 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_OPT_STATS, DIALOG - BEGIN - TOPMARGIN, 4 - BOTTOMMARGIN, 233 - END -END -#endif // APSTUDIO_INVOKED - -#endif // Russian (Russia) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_OPT_TRAFFIC_POPUPS DIALOG 0, 0, 313, 233 STYLE DS_SETFONT | WS_CHILD FONT 8, "MS Shell Dlg" @@ -145,6 +101,12 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN + IDD_OPT_STATS, DIALOG + BEGIN + TOPMARGIN, 4 + BOTTOMMARGIN, 233 + END + IDD_OPT_TRAFFIC, DIALOG BEGIN BOTTOMMARGIN, 233 @@ -166,60 +128,20 @@ END 2 TEXTINCLUDE BEGIN - "#include \r\n" "#include \r\n" - "#include ""..\\..\\Include\\statusmodes.h""\r\0" + "\0" END 3 TEXTINCLUDE BEGIN - "\r\0" + "\r\n" + "\0" END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - - -VS_VERSION_INFO VERSIONINFO - FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION __FILEVERSION_STRING - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "Comments", "Licensed under the terms of the GNU General Public License" - VALUE "CompanyName", " " - VALUE "FileDescription", "TrafficCounter" - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", "TrafficCounter" - VALUE "LegalCopyright", "© 2002-2006 Ghost, © 2007-2012 Mironych" - VALUE "OriginalFilename", "TrafficCounter.dll" - VALUE "ProductName", "TrafficCounter" - VALUE "ProductVersion", __VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END - -#endif // English (United States) resources +#endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index b2c6bce1c7..e51b61a644 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "m_skin_eng.h" -#include "m_tipper.h" /*-------------------------------------------------------------------------------------------------------------------*/ //GLOBAL @@ -28,7 +26,6 @@ uTCFLAGS unOptions; PROTOLIST *ProtoList; // Данные обо всех аккаунтах. PROTOLIST OverallInfo; // Суммарные данные по видимым аккаунтам. int NumberOfAccounts; -extern WORD Stat_SelAcc; HWND TrafficHwnd; HINSTANCE hInst; @@ -97,13 +94,13 @@ COLORREF KeyColor; PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - "Traffic Counter", - 0, // Начиная с версии ядра 0.92.1.0 поле с версией не используется. - "Adding traffic and time counters.", - "Ghost, Mironych", - "", - "© 2002-2006 Ghost, © 2007-2012 Mironych", - "", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, // {82181510-5DFA-49D7-B469-33871E2AE8B5} {0x82181510, 0x5dfa, 0x49d7, {0xb4, 0x69, 0x33, 0x87, 0x1e, 0x2a, 0xe8, 0xb5}} diff --git a/plugins/TrafficCounter/src/TrafficCounter.h b/plugins/TrafficCounter/src/TrafficCounter.h index ba474cf3e0..428a8376a6 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.h +++ b/plugins/TrafficCounter/src/TrafficCounter.h @@ -84,28 +84,60 @@ int PaintTrafficCounterWindow(HWND, HDC); INT_PTR MenuCommand_TrafficShowHide(WPARAM, LPARAM); void Traffic_AddMainMenuItem(void); -extern HINSTANCE hInst; +typedef struct +{ + BYTE Hour, Day, Month; + WORD Year; + DWORD Incoming, Outgoing; + WORD Time; +} HOURLYSTATS; + +typedef struct tagTimer +{ + DWORD TimeAtStart; // Время в момент запуска таймера - в миллисекундах. + DWORD Timer; // Количество секунд со времени запуска таймера. +} TIMER; + +typedef struct +{ + char *name; // Имя аккаунта. + + TIMER Session; // Таймер текущей сессии (протокол в онлайне). + TIMER Total; // Таймер общий. + + DWORD TotalRecvTraffic, // Общий трафик протокола (за выбранный период) + TotalSentTraffic, + CurrentRecvTraffic, // Текущий трафик протокола (за сессию) + CurrentSentTraffic; + union + { + BYTE Flags; + struct + { + unsigned int Reserv0:1; // Активность потеряла смысл - статистика ведётся по всем аккаунтам. + unsigned int Visible:1; // = 1 - аккаунт будет показываться во фрейме счётчиков + unsigned int Enabled:1; // = 1 - аккаунт включен и не прячется + unsigned int State:1; // = 1 - аккаунт сейчас онлайн + unsigned int Reserv1:3; + }; + }; + + // Добавлено в версии 0.1.1.0. + DWORD NumberOfRecords; // Количество часов в общей статистике. + HOURLYSTATS *AllStatistics; // Полная статистика вместе со статистикой онлайна. + HANDLE hFile; // Файл с сохранённой статистикой данного протокола. + + DWORD StartIndex; // Номер записи в статистике, бывший актуальным на момент запуска. + DWORD StartIncoming; // Значение входящего трафика на момент запуска. + DWORD StartOutgoing; // Значение исходящего трафика на момент запуска. + + // 0.1.1.5. + DWORD Shift; // Номер записи в статистике старейшего выбранного аккаунта, + // дата которой соответствует началу статистики данного аккаунта. + + // 0.1.1.6 + TCHAR *tszAccountName; // Человеческое имя аккаунта для использования в графическом интерфейсе. +} PROTOLIST; -extern HWND TrafficHwnd; -extern PROTOLIST *ProtoList; -extern uTCFLAGS unOptions; - -extern int Traffic_PopupBkColor; -extern int Traffic_PopupFontColor; -extern char Traffic_Notify_time_value; -extern int Traffic_Notify_size_value; -extern char Traffic_PopupTimeoutDefault; -extern char Traffic_PopupTimeoutValue; -extern char Traffic_AdditionSpace; - -extern TCHAR Traffic_CounterFormat[512]; -extern TCHAR Traffic_TooltipFormat[512]; - -extern BOOL bPopupExists, bVariablesExists, bTooltipExists; - -extern BOOL UseKeyColor; -extern COLORREF KeyColor; - -extern HGENMENU hTrafficMainMenuItem; #endif; diff --git a/plugins/TrafficCounter/src/commonheaders.h b/plugins/TrafficCounter/src/commonheaders.h index 6b8a521308..b0bf5ac8be 100644 --- a/plugins/TrafficCounter/src/commonheaders.h +++ b/plugins/TrafficCounter/src/commonheaders.h @@ -20,97 +20,37 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _WIN64 - #define _USE_32BIT_TIME_T -#endif +#define _CRT_SECURE_NO_WARNINGS -// Standart includes #include #include #include -#include -#include #include - -#include "resource.h" - -// Miranda SDK includes #include -#include #include #include -#include -//#include #include #include #include -#include #include #include #include #include #include #include -#include - -#pragma pack(push) -#pragma pack(1) -typedef struct -{ - BYTE Hour, Day, Month; - WORD Year; - DWORD Incoming, Outgoing; - WORD Time; -} HOURLYSTATS; -#pragma pack(pop) - -typedef struct tagTimer -{ - DWORD TimeAtStart; // Время в момент запуска таймера - в миллисекундах. - DWORD Timer; // Количество секунд со времени запуска таймера. -} TIMER; - -typedef struct -{ - char *name; // Имя аккаунта. - - TIMER Session; // Таймер текущей сессии (протокол в онлайне). - TIMER Total; // Таймер общий. - - DWORD TotalRecvTraffic, // Общий трафик протокола (за выбранный период) - TotalSentTraffic, - CurrentRecvTraffic, // Текущий трафик протокола (за сессию) - CurrentSentTraffic; - union - { - BYTE Flags; - struct - { - unsigned int Reserv0:1; // Активность потеряла смысл - статистика ведётся по всем аккаунтам. - unsigned int Visible:1; // = 1 - аккаунт будет показываться во фрейме счётчиков - unsigned int Enabled:1; // = 1 - аккаунт включен и не прячется - unsigned int State:1; // = 1 - аккаунт сейчас онлайн - unsigned int Reserv1:3; - }; - }; - // Добавлено в версии 0.1.1.0. - DWORD NumberOfRecords; // Количество часов в общей статистике. - HOURLYSTATS *AllStatistics; // Полная статистика вместе со статистикой онлайна. - HANDLE hFile; // Файл с сохранённой статистикой данного протокола. - - DWORD StartIndex; // Номер записи в статистике, бывший актуальным на момент запуска. - DWORD StartIncoming; // Значение входящего трафика на момент запуска. - DWORD StartOutgoing; // Значение исходящего трафика на момент запуска. - - // 0.1.1.5. - DWORD Shift; // Номер записи в статистике старейшего выбранного аккаунта, - // дата которой соответствует началу статистики данного аккаунта. +#include +#include +#include - // 0.1.1.6 - TCHAR *tszAccountName; // Человеческое имя аккаунта для использования в графическом интерфейсе. -} PROTOLIST; +#include "resource.h" +#include "version.h" +#include "misc.h" +#include "opttree.h" +#include "vars.h" +#include "statistics.h" +#include "TrafficCounter.h" //--------------------------------------------------------------------------------------------- // Различные флаги @@ -143,10 +83,32 @@ typedef union }; } uTCFLAGS; -#include "misc.h" -#include "opttree.h" -#include "vars.h" -#include "statistics.h" -#include "TrafficCounter.h" +extern HINSTANCE hInst; + +extern HWND TrafficHwnd; +extern PROTOLIST *ProtoList; +extern uTCFLAGS unOptions; + +extern int Traffic_PopupBkColor; +extern int Traffic_PopupFontColor; +extern char Traffic_Notify_time_value; +extern int Traffic_Notify_size_value; +extern char Traffic_PopupTimeoutDefault; +extern char Traffic_PopupTimeoutValue; +extern char Traffic_AdditionSpace; + +extern TCHAR Traffic_CounterFormat[512]; +extern TCHAR Traffic_TooltipFormat[512]; + +extern BOOL bPopupExists, bVariablesExists, bTooltipExists; + +extern BOOL UseKeyColor; +extern COLORREF KeyColor; + +extern HGENMENU hTrafficMainMenuItem; + +extern WORD Stat_SelAcc; +extern OPTTREE_OPTION *pOptions; // Объявлено в модуле TrafficCounter.c. +extern PROTOLIST OverallInfo; #endif diff --git a/plugins/TrafficCounter/src/opttree.cpp b/plugins/TrafficCounter/src/opttree.cpp index 05502ee78e..e2b5569f62 100644 --- a/plugins/TrafficCounter/src/opttree.cpp +++ b/plugins/TrafficCounter/src/opttree.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. HTREEITEM OptTree_FindNamedTreeItemAt(HWND hwndTree, HTREEITEM hItem, const TCHAR *name); HTREEITEM OptTree_AddItem(HWND hwndTree, TCHAR *name, LPARAM lParam, int iconIndex); -extern OPTTREE_OPTION *pOptions; // Объявлено в модуле TrafficCounter.c. static void OptTree_TranslateItem(HWND hwndTree, HTREEITEM hItem) { diff --git a/plugins/TrafficCounter/src/statistics.cpp b/plugins/TrafficCounter/src/statistics.cpp index a0c46ea118..a2f555cdd3 100644 --- a/plugins/TrafficCounter/src/statistics.cpp +++ b/plugins/TrafficCounter/src/statistics.cpp @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. =======================================================================================*/ #include "commonheaders.h" -#include WORD Stat_SelAcc; // Выбранные аккаунты в окне статистики diff --git a/plugins/TrafficCounter/src/vars.cpp b/plugins/TrafficCounter/src/vars.cpp index d74ac6e59d..613be1f438 100644 --- a/plugins/TrafficCounter/src/vars.cpp +++ b/plugins/TrafficCounter/src/vars.cpp @@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h" -extern PROTOLIST *ProtoList; -extern PROTOLIST OverallInfo; - static TCHAR* GetTraffic(ARGUMENTSINFO *ai) { DWORD tmp, tmpsn = 0, tmprn = 0, tmpst = 0, tmprt = 0; diff --git a/plugins/TrafficCounter/src/version.h b/plugins/TrafficCounter/src/version.h index d90dc2ec3e..8f2c9ccc21 100644 --- a/plugins/TrafficCounter/src/version.h +++ b/plugins/TrafficCounter/src/version.h @@ -1,3 +1,14 @@ -#define __FILEVERSION_STRING 0,1,1,8 -#define __VERSION_STRING "0.1.1.8" -#define __VERSION_DWORD 0x00010108 +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 1 +#define __RELEASE_NUM 1 +#define __BUILD_NUM 8 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Traffic counter" +#define __FILENAME "TrafficCounter.dll" +#define __DESCRIPTION "Adding traffic and time counters." +#define __AUTHOR "Ghost, Mironych" +#define __AUTHOREMAIL "" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2002-2006 Ghost, 2007-2012 Mironych" -- cgit v1.2.3