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

Additional change for r1183.

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-02-15 15:23:28 +00:00
parent 71402a8d48
commit cc211053be
2 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Rainmeter.cpp
View File

@ -57,7 +57,7 @@ int RainmeterMain(HINSTANCE hInstance, LPWSTR cmdLine)
{ {
COPYDATASTRUCT cds; COPYDATASTRUCT cds;
if (cmdLine && cmdLine[0] == L'!') if (cmdLine[0] == L'!')
{ {
// Deliver bang to existing Rainmeter instance // Deliver bang to existing Rainmeter instance
cds.dwData = 1; cds.dwData = 1;
@ -84,6 +84,14 @@ int RainmeterMain(HINSTANCE hInstance, LPWSTR cmdLine)
} }
} }
if (cmdLine[0] == L'!' &&
_wcsicmp(L"!RainmeterQuit", cmdLine) != 0 &&
_wcsicmp(L"!Quit", cmdLine) != 0)
{
MessageBox(NULL, L"Unable to send bang: Rainmeter is not running.", L"Rainmeter", MB_OK | MB_TOPMOST | MB_ICONERROR);
return 1;
}
// Avoid loading a dll from current directory // Avoid loading a dll from current directory
SetDllDirectory(L""); SetDllDirectory(L"");

57
Plugins/PluginRecycleManager/RecycleManager.cpp
View File

@ -35,7 +35,12 @@ struct MeasureData
struct BinData struct BinData
{ {
ULONGLONG lastWrite; union
{
ULONGLONG lastWrite;
UINT lastCount;
};
HANDLE directory; HANDLE directory;
WCHAR drive; WCHAR drive;
bool isFAT; bool isFAT;
@ -129,24 +134,43 @@ PLUGIN_EXPORT double Update(void* data)
WCHAR* pos = wcschr(buffer, data.drive); WCHAR* pos = wcschr(buffer, data.drive);
if (pos != NULL) if (pos != NULL)
{ {
if (data.lastWrite != -1) if (data.isFAT)
{ {
if (data.isFAT) // FAT/FAT32 doesn't update directory last write time.
// Use directory content count instead.
WCHAR filter[] = L"\0:\\$RECYCLE.BIN\\*";
WCHAR filterXP[] = L"\0:\\RECYCLED\\*";
filter[0] = *pos;
filterXP[0] = *pos;
WIN32_FIND_DATA fd;
HANDLE hSearch = FindFirstFile(g_IsXP ? filterXP : filter, &fd);
if (hSearch != INVALID_HANDLE_VALUE)
{ {
// FAT/FAT32 doesn't update directory last write time. UINT count = 0;
// TODO: Fix me? do
}
else
{
ULONGLONG lastWrite;
GetFileTime(data.directory, NULL, NULL, (FILETIME*)&lastWrite);
if (data.lastWrite != lastWrite)
{ {
data.lastWrite = lastWrite; ++count;
}
while (FindNextFile(hSearch, &fd));
if (count != data.lastCount)
{
data.lastCount = count;
changed = true; changed = true;
} }
} }
} }
else if (data.directory)
{
ULONGLONG lastWrite;
GetFileTime(data.directory, NULL, NULL, (FILETIME*)&lastWrite);
if (data.lastWrite != lastWrite)
{
data.lastWrite = lastWrite;
changed = true;
}
}
*pos = DRIVE_HANDLED; *pos = DRIVE_HANDLED;
++iter; ++iter;
@ -178,8 +202,6 @@ PLUGIN_EXPORT double Update(void* data)
data.directory = GetRecycleBinHandle(buffer[i], data.isFAT); data.directory = GetRecycleBinHandle(buffer[i], data.isFAT);
} }
data.lastWrite = (data.directory || data.isFAT) ? 0 : -1;
g_BinData.push_back(data); g_BinData.push_back(data);
} }
} }
@ -307,12 +329,15 @@ HANDLE GetRecycleBinHandle(WCHAR drive, bool& isFAT)
return NULL; return NULL;
} }
isFAT = true;
if (wcscmp(filesystem, L"NTFS") == 0) if (wcscmp(filesystem, L"NTFS") == 0)
{ {
isFAT = false; isFAT = false;
} }
else if (wcscmp(filesystem, L"FAT") != 0 && wcscmp(filesystem, L"FAT32")) else if (wcscmp(filesystem, L"FAT") == 0 || wcscmp(filesystem, L"FAT32") == 0)
{
isFAT = true;
}
else
{ {
RmLog(LOG_ERROR, L"RecycleManager.dll: Unsupported filesystem"); RmLog(LOG_ERROR, L"RecycleManager.dll: Unsupported filesystem");
return NULL; return NULL;