diff --git a/Application/Application.cpp b/Application/Application.cpp index 77183e14..db16c5d8 100644 --- a/Application/Application.cpp +++ b/Application/Application.cpp @@ -15,39 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Application/Application.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Application.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.8 2004/06/05 10:50:40 rainy - Fixed exports. - - Revision 1.7 2002/07/01 15:22:29 rainy - The existance of Litestep is not checked anymore. - - Revision 1.6 2002/05/04 08:08:47 rainy - !Bangs can be executed from the exe. - - Revision 1.5 2002/03/31 09:50:56 rainy - Added some comments - - Revision 1.4 2002/01/16 16:03:52 rainy - The quotes are removed from the commandline. - - Revision 1.3 2001/09/01 12:55:42 rainy - Added RainmeterRefresh declaration. - - Revision 1.2 2001/08/25 17:04:45 rainy - Removed all Tray stuff. - The correct instance is now given to the DLL. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable : 4996) @@ -104,7 +71,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPCTSTR lpCm int Pos = 0; if(lpCmdLine) { - for(int i = 0; i <= wcslen(lpCmdLine); i++) + for(size_t i = 0; i <= wcslen(lpCmdLine); i++) { if(lpCmdLine[i] != L'\"') Path[Pos++] = lpCmdLine[i]; } diff --git a/Application/Application.vcproj b/Application/Application.vcproj index e232ca19..d7f7de15 100644 --- a/Application/Application.vcproj +++ b/Application/Application.vcproj @@ -117,7 +117,9 @@ TypeLibraryName=".\x32/Debug/Application.tlb" HeaderFileName=""/> + Name="VCPostBuildEventTool" + CommandLine="if not exist ..\testbench\x32\debug\skins (mkdir ..\testbench\x32\debug\skins) +xcopy /S /Y ..\Install\Skins ..\testbench\x32\debug\skins"/> + Name="VCPostBuildEventTool" + CommandLine="if not exist ..\testbench\x32\release\skins (mkdir ..\testbench\x32\release\skins) +xcopy /S /Y ..\Install\Skins ..\testbench\x32\release\skins"/> - - diff --git a/Library/AboutDialog.cpp b/Library/AboutDialog.cpp index 0ed8779d..e9e2d355 100644 --- a/Library/AboutDialog.cpp +++ b/Library/AboutDialog.cpp @@ -15,32 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/AboutDialog.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: AboutDialog.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.6 2004/08/13 15:43:19 rainy - Added update check. - - Revision 1.5 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.4 2004/03/13 16:13:50 rainy - Added support for multiple configs. - - Revision 1.3 2003/12/05 15:50:09 Rainy - Multi-instance changes. - - Revision 1.2 2002/12/23 14:26:33 rainy - Made the dialog resizable. - - Revision 1.1 2002/07/01 15:35:55 rainy - Intial version - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Library/AboutDialog.h b/Library/AboutDialog.h index 8cf7364b..f3e850f5 100644 --- a/Library/AboutDialog.h +++ b/Library/AboutDialog.h @@ -15,20 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/AboutDialog.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: AboutDialog.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.2 2004/03/13 16:13:50 rainy - Added support for multiple configs. - - Revision 1.1 2002/07/01 15:35:54 rainy - Intial version - -*/ #ifndef _ABOUTDIALOG_H_ #define _ABOUTDIALOG_H_ diff --git a/Library/ConfigParser.cpp b/Library/ConfigParser.cpp index e8f57f19..e317cbea 100644 --- a/Library/ConfigParser.cpp +++ b/Library/ConfigParser.cpp @@ -15,17 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/ConfigParser.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: ConfigParser.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.1 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Library/ConfigParser.h b/Library/ConfigParser.h index 05c470c5..c3bb68f7 100644 --- a/Library/ConfigParser.h +++ b/Library/ConfigParser.h @@ -15,17 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/ConfigParser.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: ConfigParser.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.1 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - -*/ #ifndef __CONFIGPARSER_H__ #define __CONFIGPARSER_H__ diff --git a/Library/Error.cpp b/Library/Error.cpp index 5ae30e19..a27c26a5 100644 --- a/Library/Error.cpp +++ b/Library/Error.cpp @@ -15,23 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Error.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: Error.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.3 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.2 2001/10/14 07:30:04 rainy - Changed from a static storage to a real class. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "Error.h" diff --git a/Library/Error.h b/Library/Error.h index ed5f3f66..15c58a16 100644 --- a/Library/Error.h +++ b/Library/Error.h @@ -15,23 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Error.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Error.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.3 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.2 2001/10/14 07:30:04 rainy - Changed from a static storage to a real class. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __ERROR_H__ #define __ERROR_H__ diff --git a/Library/Export.h b/Library/Export.h index 3a48b530..6e870aa3 100644 --- a/Library/Export.h +++ b/Library/Export.h @@ -15,17 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Export.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Export.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.1 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - -*/ #ifndef __EXPORT_H__ #define __EXPORT_H__ diff --git a/Library/Litestep.cpp b/Library/Litestep.cpp index 38726dd0..a457e938 100644 --- a/Library/Litestep.cpp +++ b/Library/Litestep.cpp @@ -15,38 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Litestep.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: Litestep.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.4 2004/07/11 17:10:01 rainy - Added ResetLoggingFlag. - - Revision 1.3 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.6 2004/01/28 18:05:29 rainy - Todo is shown/hidden with OK. - - Revision 1.5 2003/12/20 22:16:06 rainy - Added DebugLog - - Revision 1.4 2002/09/08 14:14:54 rainy - The name of the log file is the same as the module's name. - - Revision 1.3 2002/09/06 21:44:51 rainy - Added logging functions. - - Revision 1.2 2002/08/24 11:10:07 rainy - Added support for logging. - - Revision 1.1 2002/05/30 18:27:42 rainy - Initial version - -*/ #pragma warning(disable: 4996) #include "Litestep.h" diff --git a/Library/Litestep.h b/Library/Litestep.h index 353eb2b4..ca1d43ec 100644 --- a/Library/Litestep.h +++ b/Library/Litestep.h @@ -15,29 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Litestep.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Litestep.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.5 2004/07/11 17:10:01 rainy - Added ResetLoggingFlag. - - Revision 1.4 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.3 2003/03/22 20:39:20 rainy - LsLog is exported. - - Revision 1.2 2003/02/10 18:12:17 rainy - Added LSLog and LSSetVariable - - Revision 1.1 2002/07/01 15:35:54 rainy - Intial version - -*/ #ifndef __LITESTEP_H__ #define __LITESTEP_H__ diff --git a/Library/Measure.cpp b/Library/Measure.cpp index fbc54c4b..47b59f56 100644 --- a/Library/Measure.cpp +++ b/Library/Measure.cpp @@ -15,77 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Measure.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Measure.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.19 2004/07/11 17:14:20 rainy - Fixed string generation when num of decimals is 0. - - Revision 1.18 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.17 2004/03/13 16:15:01 rainy - GetStats returns only the value - - Revision 1.16 2003/12/05 15:50:09 Rainy - Multi-instance changes. - - Revision 1.15 2003/02/10 18:13:49 rainy - Added median filter to max value. - - Revision 1.14 2002/12/23 14:26:21 rainy - Stats are gathered a bit different way now. - - Revision 1.13 2002/05/05 10:49:16 rainy - Disabled measures return 0. - - Revision 1.12 2002/05/04 08:12:33 rainy - Measure update is not tied to the update rate directly anymore. - - Revision 1.11 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.10 2002/04/01 15:39:09 rainy - Fixed IfBelow and IfAbove actions. - Added NetTotal measure. - - Revision 1.9 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.8 2001/12/23 10:18:52 rainy - Added Time and removed Perfmon. - - Revision 1.7 2001/10/28 10:23:59 rainy - GetStringValue uses consts. - Added IfAbove/Below actions. - Added Plugin and Registry Measures. - - Revision 1.6 2001/10/14 07:32:03 rainy - Minor monifications to remove few warnings with VC.NET. - In error situations CError is thrown instead just a boolean value. - - Revision 1.5 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 13:00:41 rainy - Slight changes in the interface. The value is now measured only once if possible. - Added support for logging the max value. - - Revision 1.3 2001/08/19 09:15:41 rainy - Invert was moved here from the meter. - - Revision 1.2 2001/08/12 15:47:00 Rainy - Adjusted Update()'s interface. - Added GetStringValue() method. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) @@ -201,7 +130,7 @@ const WCHAR* CMeasure::CheckSubstitute(const WCHAR* buffer) { str = buffer; - for (int i = 0; i < m_Substitute.size(); i = i + 2) + for (size_t i = 0; i < m_Substitute.size(); i = i + 2) { if (str.empty() && m_Substitute[i].empty()) { @@ -452,7 +381,7 @@ bool CMeasure::PostUpdate() // Calculate the average value m_Value = 0; - for (int i = 0; i < m_AverageValues.size(); i++) + for (size_t i = 0; i < m_AverageValues.size(); i++) { m_Value += m_AverageValues[i]; } diff --git a/Library/Measure.h b/Library/Measure.h index bdb10082..7ddcf462 100644 --- a/Library/Measure.h +++ b/Library/Measure.h @@ -15,57 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Measure.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Measure.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.13 2004/07/11 17:14:20 rainy - Fixed string generation when num of decimals is 0. - - Revision 1.12 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.11 2003/02/10 18:13:49 rainy - Added median filter to max value. - - Revision 1.10 2002/12/23 14:26:21 rainy - Stats are gathered a bit different way now. - - Revision 1.9 2002/05/04 08:12:32 rainy - Measure update is not tied to the update rate directly anymore. - - Revision 1.8 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.7 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.6 2001/10/28 10:24:06 rainy - GetStringValue uses consts. - Added IfAbove/Below actions. - Added Plugin and Registry Measures. - - Revision 1.5 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 13:00:41 rainy - Slight changes in the interface. The value is now measured only once if possible. - Added support for logging the max value. - - Revision 1.3 2001/08/19 09:15:41 rainy - Invert was moved here from the meter. - - Revision 1.2 2001/08/12 15:47:00 Rainy - Adjusted Update()'s interface. - Added GetStringValue() method. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __MEASURE_H__ #define __MEASURE_H__ diff --git a/Library/MeasureCPU.cpp b/Library/MeasureCPU.cpp index 4aeecac7..40e43a69 100644 --- a/Library/MeasureCPU.cpp +++ b/Library/MeasureCPU.cpp @@ -15,45 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureCPU.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureCPU.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.10 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.9 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.8 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.7 2002/01/16 16:07:00 rainy - Fixed a bug with the CPU meter in 9x. - - Revision 1.6 2001/10/28 10:22:49 rainy - Changed the IsNT() function return value check - - Revision 1.5 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.3 2001/08/19 09:15:21 rainy - Added support for value invert. - - Revision 1.2 2001/08/12 15:46:34 Rainy - Adjusted Update()'s interface. - Fixed a bug that prevent more than one CPU meter. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "MeasureCPU.h" @@ -156,7 +118,7 @@ bool CMeasureCPU::Update() if (status != NO_ERROR) return false; // get new CPU's idle time - status = m_NtQuerySystemInformation(SystemPerformanceInformation,&m_SysPerfInfo,sizeof(m_SysPerfInfo),NULL); + status = m_NtQuerySystemInformation(SystemPerformanceInformation, &m_SysPerfInfo, sizeof(m_SysPerfInfo),NULL); if (status != NO_ERROR) return false; // if it's a first call - skip it diff --git a/Library/MeasureCPU.h b/Library/MeasureCPU.h index d026a606..7389dc93 100644 --- a/Library/MeasureCPU.h +++ b/Library/MeasureCPU.h @@ -15,59 +15,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureCPU.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureCPU.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.7 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.6 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.5 2002/01/16 16:07:00 rainy - Fixed a bug with the CPU meter in 9x. - - Revision 1.4 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.3 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.2 2001/08/12 15:46:33 Rainy - Adjusted Update()'s interface. - Fixed a bug that prevent more than one CPU meter. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __MEASURECPU_H__ #define __MEASURECPU_H__ #include "Measure.h" -typedef struct -{ - DWORD dwUnknown1; - ULONG uKeMaximumIncrement; - ULONG uPageSize; - ULONG uMmNumberOfPhysicalPages; - ULONG uMmLowestPhysicalPage; - ULONG uMmHighestPhysicalPage; - ULONG uAllocationGranularity; - PVOID pLowestUserAddress; - PVOID pMmHighestUserAddress; - ULONG uKeActiveProcessors; - BYTE bKeNumberProcessors; - BYTE bUnknown2; - WORD wUnknown3; -} SYSTEM_BASIC_INFORMATION; - typedef struct { LARGE_INTEGER liIdleTime; diff --git a/Library/MeasureCalc.cpp b/Library/MeasureCalc.cpp index 4724459f..cfdfecd9 100644 --- a/Library/MeasureCalc.cpp +++ b/Library/MeasureCalc.cpp @@ -15,20 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureCalc.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureCalc.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.2 2004/07/11 17:14:39 rainy - MeterWindow holds the counter now. - - Revision 1.1 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - -*/ #pragma warning(disable: 4996) diff --git a/Library/MeasureCalc.h b/Library/MeasureCalc.h index f1336eea..5208f435 100644 --- a/Library/MeasureCalc.h +++ b/Library/MeasureCalc.h @@ -15,17 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureCalc.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureCalc.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.1 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - -*/ #ifndef __MEASURECALC_H__ #define __MEASURECALC_H__ diff --git a/Library/MeasureDiskSpace.cpp b/Library/MeasureDiskSpace.cpp index c484b29b..6765b42f 100644 --- a/Library/MeasureDiskSpace.cpp +++ b/Library/MeasureDiskSpace.cpp @@ -15,49 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureDiskSpace.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureDiskSpace.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.11 2004/07/11 17:15:06 rainy - Also removable drives are ignored. - - Revision 1.10 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.9 2004/03/13 16:16:12 rainy - CDROMs are ignored - - Revision 1.8 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.7 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.6 2001/10/28 10:22:20 rainy - GetStringValue uses consts. - - Revision 1.5 2001/10/14 07:31:03 rainy - Minor monifications to remove few warnings with VC.NET - - Revision 1.4 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.3 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.2 2001/08/19 09:15:08 rainy - Added support for value invert. - Also the CMeasure's ReadConfig is executed. - - Revision 1.1 2001/08/12 15:35:08 Rainy - Inital Version - - -*/ #pragma warning(disable: 4996) #include "MeasureDiskSpace.h" diff --git a/Library/MeasureDiskSpace.h b/Library/MeasureDiskSpace.h index 183ec05f..bd4c55db 100644 --- a/Library/MeasureDiskSpace.h +++ b/Library/MeasureDiskSpace.h @@ -15,36 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureDiskSpace.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureDiskSpace.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.7 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.6 2004/03/13 16:16:12 rainy - CDROMs are ignored - - Revision 1.5 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.4 2001/10/28 10:22:20 rainy - GetStringValue uses consts. - - Revision 1.3 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.2 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.1 2001/08/12 15:35:08 Rainy - Inital Version - - -*/ #ifndef __MEASUREDISKSPACE_H__ #define __MEASUREDISKSPACE_H__ diff --git a/Library/MeasureMemory.cpp b/Library/MeasureMemory.cpp index 54ed37ae..3a15eb38 100644 --- a/Library/MeasureMemory.cpp +++ b/Library/MeasureMemory.cpp @@ -15,38 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureMemory.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureMemory.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.8 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.7 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.6 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.5 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.3 2001/08/19 09:15:21 rainy - Added support for value invert. - - Revision 1.2 2001/08/12 15:45:45 Rainy - Adjusted Update()'s interface. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "MeasureMemory.h" diff --git a/Library/MeasureMemory.h b/Library/MeasureMemory.h index d179c7fc..38fec8be 100644 --- a/Library/MeasureMemory.h +++ b/Library/MeasureMemory.h @@ -15,32 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureMemory.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureMemory.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.6 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.5 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.4 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.3 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.2 2001/08/12 15:45:45 Rainy - Adjusted Update()'s interface. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __MEASUREMEMORY_H__ #define __MEASUREMEMORY_H__ diff --git a/Library/MeasureNet.cpp b/Library/MeasureNet.cpp index 709c5f1d..de4d060d 100644 --- a/Library/MeasureNet.cpp +++ b/Library/MeasureNet.cpp @@ -15,45 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureNet.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureNet.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.10 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.9 2003/12/05 15:50:09 Rainy - Multi-instance changes. - - Revision 1.8 2003/02/10 18:13:34 rainy - Changed the way stats are gathered. - - Revision 1.7 2002/12/23 14:26:07 rainy - Added cumulative statistics measuring. - - Revision 1.6 2002/07/01 15:34:23 rainy - Now it is possible to select the NIC. - - Revision 1.5 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.4 2002/04/01 15:38:25 rainy - Some on the implementation from NetIn/Out is moved here. - Added TrafficAction and TrafficValue. - - Revision 1.3 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.2 2001/08/12 15:45:34 Rainy - Changed UpdateTable() to be a class method. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "MeasureNet.h" @@ -237,7 +199,7 @@ LARGE_INTEGER CMeasureNet::GetNetStatsValue(NET net) if (m_Interface == 0) { // Get all interfaces - for(int i = 0; i < c_StatValues.size() / 2; i++) + for(size_t i = 0; i < c_StatValues.size() / 2; i++) { switch (net) { @@ -395,7 +357,7 @@ void CMeasureNet::ResetStats() { if (c_Table) { - for (int i = 0; i < c_StatValues.size(); i++) + for (size_t i = 0; i < c_StatValues.size(); i++) { LARGE_INTEGER value; value.QuadPart = 0; @@ -449,7 +411,7 @@ void CMeasureNet::WriteStats(const std::wstring& iniFile) wsprintf(buffer, L"%i", c_StatValues.size() / 2); WritePrivateProfileString(L"Statistics", L"NetStatsCount", buffer, iniFile.c_str()); - for (int i = 0; i < c_StatValues.size() / 2; i++) + for (size_t i = 0; i < c_StatValues.size() / 2; i++) { wsprintf(buffer2, L"NetStatsInHigh%i", i + 1); wsprintf(buffer, L"%u", c_StatValues[i * 2].HighPart); diff --git a/Library/MeasureNet.h b/Library/MeasureNet.h index 5b604e0a..7ed1053e 100644 --- a/Library/MeasureNet.h +++ b/Library/MeasureNet.h @@ -15,39 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureNet.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureNet.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.8 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.7 2003/02/10 18:13:34 rainy - Changed the way stats are gathered. - - Revision 1.6 2002/12/23 14:26:07 rainy - Added cumulative statistics measuring. - - Revision 1.5 2002/07/01 15:34:23 rainy - Now it is possible to select the NIC. - - Revision 1.4 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.3 2002/04/01 15:38:25 rainy - Some on the implementation from NetIn/Out is moved here. - Added TrafficAction and TrafficValue. - - Revision 1.2 2001/08/12 15:45:34 Rainy - Changed UpdateTable() to be a class method. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __MEASURENET_H__ #define __MEASURENET_H__ diff --git a/Library/MeasureNetIn.cpp b/Library/MeasureNetIn.cpp index 362d5e5d..5a875d07 100644 --- a/Library/MeasureNetIn.cpp +++ b/Library/MeasureNetIn.cpp @@ -15,64 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureNetIn.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureNetIn.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.16 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.15 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.14 2003/02/10 18:13:34 rainy - Changed the way stats are gathered. - - Revision 1.13 2002/12/23 14:26:07 rainy - Added cumulative statistics measuring. - - Revision 1.12 2002/07/01 15:34:39 rainy - The measuring is done in the base class. - - Revision 1.11 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.10 2002/04/01 15:37:25 rainy - Moved part of the implementation to the base class. - - Revision 1.9 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.8 2001/12/23 10:17:56 rainy - The firstTime is now a member variable. - - Revision 1.7 2001/10/28 10:21:58 rainy - Changes in the GetStat() - - Revision 1.6 2001/10/14 07:29:39 rainy - Minor monifications to remove few warnings with VC.NET - - Revision 1.5 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.3 2001/08/19 09:14:55 rainy - Added support for value invert. - Also the CMeasure's ReadConfig is executed. - - Revision 1.2 2001/08/12 15:44:49 Rainy - Adjusted Update()'s interface. - Net throughput is now measured in bytes per second and not bits. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "MeasureNetIn.h" diff --git a/Library/MeasureNetIn.h b/Library/MeasureNetIn.h index e6bd3edd..8f4aee6c 100644 --- a/Library/MeasureNetIn.h +++ b/Library/MeasureNetIn.h @@ -15,45 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureNetIn.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureNetIn.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.10 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.9 2003/02/10 18:13:34 rainy - Changed the way stats are gathered. - - Revision 1.8 2002/12/23 14:26:07 rainy - Added cumulative statistics measuring. - - Revision 1.7 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.6 2002/04/01 15:37:25 rainy - Moved part of the implementation to the base class. - - Revision 1.5 2001/12/23 10:17:56 rainy - The firstTime is now a member variable. - - Revision 1.4 2001/09/26 16:27:15 rainy - Changed the interfaces a bit. - - Revision 1.3 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.2 2001/08/12 15:44:49 Rainy - Adjusted Update()'s interface. - Net throughput is now measured in bytes per second and not bits. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __METERNET_H__ #define __METERNET_H__ diff --git a/Library/MeasureNetOut.cpp b/Library/MeasureNetOut.cpp index dc209bfd..cfb713e9 100644 --- a/Library/MeasureNetOut.cpp +++ b/Library/MeasureNetOut.cpp @@ -15,64 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureNetOut.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureNetOut.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.16 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.15 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.14 2003/02/10 18:13:34 rainy - Changed the way stats are gathered. - - Revision 1.13 2002/12/23 14:26:07 rainy - Added cumulative statistics measuring. - - Revision 1.12 2002/07/01 15:34:39 rainy - The measuring is done in the base class. - - Revision 1.11 2002/04/26 18:24:16 rainy - Modified the Update method to support disabled measures. - - Revision 1.10 2002/04/01 15:37:25 rainy - Moved part of the implementation to the base class. - - Revision 1.9 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.8 2001/12/23 10:17:56 rainy - The firstTime is now a member variable. - - Revision 1.7 2001/10/28 10:21:58 rainy - Changes in the GetStat() - - Revision 1.6 2001/10/14 07:29:39 rainy - Minor monifications to remove few warnings with VC.NET - - Revision 1.5 2001/09/26 16:27:14 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 13:00:10 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.3 2001/08/19 09:14:55 rainy - Added support for value invert. - Also the CMeasure's ReadConfig is executed. - - Revision 1.2 2001/08/12 15:44:49 Rainy - Adjusted Update()'s interface. - Net throughput is now measured in bytes per second and not bits. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "MeasureNetOut.h" diff --git a/Library/MeasureNetOut.h b/Library/MeasureNetOut.h index f78c52f6..9e009cbb 100644 --- a/Library/MeasureNetOut.h +++ b/Library/MeasureNetOut.h @@ -15,45 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureNetOut.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureNetOut.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.10 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.9 2003/02/10 18:13:34 rainy - Changed the way stats are gathered. - - Revision 1.8 2002/12/23 14:26:07 rainy - Added cumulative statistics measuring. - - Revision 1.7 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.6 2002/04/01 15:37:25 rainy - Moved part of the implementation to the base class. - - Revision 1.5 2001/12/23 10:17:56 rainy - The firstTime is now a member variable. - - Revision 1.4 2001/09/26 16:27:14 rainy - Changed the interfaces a bit. - - Revision 1.3 2001/09/01 13:00:09 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.2 2001/08/12 15:44:49 Rainy - Adjusted Update()'s interface. - Net throughput is now measured in bytes per second and not bits. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __METERNETOUT_H__ #define __METERNETOUT_H__ diff --git a/Library/MeasureNetTotal.cpp b/Library/MeasureNetTotal.cpp index 9310efc3..f5c7c4a4 100644 --- a/Library/MeasureNetTotal.cpp +++ b/Library/MeasureNetTotal.cpp @@ -15,36 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureNetTotal.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureNetTotal.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.7 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.6 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.5 2003/02/10 18:13:34 rainy - Changed the way stats are gathered. - - Revision 1.4 2002/12/23 14:26:07 rainy - Added cumulative statistics measuring. - - Revision 1.3 2002/07/01 15:34:38 rainy - The measuring is done in the base class. - - Revision 1.2 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.1 2002/04/01 15:35:27 rainy - Initial version. - - -*/ #pragma warning(disable: 4996) #include "MeasureNetTotal.h" diff --git a/Library/MeasureNetTotal.h b/Library/MeasureNetTotal.h index 8c270e42..bcc76cdd 100644 --- a/Library/MeasureNetTotal.h +++ b/Library/MeasureNetTotal.h @@ -15,30 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureNetTotal.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureNetTotal.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.5 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.4 2003/02/10 18:13:34 rainy - Changed the way stats are gathered. - - Revision 1.3 2002/12/23 14:26:06 rainy - Added cumulative statistics measuring. - - Revision 1.2 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.1 2002/04/01 15:35:27 rainy - Initial version. - - -*/ #ifndef __METERNETTOTAL_H__ #define __METERNETTOTAL_H__ diff --git a/Library/MeasurePhysicalMemory.cpp b/Library/MeasurePhysicalMemory.cpp index 0b1d7935..574ffb9f 100644 --- a/Library/MeasurePhysicalMemory.cpp +++ b/Library/MeasurePhysicalMemory.cpp @@ -15,38 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasurePhysicalMemory.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasurePhysicalMemory.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.8 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.7 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.6 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.5 2001/09/26 16:27:14 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 13:00:09 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.3 2001/08/19 09:14:20 rainy - Added support for value invert. - - Revision 1.2 2001/08/12 15:43:32 Rainy - Adjusted Update()'s interface. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "MeasurePhysicalMemory.h" diff --git a/Library/MeasurePhysicalMemory.h b/Library/MeasurePhysicalMemory.h index ef0ec2f7..a129582d 100644 --- a/Library/MeasurePhysicalMemory.h +++ b/Library/MeasurePhysicalMemory.h @@ -15,32 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasurePhysicalMemory.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasurePhysicalMemory.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.6 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.5 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.4 2001/09/26 16:27:14 rainy - Changed the interfaces a bit. - - Revision 1.3 2001/09/01 13:00:09 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.2 2001/08/12 15:43:31 Rainy - Adjusted Update()'s interface. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __MEASUREPHYSICALMEMORY_H__ #define __MEASUREPHYSICALMEMORY_H__ diff --git a/Library/MeasurePlugin.cpp b/Library/MeasurePlugin.cpp index a086d289..5fcf36d4 100644 --- a/Library/MeasurePlugin.cpp +++ b/Library/MeasurePlugin.cpp @@ -15,36 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasurePlugin.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasurePlugin.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.7 2004/07/11 17:15:14 rainy - no message - - Revision 1.6 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.5 2002/07/01 15:34:57 rainy - Added GetStringValue. - - Revision 1.4 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.3 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.2 2001/12/23 10:17:02 rainy - The plugins get unique ID automatically. - The plugins are also loaded from the Rainmeter's folder. - - Revision 1.1 2001/10/28 09:07:19 rainy - Inital version - -*/ #pragma warning(disable: 4996) #include "MeasurePlugin.h" diff --git a/Library/MeasurePlugin.h b/Library/MeasurePlugin.h index 66a7299f..7aa2bd60 100644 --- a/Library/MeasurePlugin.h +++ b/Library/MeasurePlugin.h @@ -15,30 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasurePlugin.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasurePlugin.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.5 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.4 2002/07/01 15:34:57 rainy - Added GetStringValue. - - Revision 1.3 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.2 2001/12/23 10:17:02 rainy - The plugins get unique ID automatically. - The plugins are also loaded from the Rainmeter's folder. - - Revision 1.1 2001/10/28 09:07:19 rainy - Inital version - -*/ #ifndef __MEASUREPLUGIN_H__ #define __MEASUREPLUGIN_H__ diff --git a/Library/MeasureRegistry.cpp b/Library/MeasureRegistry.cpp index 309e7246..3c5d6035 100644 --- a/Library/MeasureRegistry.cpp +++ b/Library/MeasureRegistry.cpp @@ -15,32 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureRegistry.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureRegistry.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.6 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.5 2002/05/04 08:13:06 rainy - Added support for multi_sz - - Revision 1.4 2002/04/27 10:28:57 rainy - Added possibility to use other HKEYs also. - - Revision 1.3 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.2 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.1 2001/10/28 09:07:18 rainy - Inital version - -*/ #pragma warning(disable: 4996) #include "MeasureRegistry.h" diff --git a/Library/MeasureRegistry.h b/Library/MeasureRegistry.h index 9bd15479..ce2fe8be 100644 --- a/Library/MeasureRegistry.h +++ b/Library/MeasureRegistry.h @@ -15,26 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureRegistry.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureRegistry.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.4 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.3 2002/04/27 10:28:57 rainy - Added possibility to use other HKEYs also. - - Revision 1.2 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.1 2001/10/28 09:07:18 rainy - Inital version - -*/ #ifndef __MEASUREREGISTRY_H__ #define __MEASUREREGISTRY_H__ diff --git a/Library/MeasureTime.cpp b/Library/MeasureTime.cpp index 1aaba29b..b9611045 100644 --- a/Library/MeasureTime.cpp +++ b/Library/MeasureTime.cpp @@ -15,35 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureTime.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureTime.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.7 2004/07/11 17:15:36 rainy - Fixed localtime calculation. - - Revision 1.6 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.5 2004/03/13 16:17:42 rainy - Added timezones - - Revision 1.4 2003/02/10 18:13:14 rainy - Returns the time in secs as value. - - Revision 1.3 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.2 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.1 2001/12/23 10:11:08 rainy - Initial version. - -*/ #pragma warning(disable: 4996) #include "MeasureTime.h" @@ -263,11 +235,11 @@ void CMeasureTime::ReadConfig(CConfigParser& parser, const WCHAR* section) TIME_ZONE_INFORMATION tzi; GetTimeZoneInformation(&tzi); - m_DeltaTime.QuadPart = ((zone * 3600) - tzi.DaylightBias * 60) * 10000000.0; + m_DeltaTime.QuadPart = (LONGLONG)((zone * 3600) - tzi.DaylightBias * 60) * 10000000.0; } else { - m_DeltaTime.QuadPart = (zone * 3600) * 10000000.0; + m_DeltaTime.QuadPart = (LONGLONG)(zone * 3600) * 10000000.0; } } } diff --git a/Library/MeasureTime.h b/Library/MeasureTime.h index 30f0870e..10ae743f 100644 --- a/Library/MeasureTime.h +++ b/Library/MeasureTime.h @@ -15,29 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureTime.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureTime.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.5 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.4 2004/03/13 16:17:42 rainy - Added timezones - - Revision 1.3 2003/02/10 18:13:14 rainy - Returns the time in secs as value. - - Revision 1.2 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.1 2001/12/23 10:11:08 rainy - Initial version. - -*/ #ifndef __MEASURETIME_H__ #define __MEASURETIME_H__ diff --git a/Library/MeasureUptime.cpp b/Library/MeasureUptime.cpp index fb43c3de..438ca8f1 100644 --- a/Library/MeasureUptime.cpp +++ b/Library/MeasureUptime.cpp @@ -15,35 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureUptime.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureUptime.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.7 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.6 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.5 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.4 2001/12/23 10:16:10 rainy - The static variable is set to zero in destructor. - - Revision 1.3 2001/10/28 10:20:49 rainy - GetStringValue uses consts - - Revision 1.2 2001/09/26 16:27:14 rainy - Changed the interfaces a bit. - - Revision 1.1 2001/09/01 12:56:25 rainy - Initial version. - -*/ #pragma warning(disable: 4996) #include "MeasureUptime.h" diff --git a/Library/MeasureUptime.h b/Library/MeasureUptime.h index d9e4cc35..a479f8c5 100644 --- a/Library/MeasureUptime.h +++ b/Library/MeasureUptime.h @@ -15,29 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureUptime.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureUptime.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.5 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.4 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.3 2001/10/28 10:20:49 rainy - GetStringValue uses consts - - Revision 1.2 2001/09/26 16:27:14 rainy - Changed the interfaces a bit. - - Revision 1.1 2001/09/01 12:56:25 rainy - Initial version. - -*/ #ifndef __MEASUREUPTIME_H__ #define __MEASUREUPTIME_H__ diff --git a/Library/MeasureVirtualMemory.cpp b/Library/MeasureVirtualMemory.cpp index 70534e80..63f4e752 100644 --- a/Library/MeasureVirtualMemory.cpp +++ b/Library/MeasureVirtualMemory.cpp @@ -15,38 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureVirtualMemory.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeasureVirtualMemory.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.8 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.7 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.6 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.5 2001/09/26 16:27:14 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 13:00:09 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.3 2001/08/19 09:14:20 rainy - Added support for value invert. - - Revision 1.2 2001/08/12 15:43:24 Rainy - Adjusted Update()'s interface. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "MeasureVirtualMemory.h" diff --git a/Library/MeasureVirtualMemory.h b/Library/MeasureVirtualMemory.h index b349973e..c1951dba 100644 --- a/Library/MeasureVirtualMemory.h +++ b/Library/MeasureVirtualMemory.h @@ -15,32 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeasureVirtualMemory.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeasureVirtualMemory.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.6 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.5 2002/04/26 18:24:15 rainy - Modified the Update method to support disabled measures. - - Revision 1.4 2001/09/26 16:27:13 rainy - Changed the interfaces a bit. - - Revision 1.3 2001/09/01 13:00:09 rainy - Slight changes in the interface. The value is now measured only once if possible. - - Revision 1.2 2001/08/12 15:43:24 Rainy - Adjusted Update()'s interface. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __MEASUREVIRTUALMEMORY_H__ #define __MEASUREVIRTUALMEMORY_H__ diff --git a/Library/Meter.cpp b/Library/Meter.cpp index 5379a954..6d909ffb 100644 --- a/Library/Meter.cpp +++ b/Library/Meter.cpp @@ -15,69 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Meter.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: Meter.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.17 2004/07/11 17:15:56 rainy - Added relative coordinates. - - Revision 1.16 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.15 2004/03/13 16:17:56 rainy - Added rotator - - Revision 1.14 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.13 2002/12/23 14:25:45 rainy - Fixed color reading. - - Revision 1.12 2002/07/01 15:33:00 rainy - Added LINE meter. - - Revision 1.11 2002/05/04 08:12:51 rainy - Actions can be defined per meter. - - Revision 1.10 2002/04/27 10:28:14 rainy - Added an error message if the meter is not bound to anything. - - Revision 1.9 2002/04/26 18:22:38 rainy - Added possibility to hide the meter. - Added support for Image meter. - - Revision 1.8 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.7 2001/12/23 10:15:25 rainy - Added ParseColor(). - - Revision 1.6 2001/10/14 07:32:15 rainy - In error situations CError is thrown instead just a boolean value. - - Revision 1.5 2001/09/26 16:26:53 rainy - Changed the interfaces a bit. - - Revision 1.4 2001/09/01 12:59:16 rainy - Added support for Uptime measure. - W and H default to 1. - - Revision 1.3 2001/08/19 09:13:38 rainy - Invert moved to the measures. - Added PerfMon measure. - - Revision 1.2 2001/08/12 15:41:41 Rainy - Adjusted Update()'s interface. - Added invert measure. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #include "Error.h" diff --git a/Library/Meter.h b/Library/Meter.h index fef0a80d..d163f345 100644 --- a/Library/Meter.h +++ b/Library/Meter.h @@ -15,51 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Meter.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Meter.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.12 2004/07/11 17:15:56 rainy - Added relative coordinates. - - Revision 1.11 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.10 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.9 2002/07/01 15:33:00 rainy - Added LINE meter. - - Revision 1.8 2002/05/04 08:12:51 rainy - Actions can be defined per meter. - - Revision 1.7 2002/04/26 18:22:03 rainy - Added possibility to hide the meter. - - Revision 1.6 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.5 2001/12/23 10:15:25 rainy - Added ParseColor(). - - Revision 1.4 2001/09/26 16:26:53 rainy - Changed the interfaces a bit. - - Revision 1.3 2001/08/19 09:13:25 rainy - Invert moved to the measures. - - Revision 1.2 2001/08/12 15:41:41 Rainy - Adjusted Update()'s interface. - Added invert measure. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __METER_H__ #define __METER_H__ diff --git a/Library/MeterBar.cpp b/Library/MeterBar.cpp index 01424bd9..deed9416 100644 --- a/Library/MeterBar.cpp +++ b/Library/MeterBar.cpp @@ -15,48 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterBar.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterBar.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.11 2004/07/11 17:16:11 rainy - Added BarBorder. - - Revision 1.10 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.9 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.8 2002/07/01 15:32:51 rainy - Removed include to lsapi.h - - Revision 1.7 2002/05/04 08:13:41 rainy - Fixed vertical bar drawing. - - Revision 1.6 2002/04/26 18:22:03 rainy - Added possibility to hide the meter. - - Revision 1.5 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.4 2001/12/23 10:14:51 rainy - Hex color values are now also supported. - - Revision 1.3 2001/10/14 07:32:33 rainy - In error situations CError is thrown instead just a boolean value. - - Revision 1.2 2001/09/26 16:26:24 rainy - Small adjustement to the interfaces. - - Revision 1.1 2001/09/01 12:56:25 rainy - Initial version. - - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Library/MeterBar.h b/Library/MeterBar.h index 4ad55321..e6392273 100644 --- a/Library/MeterBar.h +++ b/Library/MeterBar.h @@ -15,33 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterBar.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterBar.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.6 2004/07/11 17:16:11 rainy - Added BarBorder. - - Revision 1.5 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.4 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.3 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.2 2001/09/26 16:26:23 rainy - Small adjustement to the interfaces. - - Revision 1.1 2001/09/01 12:56:25 rainy - Initial version. - - -*/ #ifndef __METERBAR_H__ #define __METERBAR_H__ diff --git a/Library/MeterBitmap.cpp b/Library/MeterBitmap.cpp index 4beb4f23..ed0f0125 100644 --- a/Library/MeterBitmap.cpp +++ b/Library/MeterBitmap.cpp @@ -15,48 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterBitmap.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterBitmap.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.11 2004/07/11 17:16:55 rainy - Bitmap must have at least one frame. - - Revision 1.10 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.9 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.8 2002/07/01 15:32:51 rainy - Removed include to lsapi.h - - Revision 1.7 2002/04/26 18:22:02 rainy - Added possibility to hide the meter. - - Revision 1.6 2002/03/31 20:32:29 rainy - Added ZeroFrame, which uses the first frame only for value 0. - - Revision 1.5 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.4 2001/12/23 10:15:04 rainy - Added one sanity check. - - Revision 1.3 2001/10/14 07:32:33 rainy - In error situations CError is thrown instead just a boolean value. - - Revision 1.2 2001/09/26 16:26:23 rainy - Small adjustement to the interfaces. - - Revision 1.1 2001/09/01 12:56:25 rainy - Initial version. - - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Library/MeterBitmap.h b/Library/MeterBitmap.h index d05a1667..8b1481f7 100644 --- a/Library/MeterBitmap.h +++ b/Library/MeterBitmap.h @@ -15,33 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterBitmap.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterBitmap.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.6 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.5 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.4 2002/03/31 20:32:29 rainy - Added ZeroFrame, which uses the first frame only for value 0. - - Revision 1.3 2002/03/31 09:58:54 rainy - Added some comments - - Revision 1.2 2001/09/26 16:26:23 rainy - Small adjustement to the interfaces. - - Revision 1.1 2001/09/01 12:56:25 rainy - Initial version. - - -*/ #ifndef __METERBITMAP_H__ #define __METERBITMAP_H__ diff --git a/Library/MeterButton.cpp b/Library/MeterButton.cpp index e3b4cae3..5a4bd253 100644 --- a/Library/MeterButton.cpp +++ b/Library/MeterButton.cpp @@ -15,14 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterButton.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterButton.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Library/MeterButton.h b/Library/MeterButton.h index 0b5b372f..3c2f0d22 100644 --- a/Library/MeterButton.h +++ b/Library/MeterButton.h @@ -15,14 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterButton.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterButton.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - -*/ #ifndef __METERBUTTON_H__ #define __METERBUTTON_H__ diff --git a/Library/MeterHistogram.cpp b/Library/MeterHistogram.cpp index 6c522318..ee3e8e95 100644 --- a/Library/MeterHistogram.cpp +++ b/Library/MeterHistogram.cpp @@ -15,68 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterHistogram.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterHistogram.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.17 2004/07/11 17:17:23 rainy - Fixed a crash bug with max value. - - Revision 1.16 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.15 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.14 2002/07/01 15:32:51 rainy - Removed include to lsapi.h - - Revision 1.13 2002/05/04 08:14:11 rainy - Histogram now draws the lines one pixel higher. - - Revision 1.12 2002/04/26 18:28:17 rainy - The meter is not updated if both measures are disabled. - - Revision 1.11 2002/04/26 18:22:02 rainy - Added possibility to hide the meter. - - Revision 1.10 2002/03/31 09:58:53 rainy - Added some comments - - Revision 1.9 2001/12/23 10:14:51 rainy - Hex color values are now also supported. - - Revision 1.8 2001/10/28 10:19:40 rainy - Fixed a bug with secondary measure not set correctly - - Revision 1.7 2001/10/14 07:32:33 rainy - In error situations CError is thrown instead just a boolean value. - - Revision 1.6 2001/09/26 16:26:37 rainy - Small adjustement to the interfaces. - Implemented BindMeasure() - - Revision 1.5 2001/09/01 12:58:48 rainy - Removed MaxValues (i.e. they aren't stored anymore). - Fixed a bug in bitmap histogram placement. - - Revision 1.4 2001/08/25 17:07:28 rainy - Added support for background images behind the curves. - - Revision 1.3 2001/08/19 09:13:13 rainy - Invert moved to the measures. - - Revision 1.2 2001/08/12 15:38:54 Rainy - Adjusted Update()'s interface. - Added invert for the secondary measure. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Library/MeterHistogram.h b/Library/MeterHistogram.h index 83ee0ef5..e4b96131 100644 --- a/Library/MeterHistogram.h +++ b/Library/MeterHistogram.h @@ -15,43 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterHistogram.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterHistogram.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.9 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.8 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.7 2002/03/31 09:58:53 rainy - Added some comments - - Revision 1.6 2001/09/26 16:26:23 rainy - Small adjustement to the interfaces. - - Revision 1.5 2001/09/01 12:58:48 rainy - Removed MaxValues (i.e. they aren't stored anymore). - Fixed a bug in bitmap histogram placement. - - Revision 1.4 2001/08/25 17:07:28 rainy - Added support for background images behind the curves. - - Revision 1.3 2001/08/19 09:13:13 rainy - Invert moved to the measures. - - Revision 1.2 2001/08/12 15:38:54 Rainy - Adjusted Update()'s interface. - Added invert for the secondary measure. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __METERHISTOGRAM_H__ #define __METERHISTOGRAM_H__ diff --git a/Library/MeterImage.cpp b/Library/MeterImage.cpp index 5e36ad2d..a7d11f12 100644 --- a/Library/MeterImage.cpp +++ b/Library/MeterImage.cpp @@ -15,35 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterImage.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterImage.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.7 2004/08/13 15:44:57 rainy - Loading images don't lock the file anymore. - - Revision 1.6 2004/07/11 17:17:48 rainy - The image is not locked anymore on disk. - - Revision 1.5 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.4 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.3 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.2 2002/07/01 15:32:50 rainy - Removed include to lsapi.h - - Revision 1.1 2002/04/27 10:28:31 rainy - Intial version. - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Library/MeterImage.h b/Library/MeterImage.h index c0d33f7d..b495acd1 100644 --- a/Library/MeterImage.h +++ b/Library/MeterImage.h @@ -15,29 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterImage.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterImage.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.5 2004/07/11 17:17:48 rainy - The image is not locked anymore on disk. - - Revision 1.4 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.3 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.2 2003/02/10 18:12:45 rainy - Now uses GDI+ - - Revision 1.1 2002/04/27 10:28:31 rainy - Intial version. - -*/ #ifndef __METERIMAGE_H__ #define __METERIMAGE_H__ diff --git a/Library/MeterLine.cpp b/Library/MeterLine.cpp index 780b5fbd..9063567b 100644 --- a/Library/MeterLine.cpp +++ b/Library/MeterLine.cpp @@ -15,30 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterLine.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterLine.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.5 2004/07/11 17:18:07 rainy - Relative coordinate support. - - Revision 1.4 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.3 2004/03/13 16:18:16 rainy - Limits negative coords - - Revision 1.2 2003/02/10 18:12:44 rainy - Now uses GDI+ - - Revision 1.1 2002/07/01 15:35:54 rainy - Intial version - - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) @@ -167,7 +143,7 @@ bool CMeterLine::Update() { double value = m_Measure->GetValue(); - if (m_AllValues[0].size() < m_W) + if ((int)m_AllValues[0].size() < m_W) { m_AllValues[0].push_back(value); } @@ -183,7 +159,7 @@ bool CMeterLine::Update() { double value = (*i)->GetValue(); - if (m_AllValues[counter].size() < m_W) + if ((int)m_AllValues[counter].size() < m_W) { m_AllValues[counter].push_back(value); } @@ -311,7 +287,7 @@ bool CMeterLine::Draw() for (int j = 0; j < m_W; j++) { - if (pos < (*i).size()) + if (pos < (int)(*i).size()) { Y = (REAL)((*i)[pos] * m_ScaleValues[counter] * (m_H - 1) / maxValue); Y = min(Y, m_H - 1); diff --git a/Library/MeterLine.h b/Library/MeterLine.h index 2f7bb85c..c7f1f462 100644 --- a/Library/MeterLine.h +++ b/Library/MeterLine.h @@ -15,23 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterLine.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterLine.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.3 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.2 2003/02/10 18:12:44 rainy - Now uses GDI+ - - Revision 1.1 2002/07/01 15:35:54 rainy - Intial version - -*/ #ifndef __METERLINE_H__ #define __METERLINE_H__ diff --git a/Library/MeterRotator.cpp b/Library/MeterRotator.cpp index 137f824f..61c75ebc 100644 --- a/Library/MeterRotator.cpp +++ b/Library/MeterRotator.cpp @@ -15,30 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterRotator.cpp,v 1.2 2005/07/12 16:31:49 rainy Exp $ - - $Log: MeterRotator.cpp,v $ - Revision 1.2 2005/07/12 16:31:49 rainy - *** empty log message *** - - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.4 2004/08/13 15:46:43 rainy - Added LineStart. - Reminder->Remainder. - - Revision 1.3 2004/07/11 17:18:07 rainy - Relative coordinate support. - - Revision 1.2 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.1 2004/03/13 16:18:43 rainy - Initial version - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) @@ -136,8 +112,8 @@ bool CMeterRotator::Update() if (m_ValueRemainder > 0) { LARGE_INTEGER time; - time.QuadPart = m_Measure->GetValue(); - m_Value = time.QuadPart % m_ValueRemainder; + time.QuadPart = (LONGLONG)m_Measure->GetValue(); + m_Value = (double)(time.QuadPart % m_ValueRemainder); m_Value /= (double)m_ValueRemainder; } else diff --git a/Library/MeterRotator.h b/Library/MeterRotator.h index 1d784504..88234f9f 100644 --- a/Library/MeterRotator.h +++ b/Library/MeterRotator.h @@ -15,24 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterRotator.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterRotator.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.3 2004/08/13 15:46:43 rainy - Added LineStart. - Reminder->Remainder. - - Revision 1.2 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.1 2004/03/13 16:18:43 rainy - Initial version - -*/ #ifndef __METERROTATOR_H__ #define __METERROTATOR_H__ diff --git a/Library/MeterRoundLine.cpp b/Library/MeterRoundLine.cpp index 2341a742..749b53d0 100644 --- a/Library/MeterRoundLine.cpp +++ b/Library/MeterRoundLine.cpp @@ -15,29 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterRoundLine.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: MeterRoundLine.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.5 2004/08/13 15:46:50 rainy - Reminder->Remainder. - - Revision 1.4 2004/07/11 17:18:07 rainy - Relative coordinate support. - - Revision 1.3 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.2 2003/02/10 18:12:44 rainy - Now uses GDI+ - - Revision 1.1 2002/12/26 18:15:41 rainy - Initial version - -*/ #pragma warning(disable: 4996) #include "MeterRoundLine.h" @@ -117,8 +95,8 @@ bool CMeterRoundLine::Update() if (m_ValueRemainder > 0) { LARGE_INTEGER time; - time.QuadPart = m_Measure->GetValue(); - m_Value = time.QuadPart % m_ValueRemainder; + time.QuadPart = (LONGLONG)m_Measure->GetValue(); + m_Value = (double)(time.QuadPart % m_ValueRemainder); m_Value /= (double)m_ValueRemainder; } else diff --git a/Library/MeterRoundLine.h b/Library/MeterRoundLine.h index 968bafd3..feb26c25 100644 --- a/Library/MeterRoundLine.h +++ b/Library/MeterRoundLine.h @@ -15,25 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterRoundLine.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterRoundLine.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.4 2004/08/13 15:46:50 rainy - Reminder->Remainder. - - Revision 1.3 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.2 2003/02/10 18:12:44 rainy - Now uses GDI+ - - Revision 1.1 2002/12/26 17:51:50 rainy - Initial version -*/ #ifndef __METERROUNDLINE_H__ #define __METERROUNDLINE_H__ diff --git a/Library/MeterString.cpp b/Library/MeterString.cpp index 023bb218..46b90d2c 100644 --- a/Library/MeterString.cpp +++ b/Library/MeterString.cpp @@ -15,47 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterString.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterString.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.11 2004/07/11 17:18:32 rainy - Fixed width calculation. - - Revision 1.10 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.9 2003/02/10 18:12:44 rainy - Now uses GDI+ - - Revision 1.8 2002/07/01 15:32:20 rainy - Added NumOfDecimals - - Revision 1.7 2002/04/26 18:22:02 rainy - Added possibility to hide the meter. - - Revision 1.6 2002/03/31 09:58:53 rainy - Added some comments - - Revision 1.5 2001/12/23 10:14:33 rainy - Hex color values are now also supported. - - Revision 1.4 2001/10/14 07:32:32 rainy - In error situations CError is thrown instead just a boolean value. - - Revision 1.3 2001/09/26 16:26:23 rainy - Small adjustement to the interfaces. - - Revision 1.2 2001/09/01 12:57:33 rainy - Added support for percentual measuring. - - Revision 1.1 2001/08/12 15:35:08 Rainy - Inital Version - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) @@ -176,7 +135,7 @@ void CMeterString::Initialize() int dpi = GetDeviceCaps(dc, LOGPIXELSX); ReleaseDC(GetDesktopWindow(), dc); - REAL size = (REAL)m_FontSize * (96.0 / (REAL)dpi); + REAL size = (REAL)m_FontSize * (96.0f / (REAL)dpi); if (m_FontFamily) { @@ -241,7 +200,7 @@ void CMeterString::ReadConfig(const WCHAR* section) m_FontSize = parser.ReadInt(section, L"FontSize", 10); m_NumOfDecimals = parser.ReadInt(section, L"NumOfDecimals", -1); - m_Angle = parser.ReadFloat(section, L"Angle", 0.0); + m_Angle = parser.ReadFloat(section, L"Angle", 0.0f); std::wstring scale; scale = parser.ReadString(section, L"Scale", L"1"); @@ -326,7 +285,7 @@ bool CMeterString::Update() if (m_Measure) stringValues.push_back(m_Measure->GetStringValue(m_AutoScale, m_Scale, decimals, m_Percentual)); // Get the values for the other measures - for (int i = 0; i < m_Measures.size(); i++) + for (size_t i = 0; i < m_Measures.size(); i++) { stringValues.push_back(m_Measures[i]->GetStringValue(m_AutoScale, m_Scale, decimals, m_Percentual)); } @@ -346,7 +305,7 @@ bool CMeterString::Update() // Create the actual text (i.e. replace %1, %2, .. with the measure texts) std::wstring tmpText = m_Text; - for (int i = 0; i < stringValues.size(); i++) + for (size_t i = 0; i < stringValues.size(); i++) { wsprintf(buffer, L"%%%i", i + 1); @@ -430,8 +389,8 @@ bool CMeterString::DrawString(RectF* rect) break; } - int x = GetX(); - int y = GetY(); + REAL x = (REAL)GetX(); + REAL y = (REAL)GetY(); if (rect) { @@ -453,7 +412,7 @@ bool CMeterString::DrawString(RectF* rect) stringFormat.SetFormatFlags(StringFormatFlagsNoClip | StringFormatFlagsNoWrap); } - double angle = m_Angle * 180.0f / 3.14159265f; // Convert to degrees + REAL angle = m_Angle * 180.0f / 3.14159265f; // Convert to degrees graphics.TranslateTransform(CMeter::GetX(), y); graphics.RotateTransform(angle); graphics.TranslateTransform(-CMeter::GetX(), -y); diff --git a/Library/MeterString.h b/Library/MeterString.h index 94d3703e..90933601 100644 --- a/Library/MeterString.h +++ b/Library/MeterString.h @@ -15,42 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterString.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterString.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.9 2004/07/11 17:18:32 rainy - Fixed width calculation. - - Revision 1.8 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.7 2003/02/10 18:12:44 rainy - Now uses GDI+ - - Revision 1.6 2002/07/01 15:32:20 rainy - Added NumOfDecimals - - Revision 1.5 2002/03/31 09:58:53 rainy - Added some comments - - Revision 1.4 2001/09/26 16:26:23 rainy - Small adjustement to the interfaces. - - Revision 1.3 2001/09/01 12:57:33 rainy - Added support for percentual measuring. - - Revision 1.2 2001/08/19 09:12:44 rainy - no message - - Revision 1.1 2001/08/12 15:35:07 Rainy - Inital Version - - -*/ #ifndef __METERSTRING_H__ #define __METERSTRING_H__ diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index 59f122cd..367a9578 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -15,113 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterWindow.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterWindow.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.26 2004/08/13 15:47:45 rainy - Fixed z-position changing. - Mouse move events work for non-movable windows too. - - Revision 1.25 2004/07/11 17:19:29 rainy - Changed messageboxes to logs. - Mouse leave checks transparent pixels. - Added !RainmeterToggleConfig. - - Revision 1.24 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.23 2004/03/13 16:19:17 rainy - Added support for multiple configs - - Revision 1.22 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.21 2003/02/10 18:11:33 rainy - Too much changes to mention :-) - - Revision 1.20 2002/12/23 14:25:21 rainy - Separated skin and other settings. - Stats are now written in ini file. - - Revision 1.19 2002/07/01 15:27:36 rainy - AlwaysOnTop gets now three values. - Added Toggle(). - Added RainmeterCurrentConfig and RainmeterCurrentConfigIni. - The ini file's timestamp is checked before it is overwritten. - AboutBox is now in separate source file. - Added SnapEdges. - - Revision 1.18 2002/05/05 10:48:56 rainy - Fixed few bugs. - - Revision 1.17 2002/05/04 08:16:35 rainy - There can be any number of ini files in the config folders. - WM_COPYDATA can be used to deliver the bangs. - Added support for per meter actions. - - Revision 1.16 2002/04/27 10:27:42 rainy - Added hide/show to meters and enable/disable to measures - - Revision 1.15 2002/04/01 15:36:10 rainy - Added PLAY, PLAYSTOP and PLAYLOOP build-in commands. - - Revision 1.14 2002/03/31 09:58:53 rainy - Added some comments - - Revision 1.13 2002/03/29 16:32:58 rainy - Fixed a typo - - Revision 1.12 2002/01/16 16:06:29 rainy - The file doesn't need to be named Rainmeter.ini anymore. - If the old config doesn't exist, we'll yse the first one instead. - - Revision 1.11 2001/12/23 10:14:09 rainy - Added support for different configs. - The position of the window is now remembered. - - Revision 1.10 2001/10/28 10:15:21 rainy - Added left and right mouse up actions. - IsNT() can now identify different OS more precisely. - - Revision 1.9 2001/10/14 07:27:58 rainy - Changed the errorhandling. - Stats now include the date when they were started to collect. - - Revision 1.8 2001/09/26 16:25:44 rainy - Added support for statistics. - Meters and Measures are now stored here. - - Revision 1.7 2001/09/01 12:57:13 rainy - Added support for Bar and Bitmap meters. - - Revision 1.6 2001/08/25 18:08:34 rainy - Added mousebutton actions. - The About dialog has now the build date. - - Revision 1.5 2001/08/25 17:15:52 rainy - Added context menu, which can show the about dialog, refresh the configuration or quit the program. - The ini-file can be defined in the step.rc also. - - Revision 1.4 2001/08/19 09:43:29 rainy - Mouse over hid the window even if it was not wanted. - - Revision 1.3 2001/08/19 09:12:12 rainy - Added support for GetRevID. - Added StartHidden. - - Revision 1.2 2001/08/12 15:36:55 Rainy - The ini-file's exsistance is checked. - Added String meter. - Improved mouse over hiding. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) @@ -2160,7 +2053,7 @@ LRESULT CMeterWindow::OnCommand(WPARAM wParam, LPARAM lParam) { const std::vector& configs = m_Rainmeter->GetAllConfigs(); - for (int i = 0; i < configs.size(); i++) + for (size_t i = 0; i < configs.size(); i++) { if (configs[i].config == m_SkinName) { diff --git a/Library/MeterWindow.h b/Library/MeterWindow.h index cab265f9..16275a24 100644 --- a/Library/MeterWindow.h +++ b/Library/MeterWindow.h @@ -15,91 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/MeterWindow.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: MeterWindow.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.21 2004/07/11 17:19:29 rainy - Changed messageboxes to logs. - Mouse leave checks transparent pixels. - Added !RainmeterToggleConfig. - - Revision 1.20 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.19 2004/03/13 16:19:17 rainy - Added support for multiple configs - - Revision 1.18 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.17 2003/02/10 18:10:56 rainy - no message - - Revision 1.16 2002/12/23 14:25:21 rainy - Separated skin and other settings. - Stats are now written in ini file. - - Revision 1.15 2002/07/01 15:27:36 rainy - AlwaysOnTop gets now three values. - Added Toggle(). - Added RainmeterCurrentConfig and RainmeterCurrentConfigIni. - The ini file's timestamp is checked before it is overwritten. - AboutBox is now in separate source file. - Added SnapEdges. - - Revision 1.14 2002/05/05 10:48:15 rainy - The last message is stored into a membervariable. - - Revision 1.13 2002/05/04 08:14:45 rainy - Configs store also the names of the ini-files. - - Revision 1.12 2002/04/27 10:27:42 rainy - Added hide/show to meters and enable/disable to measures - - Revision 1.11 2002/03/31 09:58:53 rainy - Added some comments - - Revision 1.10 2001/12/23 10:14:09 rainy - Added support for different configs. - The position of the window is now remembered. - - Revision 1.9 2001/10/28 10:15:21 rainy - Added left and right mouse up actions. - IsNT() can now identify different OS more precisely. - - Revision 1.8 2001/10/14 07:26:21 rainy - Added m_StatsDate - - Revision 1.7 2001/09/26 16:25:44 rainy - Added support for statistics. - Meters and Measures are now stored here. - - Revision 1.6 2001/09/01 12:57:13 rainy - Added support for Bar and Bitmap meters. - - Revision 1.5 2001/08/25 18:08:34 rainy - Added mousebutton actions. - The About dialog has now the build date. - - Revision 1.4 2001/08/25 17:14:00 rainy - Pointer to CRainmeter is now stored in a member variable. - Added few more methods. - - Revision 1.3 2001/08/19 09:10:18 rainy - Added GetWindow() and OnGetRevID(). - - Revision 1.2 2001/08/12 15:37:39 Rainy - ToggleWindowIfNecessary is now ShowWindowIfAppropriate. - Added method for mouseover messages. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __METERWINDOW_H__ #define __METERWINDOW_H__ diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index 0c48d1d2..53eae963 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -15,68 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Rainmeter.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - $Log: Rainmeter.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.17 2004/08/13 15:48:23 rainy - Added check update. - Fixed LSHook - - Revision 1.16 2004/07/11 17:19:57 rainy - Whole skin folder is recursively scanned. - - Revision 1.15 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.14 2004/03/13 16:20:41 rainy - Improved multiconfig support - - Revision 1.13 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.12 2003/02/10 18:10:48 rainy - Added support for the new bangs. - - Revision 1.11 2002/07/01 15:01:18 rainy - Wharfdata is not used anymore. - Added Toggle. - - Revision 1.10 2002/05/05 10:47:50 rainy - Fixed the Regresh and ChangeConfig bangs - - Revision 1.9 2002/05/04 08:10:46 rainy - Added the new bangs. - - Revision 1.8 2002/04/27 10:27:13 rainy - Added bangs to hide/show meters and measures - - Revision 1.7 2002/03/31 09:58:53 rainy - Added some comments - - Revision 1.6 2001/10/14 07:32:32 rainy - In error situations CError is thrown instead just a boolean value. - - Revision 1.5 2001/09/26 16:24:57 rainy - Cleaned up the code - - Revision 1.4 2001/09/01 12:56:44 rainy - Added refresh bang. - - Revision 1.3 2001/08/25 17:06:38 rainy - Changed few methods to inlines. - Now the wharf data is stored fully. - - Revision 1.2 2001/08/19 09:03:50 rainy - Added support for Litestep's GetRevID. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #pragma warning(disable: 4996) #pragma warning(disable: 4786) @@ -155,7 +94,7 @@ std::vector ParseString(LPCTSTR str) } // Strip the quotes from all strings - for (int i = 0; i < result.size(); i++) + for (size_t i = 0; i < result.size(); i++) { size_t pos = result[i].find(L"\""); while (pos != std::wstring::npos) @@ -251,7 +190,7 @@ LPCTSTR ReadConfigString(LPCTSTR section, LPCTSTR key, LPCTSTR defValue) ** Parses Bang args ** */ -void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, int numOfArgs) +void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs) { if(Rainmeter) { @@ -260,7 +199,7 @@ void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, int numOfArgs) std::wstring argument; // Don't include the config name from the arg if there is one - for (int i = 0; i < numOfArgs; i++) + for (size_t i = 0; i < numOfArgs; i++) { if (i != 0) argument += L" "; if (i < subStrings.size()) @@ -456,11 +395,11 @@ void RainmeterActivateConfig(HWND, const char* arg) { const std::vector& configs = Rainmeter->GetAllConfigs(); - for (int i = 0; i < configs.size(); i++) + for (size_t i = 0; i < configs.size(); i++) { if (wcsnicmp(configs[i].config.c_str(), subStrings[0].c_str(), configs[i].config.length()) == 0) { - for (int j = 0; j < configs[i].iniFiles.size(); j++) + for (size_t j = 0; j < configs[i].iniFiles.size(); j++) { if (wcsnicmp(configs[i].iniFiles[j].c_str(), subStrings[1].c_str(), configs[i].iniFiles[j].length()) == 0) { @@ -824,7 +763,7 @@ int CRainmeter::Initialize(HWND Parent, HINSTANCE Instance, LPCSTR szPath) } // Create meter windows for active configs - for (int i = 0; i < m_ConfigStrings.size(); i++) + for (size_t i = 0; i < m_ConfigStrings.size(); i++) { if (m_ConfigStrings[i].active > 0 && m_ConfigStrings[i].active <= m_ConfigStrings[i].iniFiles.size()) { @@ -843,7 +782,7 @@ void CRainmeter::ReloadSettings() void CRainmeter::ActivateConfig(int configIndex, int iniIndex) { - if (configIndex >= 0 && configIndex < m_ConfigStrings.size()) + if (configIndex >= 0 && configIndex < (int)m_ConfigStrings.size()) { WCHAR buffer[256]; std::wstring skinIniFile = m_ConfigStrings[configIndex].iniFiles[iniIndex]; @@ -883,14 +822,14 @@ void CRainmeter::ActivateConfig(int configIndex, int iniIndex) bool CRainmeter::DeactivateConfig(CMeterWindow* meterWindow, int configIndex) { - if (configIndex >= 0 && configIndex < m_ConfigStrings.size()) + if (configIndex >= 0 && configIndex < (int)m_ConfigStrings.size()) { m_ConfigStrings[configIndex].active = 0; // Deactivate the config } else { // Deactive all - for(int i = 0; i < m_ConfigStrings.size(); i++) + for(size_t i = 0; i < m_ConfigStrings.size(); i++) { m_ConfigStrings[i].active = 0; } @@ -1187,7 +1126,7 @@ BOOL CRainmeter::ExecuteBang(const std::wstring& bang, const std::wstring& arg, std::wstring::size_type start = std::wstring::npos; std::wstring::size_type end = std::wstring::npos; int count = 0; - for (int i = 0; i < arg.size(); i++) + for (size_t i = 0; i < arg.size(); i++) { if (arg[i] == L'[') { @@ -1425,7 +1364,7 @@ void CRainmeter::ReadGeneralSettings(std::wstring& iniFile) } } - for (int i = 0; i < m_ConfigStrings.size(); i++) + for (size_t i = 0; i < m_ConfigStrings.size(); i++) { int active = parser.ReadInt(m_ConfigStrings[i].config.c_str(), L"Active", 0); @@ -1444,13 +1383,13 @@ void CRainmeter::ReadGeneralSettings(std::wstring& iniFile) */ bool CRainmeter::SetActiveConfig(std::wstring& skinName, std::wstring& skinIni) { - for (int i = 0; i < m_ConfigStrings.size(); i++) + for (size_t i = 0; i < m_ConfigStrings.size(); i++) { m_ConfigStrings[i].active = 0; // Disable all other configs if (skinName == m_ConfigStrings[i].config) { - for (int j = 0; j < m_ConfigStrings[i].iniFiles.size(); j++) + for (size_t j = 0; j < m_ConfigStrings[i].iniFiles.size(); j++) { if (skinIni == m_ConfigStrings[i].iniFiles[j]) { @@ -1663,7 +1602,7 @@ HMENU CRainmeter::CreateConfigMenu(std::vector& configMenuData) { configMenu = CreatePopupMenu(); - for (int i = 0; i < configMenuData.size(); i++) + for (size_t i = 0; i < configMenuData.size(); i++) { if (configMenuData[i].index == -1) { diff --git a/Library/Rainmeter.h b/Library/Rainmeter.h index 3d804637..d127a300 100644 --- a/Library/Rainmeter.h +++ b/Library/Rainmeter.h @@ -15,74 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/Rainmeter.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Rainmeter.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.19 2004/08/13 15:48:34 rainy - no message - - Revision 1.18 2004/07/11 17:19:57 rainy - Whole skin folder is recursively scanned. - - Revision 1.17 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - - Revision 1.16 2004/03/13 16:20:41 rainy - Improved multiconfig support - - Revision 1.15 2003/12/05 15:50:10 Rainy - Multi-instance changes. - - Revision 1.14 2003/02/10 18:10:48 rainy - Added support for the new bangs. - - Revision 1.13 2002/07/01 15:01:18 rainy - Wharfdata is not used anymore. - Added Toggle. - - Revision 1.12 2002/05/04 08:10:25 rainy - Added interfaces for the new bangs. - commandline is now stored in stl string. - - Revision 1.11 2002/04/27 10:27:13 rainy - Added bangs to hide/show meters and measures - - Revision 1.10 2002/04/26 18:22:02 rainy - Added possibility to hide the meter. - - Revision 1.9 2002/03/31 09:58:53 rainy - Added some comments - - Revision 1.8 2002/01/16 16:05:25 rainy - Version 0.6 - - Revision 1.7 2001/12/23 10:11:32 rainy - Refresh gets another parameter. - - Revision 1.6 2001/09/26 16:23:23 rainy - Changed the version number - - Revision 1.5 2001/09/01 12:56:44 rainy - Added refresh bang. - - Revision 1.4 2001/08/25 18:07:57 rainy - Version is now 0.4. - - Revision 1.3 2001/08/25 17:06:24 rainy - Changed few methods to inlines. - Now the wharf data is stored fully. - - Revision 1.2 2001/08/19 09:03:28 rainy - Added VERSION string. - - Revision 1.1.1.1 2001/08/11 10:58:19 Rainy - Added to CVS. - -*/ #ifndef __RAINMETER_H__ #define __RAINMETER_H__ @@ -137,7 +69,7 @@ void RainmeterResetStats(HWND, const char* arg); void RainmeterMoveMeter(HWND, const char* arg); void RainmeterPluginBang(HWND, const char* arg); -void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, int numOfArgs); +void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs); struct GlobalConfig { diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp index e98aa869..cc2ec2d0 100644 --- a/Library/TrayWindow.cpp +++ b/Library/TrayWindow.cpp @@ -15,20 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/TrayWindow.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: TrayWindow.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.2 2004/07/11 17:19:57 rainy - Whole skin folder is recursively scanned. - - Revision 1.1 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - -*/ #define _WIN32_IE 0x0600 @@ -106,7 +92,7 @@ CTrayWindow::~CTrayWindow() if (m_Bitmap) delete m_Bitmap; if (m_Measure) delete m_Measure; - for (int i = 0; i < m_TrayIcons.size(); i++) + for (size_t i = 0; i < m_TrayIcons.size(); i++) { DestroyIcon(m_TrayIcons[i]); } @@ -312,7 +298,7 @@ HICON CTrayWindow::CreateTrayIcon(double value) void CTrayWindow::ReadConfig(CConfigParser& parser) { - for (int i = 0; i < m_TrayIcons.size(); i++) + for (size_t i = 0; i < m_TrayIcons.size(); i++) { DestroyIcon(m_TrayIcons[i]); } @@ -496,9 +482,9 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA // Check which config was selected const std::vector& configs = Rainmeter->GetAllConfigs(); - for (int i = 0; i < configs.size(); i++) + for (size_t i = 0; i < configs.size(); i++) { - for (int j = 0; j < configs[i].commands.size(); j++) + for (size_t j = 0; j < configs[i].commands.size(); j++) { if (configs[i].commands[j] == wParam) { @@ -530,7 +516,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA int index = (int)(wParam >> 16); std::map& windows = Rainmeter->GetAllMeterWindows(); - if (index < windows.size()) + if (index < (int)windows.size()) { std::map::iterator iter = windows.begin(); for( ; iter != windows.end(); iter++) diff --git a/Library/TrayWindow.h b/Library/TrayWindow.h index bf955403..1a7d93e6 100644 --- a/Library/TrayWindow.h +++ b/Library/TrayWindow.h @@ -15,17 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/TrayWindow.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: TrayWindow.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.1 2004/06/05 10:55:54 rainy - Too much changes to be listed in here... - -*/ #ifndef __TRAYWINDOW_H__ #define __TRAYWINDOW_H__ diff --git a/Library/UpdateCheck.cpp b/Library/UpdateCheck.cpp index 239d49ea..08d842c3 100644 --- a/Library/UpdateCheck.cpp +++ b/Library/UpdateCheck.cpp @@ -15,17 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/UpdateCheck.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: UpdateCheck.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.1 2004/08/13 15:44:02 rainy - Initial version. - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Library/UpdateCheck.h b/Library/UpdateCheck.h index eaeb1711..3e358c30 100644 --- a/Library/UpdateCheck.h +++ b/Library/UpdateCheck.h @@ -15,17 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Library/UpdateCheck.h,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: UpdateCheck.h,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.1 2004/08/13 15:44:02 rainy - Initial version. - -*/ #ifndef __UPDATE_CHECK_H__ #define __UPDATE_CHECK_H__ diff --git a/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp b/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp index 60753cee..9166e5b7 100644 --- a/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp +++ b/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp @@ -112,7 +112,7 @@ bool CheckProcess(CPUMeasure* measure, const std::wstring& name) { if (measure->includes.empty()) { - for (int i = 0; i < measure->excludes.size(); i++) + for (size_t i = 0; i < measure->excludes.size(); i++) { if (wcsicmp(measure->excludes[i].c_str(), name.c_str()) == 0) { @@ -123,7 +123,7 @@ bool CheckProcess(CPUMeasure* measure, const std::wstring& name) } else { - for (int i = 0; i < measure->includes.size(); i++) + for (size_t i = 0; i < measure->includes.size(); i++) { if (wcsicmp(measure->includes[i].c_str(), name.c_str()) == 0) { @@ -159,7 +159,7 @@ double Update2(UINT id) if(measure) { - for (int i = 0; i < g_Processes.size(); i++) + for (size_t i = 0; i < g_Processes.size(); i++) { // Check process include/exclude if (CheckProcess(measure, g_Processes[i].name)) @@ -320,7 +320,7 @@ void UpdateProcesses() values.oldValue = 0; // Check if we can find the old value - for (int i = 0; i < g_Processes.size(); i++) + for (size_t i = 0; i < g_Processes.size(); i++) { if (!g_Processes[i].found && g_Processes[i].name == name) { diff --git a/Plugins/PluginExample/ExamplePlugin.c b/Plugins/PluginExample/ExamplePlugin.c index 4d5a4907..023351ec 100644 --- a/Plugins/PluginExample/ExamplePlugin.c +++ b/Plugins/PluginExample/ExamplePlugin.c @@ -15,24 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginExample/ExamplePlugin.c,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: ExamplePlugin.c,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.3 2004/06/05 10:49:50 rainy - Added new interface. - Uses config parser. - - Revision 1.2 2001/12/23 10:04:51 rainy - Added ID to the interface. - - Revision 1.1 2001/10/28 09:05:05 rainy - Inital version - -*/ #pragma warning(disable: 4996) diff --git a/Plugins/PluginPing/Ping.cpp b/Plugins/PluginPing/Ping.cpp index 5095684d..d48c58ca 100644 --- a/Plugins/PluginPing/Ping.cpp +++ b/Plugins/PluginPing/Ping.cpp @@ -15,14 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginPing/Ping.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Ping.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Plugins/PluginPower/PowerPlugin.cpp b/Plugins/PluginPower/PowerPlugin.cpp index 2fabc958..82727500 100644 --- a/Plugins/PluginPower/PowerPlugin.cpp +++ b/Plugins/PluginPower/PowerPlugin.cpp @@ -15,27 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginPower/PowerPlugin.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: PowerPlugin.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.4 2004/07/11 17:10:42 rainy - The plugin is cleaned up correctly. - - Revision 1.3 2004/06/05 10:56:07 rainy - Added new interface. - Uses config parser. - - Revision 1.2 2003/03/22 20:39:42 rainy - The max value for status is now correct. - - Revision 1.1 2002/09/07 08:17:11 rainy - Intial version - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Plugins/PluginQuote/Quote.cpp b/Plugins/PluginQuote/Quote.cpp index 39d8155e..7cc259a0 100644 --- a/Plugins/PluginQuote/Quote.cpp +++ b/Plugins/PluginQuote/Quote.cpp @@ -15,14 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginQuote/Quote.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: Quote.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Plugins/PluginResMon/ResMon.cpp b/Plugins/PluginResMon/ResMon.cpp index 01979a59..72ef12b4 100644 --- a/Plugins/PluginResMon/ResMon.cpp +++ b/Plugins/PluginResMon/ResMon.cpp @@ -16,22 +16,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginResMon/ResMon.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: ResMon.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.2 2004/07/11 17:10:42 rainy - The plugin is cleaned up correctly. - - Revision 1.1 2004/06/05 10:56:56 rainy - Added new interfaces for plugin version and author. - Added possibility to measure a single process. - -*/ - /* Requires Win2k or later. Sorry to anyone still using 9x or ME. All my results seem to agree with Task Manager (it gets tedious adding up diff --git a/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp b/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp index 5e56ad38..d629beee 100644 --- a/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp +++ b/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp @@ -15,14 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: SpeedFanPlugin.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Plugins/PluginSysInfo/SysInfo.cpp b/Plugins/PluginSysInfo/SysInfo.cpp index b84673d0..8d1c79b7 100644 --- a/Plugins/PluginSysInfo/SysInfo.cpp +++ b/Plugins/PluginSysInfo/SysInfo.cpp @@ -16,28 +16,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginSysInfo/SysInfo.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ - - $Log: SysInfo.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message - - Revision 1.4 2004/07/11 17:10:42 rainy - The plugin is cleaned up correctly. - - Revision 1.3 2004/06/05 10:57:05 rainy - Added new interface. - Uses config parser. - - Revision 1.2 2002/12/23 14:24:46 rainy - Added secondary dns server return value. - - Revision 1.1 2002/07/01 15:36:03 rainy - Intial version - -*/ - #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Plugins/PluginWebParser/WebParser.cpp b/Plugins/PluginWebParser/WebParser.cpp index 4306d823..b46a917a 100644 --- a/Plugins/PluginWebParser/WebParser.cpp +++ b/Plugins/PluginWebParser/WebParser.cpp @@ -1,23 +1,19 @@ - /* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginWebParser/WebParser.cpp,v 1.1.1.1 2005/07/10 18:51:06 rainy Exp $ +/* + Copyright (C) 2005 Kimmo Pekkola - $Log: WebParser.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:06 rainy - no message + 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. - Revision 1.4 2004/07/11 17:11:04 rainy - Added option to download files. - - Revision 1.3 2004/06/05 10:57:13 rainy - Added new interface. - Uses config parser. - - Revision 1.2 2003/03/22 20:38:59 rainy - Should work now. - - Revision 1.1 2003/03/14 10:19:51 rainy - Initial version + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Note: To compile this you need the PCRE library (http://www.pcre.org/). diff --git a/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp b/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp index 30d5b6fb..8f36652b 100644 --- a/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp +++ b/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp @@ -15,14 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - $Header: /home/cvsroot/Rainmeter/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp,v 1.1.1.1 2005/07/10 18:51:07 rainy Exp $ - - $Log: WindowMessagePlugin.cpp,v $ - Revision 1.1.1.1 2005/07/10 18:51:07 rainy - no message - -*/ #pragma warning(disable: 4786) #pragma warning(disable: 4996) diff --git a/Rainmeter.sln b/Rainmeter.sln index 9ff44277..cb83fb09 100644 --- a/Rainmeter.sln +++ b/Rainmeter.sln @@ -1,19 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\Application.vcproj", "{AD74F5C2-EF08-42B6-88F3-A840DCA4D7E5}" ProjectSection(ProjectDependencies) = postProject - {F6803AC5-272F-402B-9CA0-DEF8A3D83D30} = {F6803AC5-272F-402B-9CA0-DEF8A3D83D30} - {E4646B24-6882-465E-BAFB-76862B7EBDC2} = {E4646B24-6882-465E-BAFB-76862B7EBDC2} - {0FE204A1-85F6-4F56-A7AD-45A2039F523A} = {0FE204A1-85F6-4F56-A7AD-45A2039F523A} - {2699CA81-6ED5-4EDB-A018-3C9C81CEE7D4} = {2699CA81-6ED5-4EDB-A018-3C9C81CEE7D4} - {1A8E5D4B-10CB-4786-AA47-4FFC5AB51768} = {1A8E5D4B-10CB-4786-AA47-4FFC5AB51768} - {B56F0A33-E1A4-4929-AD5B-3B46CC9D8FAE} = {B56F0A33-E1A4-4929-AD5B-3B46CC9D8FAE} - {CEAF771F-C508-4364-BDF6-53A934AABD51} = {CEAF771F-C508-4364-BDF6-53A934AABD51} - {C119466B-4A25-408E-98EA-6428A2DC969D} = {C119466B-4A25-408E-98EA-6428A2DC969D} - {9ED9D4FA-BF62-4D96-89E3-037726C6FEA7} = {9ED9D4FA-BF62-4D96-89E3-037726C6FEA7} - {59F6400D-A550-4F99-85F7-4FEA5484724D} = {59F6400D-A550-4F99-85F7-4FEA5484724D} - {5A31C710-DE80-4654-9845-80A93E4AFEF7} = {5A31C710-DE80-4654-9845-80A93E4AFEF7} - {D76587CE-7D1B-48C9-83AB-91CA888E4562} = {D76587CE-7D1B-48C9-83AB-91CA888E4562} - {28E56A55-43A3-4926-A0B5-C5E056073519} = {28E56A55-43A3-4926-A0B5-C5E056073519} {BE3325E4-475C-40D0-9745-EE20BA3D8443} = {BE3325E4-475C-40D0-9745-EE20BA3D8443} EndProjectSection EndProject