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

Minor change.

Browse Source
This commit is contained in:
spx 2010-11-28 22:20:27 +00:00
parent 62519fbdd5
commit 19294c4339
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Library/MeasureDiskSpace.cpp
View File

@ -58,9 +58,8 @@ bool CMeasureDiskSpace::Update()
if (!m_Drive.empty()) if (!m_Drive.empty())
{ {
BOOL sizeResult = FALSE, labelResult = FALSE; BOOL sizeResult = FALSE;
ULARGE_INTEGER i64TotalBytes, i64FreeBytes; ULARGE_INTEGER i64TotalBytes, i64FreeBytes;
WCHAR volumeName[MAX_PATH] = {0};
UINT type = GetDriveType(m_Drive.c_str()); UINT type = GetDriveType(m_Drive.c_str());
if (type != DRIVE_NO_ROOT_DIR) if (type != DRIVE_NO_ROOT_DIR)
@ -75,22 +74,11 @@ bool CMeasureDiskSpace::Update()
sizeResult = GetDiskFreeSpaceEx(m_Drive.c_str(), &i64FreeBytesToCaller, &i64TotalBytes, &i64FreeBytes); sizeResult = GetDiskFreeSpaceEx(m_Drive.c_str(), &i64FreeBytesToCaller, &i64TotalBytes, &i64FreeBytes);
SetErrorMode(oldMode); // Reset SetErrorMode(oldMode); // Reset
} }
if (m_Label)
{
if (!m_IgnoreRemovable || type != DRIVE_REMOVABLE) // Ignore removable drives
{
UINT oldMode = SetErrorMode(0);
SetErrorMode(oldMode | SEM_FAILCRITICALERRORS); // Prevent the system from displaying message box
labelResult = GetVolumeInformation(m_Drive.c_str(), volumeName, MAX_PATH, NULL, NULL, NULL, NULL, 0);
SetErrorMode(oldMode); // Reset
}
}
} }
if (sizeResult) if (sizeResult)
{ {
m_Value = (double)((m_Total) ? i64TotalBytes.QuadPart : i64FreeBytes.QuadPart); m_Value = (double)((m_Total) ? i64TotalBytes : i64FreeBytes).QuadPart;
if (i64TotalBytes.QuadPart != m_OldTotalBytes) if (i64TotalBytes.QuadPart != m_OldTotalBytes)
{ {
@ -106,18 +94,29 @@ bool CMeasureDiskSpace::Update()
m_OldTotalBytes = 0; m_OldTotalBytes = 0;
} }
if (labelResult) if (m_Label)
{ {
m_LabelName = volumeName; BOOL labelResult = FALSE;
WCHAR volumeName[MAX_PATH] = {0};
if (type != DRIVE_NO_ROOT_DIR)
{
if (!m_IgnoreRemovable || type != DRIVE_REMOVABLE) // Ignore removable drives
{
UINT oldMode = SetErrorMode(0);
SetErrorMode(oldMode | SEM_FAILCRITICALERRORS); // Prevent the system from displaying message box
labelResult = GetVolumeInformation(m_Drive.c_str(), volumeName, MAX_PATH, NULL, NULL, NULL, NULL, 0);
SetErrorMode(oldMode); // Reset
} }
else }
{
if (m_Label || !m_LabelName.empty()) m_LabelName = (labelResult) ? volumeName : L"";
}
else if (!m_LabelName.empty())
{ {
m_LabelName = L""; m_LabelName = L"";
} }
} }
}
return PostUpdate(); return PostUpdate();
} }