chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Free disk space can be read from the removable drives too.

Browse Source 
Size and count were reversed in the recycle manager. Fixed.
This commit is contained in:
Kimmo Pekkola 2009-03-10 17:32:35 +00:00
parent d7bfbf386d
commit b4b2d3b9b0
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/MeasureDiskSpace.cpp
View File

@ -30,6 +30,8 @@
CMeasureDiskSpace::CMeasureDiskSpace(CMeterWindow* meterWindow) : CMeasure(meterWindow)
{
m_Total = false;
m_Label = false;
m_IgnoreRemovable = false;
}
/*
@ -55,7 +57,7 @@ bool CMeasureDiskSpace::Update()
ULARGE_INTEGER i64FreeBytesToCaller, i64TotalBytes, i64FreeBytes;
UINT type = GetDriveType(m_Drive.c_str());
if (type != DRIVE_CDROM && type != DRIVE_REMOVABLE) // Ignore CD-ROMS and removable drives
if (type != DRIVE_CDROM && (!m_IgnoreRemovable || type != DRIVE_REMOVABLE)) // Ignore CD-ROMS and removable drives
{
if(GetDiskFreeSpaceEx(m_Drive.c_str(), &i64FreeBytesToCaller, &i64TotalBytes, &i64FreeBytes))
{
@ -115,12 +117,13 @@ void CMeasureDiskSpace::ReadConfig(CConfigParser& parser, const WCHAR* section)
m_Drive = parser.ReadString(section, L"Drive", L"C:\\");
m_Total = (1 == parser.ReadInt(section, L"Total", 0));
m_Label = (1 == parser.ReadInt(section, L"Label", 0));
m_IgnoreRemovable = (1 == parser.ReadInt(section, L"IgnoreRemovable", 0));
// Set the m_MaxValue
ULARGE_INTEGER i64FreeBytesToCaller, i64TotalBytes, i64FreeBytes;
UINT type = GetDriveType(m_Drive.c_str());
if (type != DRIVE_CDROM && type != DRIVE_REMOVABLE) // Ignore CD-ROMS and removable drives
if (type != DRIVE_CDROM && (!m_IgnoreRemovable || type != DRIVE_REMOVABLE)) // Ignore CD-ROMS and removable drives
{
if(GetDiskFreeSpaceEx(m_Drive.c_str(), &i64FreeBytesToCaller, &i64TotalBytes, &i64FreeBytes))
{

1
Library/MeasureDiskSpace.h
View File

@ -36,6 +36,7 @@ private:
std::wstring m_LabelName;
bool m_Total;
bool m_Label;
bool m_IgnoreRemovable;
};
#endif

4
Plugins/PluginRecycleManager/RecycleManager.cpp
View File

@ -97,11 +97,11 @@ double Update2(UINT id)
RecycleBinInfo.cbSize = sizeof( RecycleBinInfo ); // Tell size of structure
SHQueryRecycleBin( L"C:", &RecycleBinInfo ); // Get recycle bin info
if (dataType == NUMRECYCLE)
if (dataType == SIZERECYCLE)
{
return (double)RecycleBinInfo.i64Size; // size in bytes
}
else if (dataType == SIZERECYCLE)
else if (dataType == NUMRECYCLE)
{
return (double)RecycleBinInfo.i64NumItems; // number of items in bin
}