From 0163c525a2dc607a0b7a0a9242a4091e0201a065 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 20 Sep 2012 20:02:58 +0000 Subject: TrafficCounter: project fix git-svn-id: http://svn.miranda-ng.org/main/trunk@1613 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TrafficCounter/TrafficCounter_10.vcxproj | 360 ++++++++--------------- plugins/TrafficCounter/commonheaders.h | 5 +- plugins/TrafficCounter/statistics.c | 4 +- 3 files changed, 133 insertions(+), 236 deletions(-) (limited to 'plugins') diff --git a/plugins/TrafficCounter/TrafficCounter_10.vcxproj b/plugins/TrafficCounter/TrafficCounter_10.vcxproj index fbbab8aa4d..61930337e1 100644 --- a/plugins/TrafficCounter/TrafficCounter_10.vcxproj +++ b/plugins/TrafficCounter/TrafficCounter_10.vcxproj @@ -1,66 +1,14 @@ п»ї - - Debug Unicode - Win32 - - - Debug Unicode - Win32 - - - Debug Unicode - x64 - - - Debug Unicode - x64 - Debug Win32 - - Debug - Win32 - - - Debug - x64 - Debug x64 - - Release Unicode Static - Win32 - - - Release Unicode Static - x64 - - - Release Unicode - Win32 - - - Release Unicode - Win32 - - - Release Unicode - x64 - - - Release Unicode - x64 - - - Release - Win32 - Release Win32 @@ -69,10 +17,6 @@ Release x64 - - Release - x64 - TrafficCounter @@ -81,28 +25,12 @@ - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - - DynamicLibrary false Unicode false - - DynamicLibrary - false - Unicode - true - - + DynamicLibrary false Unicode @@ -123,12 +51,23 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode true + + DynamicLibrary + false + Unicode + true + DynamicLibrary false @@ -144,22 +83,13 @@ <_ProjectFileVersion>10.0.20506.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true - true - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - true - true + true + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + true $(SolutionDir)$(Configuration)64/Plugins\ $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ true @@ -167,67 +97,28 @@ $(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) - ..\..\..\..\VC\atlmfc\include;$(IncludePath) - ..\..\..\..\VC\atlmfc\include;$(IncludePath) ..\..\..\..\VC\atlmfc\include;$(IncludePath) - true + ..\..\..\..\VC\atlmfc\include;$(IncludePath) + true + true + true + false + false - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/TrafficCounter.tlb - - - - - Full - OnlyExplicitInline - Size - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - commonheaders.h - Level3 - true - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;comctl32.lib;%(AdditionalDependencies) - true - true - true - true - UseLinkTimeCodeGeneration - false - - - $(IntDir)$(TargetName).lib - MachineX86 - false - - - - _DEBUG;%(PreprocessorDefinitions) @@ -240,53 +131,10 @@ Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - commonheaders.h - Level3 - true - EditAndContinue - CompileAsC - 4996;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Msimg32.lib;comctl32.lib;%(AdditionalDependencies) - true - true - false - - - $(IntDir)$(TargetName).lib - MachineX86 - false - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/TrafficCounter.tlb - - - - - Disabled - ../../include;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) false - - + EnableFastChecks MultiThreadedDebugDLL commonheaders.h true @@ -299,6 +147,9 @@ _DEBUG;%(PreprocessorDefinitions) 0x0409 + + + ..\..\include\msapi Msimg32.lib;comctl32.lib;%(AdditionalDependencies) @@ -312,13 +163,11 @@ $(IntDir)$(TargetName).lib MachineX86 $(IntDir)$(TargetName)$(TargetExt).intermediate.manifest + $(SolutionDir)\lib - - - - + - + NDEBUG;%(PreprocessorDefinitions) true @@ -333,7 +182,7 @@ OnlyExplicitInline Size true - ../../include;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -348,6 +197,9 @@ NDEBUG;%(PreprocessorDefinitions) 0x0409 + + + ..\..\include\msapi Msimg32.lib;comctl32.lib;%(AdditionalDependencies) @@ -362,14 +214,15 @@ $(IntDir)$(TargetName).lib MachineX86 $(IntDir)$(TargetName)$(TargetExt).intermediate.manifest + $(SolutionDir)\lib - + NDEBUG;%(PreprocessorDefinitions) true true - Win32 + X64 .\Release/TrafficCounter.tlb @@ -382,22 +235,20 @@ ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true commonheaders.h Level3 true - ProgramDatabase 4996;%(DisableSpecificWarnings) - NotSet NDEBUG;%(PreprocessorDefinitions) 0x0409 - Msimg32.lib;comctl32.lib;%(AdditionalDependencies) - false + Msimg32.lib;%(AdditionalDependencies) + true true true true @@ -406,46 +257,41 @@ $(IntDir)$(TargetName).lib - MachineX86 - $(IntDir)$(TargetName)$(TargetExt).intermediate.manifest + MachineX64 - + - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true true X64 - .\Release/TrafficCounter.tlb + .\Debug/TrafficCounter.tlb - Full - OnlyExplicitInline - Size - true + Disabled ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true + WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL commonheaders.h Level3 true + ProgramDatabase + CompileAsC 4996;%(DisableSpecificWarnings) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 Msimg32.lib;%(AdditionalDependencies) true true - true - true - UseLinkTimeCodeGeneration false @@ -453,7 +299,7 @@ MachineX64 - + _DEBUG;%(PreprocessorDefinitions) true @@ -492,7 +338,7 @@ MachineX64 - + _DEBUG;%(PreprocessorDefinitions) true @@ -504,8 +350,8 @@ Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -519,9 +365,12 @@ _DEBUG;%(PreprocessorDefinitions) 0x0409 + + + ..\..\include\msapi - Msimg32.lib;%(AdditionalDependencies) + Msimg32.lib;comctl32.lib;%(AdditionalDependencies) true true false @@ -529,6 +378,7 @@ $(IntDir)$(TargetName).lib MachineX64 + $(SolutionDir)\lib @@ -574,6 +424,52 @@ MachineX64 + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/TrafficCounter.tlb + + + + + Full + OnlyExplicitInline + Size + true + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;TRAFFICCOUNTER_EXPORTS;%(PreprocessorDefinitions) + true + true + commonheaders.h + Level3 + true + ProgramDatabase + 4996;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\include\msapi + + + Msimg32.lib;comctl32.lib;%(AdditionalDependencies) + true + true + true + UseLinkTimeCodeGeneration + false + + + $(IntDir)$(TargetName).lib + MachineX64 + $(SolutionDir)\lib + + NDEBUG;%(PreprocessorDefinitions) @@ -619,40 +515,38 @@ - All - Default + All + Default - All + All - All + All - %(PreprocessorDefinitions) - Create %(PreprocessorDefinitions) Create - %(PreprocessorDefinitions) - Create - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create + %(PreprocessorDefinitions) + Create %(PreprocessorDefinitions) Create %(PreprocessorDefinitions) Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) Create + Create Create - All + All - All + All diff --git a/plugins/TrafficCounter/commonheaders.h b/plugins/TrafficCounter/commonheaders.h index 8939a53249..dee13d20c7 100644 --- a/plugins/TrafficCounter/commonheaders.h +++ b/plugins/TrafficCounter/commonheaders.h @@ -22,7 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MIRANDA_VER 0x0900 #define MIRANDA_CUSTOM_LP -#define _USE_32BIT_TIME_T 1 + +#ifndef _WIN64 + #define _USE_32BIT_TIME_T +#endif // Standart includes #include diff --git a/plugins/TrafficCounter/statistics.c b/plugins/TrafficCounter/statistics.c index e202edd3fd..b79ecfd9e2 100644 --- a/plugins/TrafficCounter/statistics.c +++ b/plugins/TrafficCounter/statistics.c @@ -277,7 +277,7 @@ BOOL CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM switch (lplvcd->nmcd.dwDrawStage) { case CDDS_PREPAINT: // Перед началом рисования всего ListView. - SetWindowLong(hwndDlg, DWL_MSGRESULT, CDRF_NOTIFYITEMDRAW); + SetWindowLong(hwndDlg, DWLP_MSGRESULT, CDRF_NOTIFYITEMDRAW); return TRUE; case CDDS_ITEMPREPAINT: // Перед началом рисования строки. { @@ -295,7 +295,7 @@ BOOL CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM b += b > 0x80 ? -40 : 40; lplvcd->clrTextBk = RGB(r, g, b);; } - SetWindowLong(hwndDlg, DWL_MSGRESULT, CDRF_NEWFONT); + SetWindowLong(hwndDlg, DWLP_MSGRESULT, CDRF_NEWFONT); return TRUE; } } -- cgit v1.2.3