- Updated Power plugin and Process plugin to use new API

- Removed CSPluginTemplate
This commit is contained in:
Birunthan Mohanathas 2011-12-30 16:24:22 +00:00
parent 7b3b0277ec
commit e8b89aadfa
3 changed files with 188 additions and 340 deletions

View File

@ -69,14 +69,6 @@ enum RMGTYPE
// //
#ifndef LIBRARY_EXPORTS #ifndef LIBRARY_EXPORTS
enum LOGLEVEL
{
LOG_ERROR = 1,
LOG_WARNING = 2,
LOG_NOTICE = 3,
LOG_DEBUG = 4
};
__inline LPCWSTR RmReadPath(void* rm, LPCWSTR option, LPCWSTR defValue) __inline LPCWSTR RmReadPath(void* rm, LPCWSTR option, LPCWSTR defValue)
{ {
LPCWSTR relativePath = RmReadString(rm, option, defValue, TRUE); LPCWSTR relativePath = RmReadString(rm, option, defValue, TRUE);

View File

@ -17,13 +17,12 @@
*/ */
#include <windows.h> #include <windows.h>
#include <math.h>
#include <map>
#include <string>
#include <time.h>
#include <Powrprof.h> #include <Powrprof.h>
#include <time.h>
#include <errno.h>
#include <crtdbg.h>
#include "../../Library/RawString.h"
#include "../../Library/Export.h" // Rainmeter's exported functions #include "../../Library/Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point #include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
typedef struct _PROCESSOR_POWER_INFORMATION typedef struct _PROCESSOR_POWER_INFORMATION
@ -36,20 +35,7 @@ typedef struct _PROCESSOR_POWER_INFORMATION
ULONG CurrentIdleState; ULONG CurrentIdleState;
} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
typedef LONG (WINAPI *FPCALLNTPOWERINFORMATION)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); enum MeasureType
/* The exported functions */
extern "C"
{
__declspec( dllexport ) UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id);
__declspec( dllexport ) void Finalize(HMODULE instance, UINT id);
__declspec( dllexport ) LPCTSTR GetString(UINT id, UINT flags);
__declspec( dllexport ) double Update2(UINT id);
__declspec( dllexport ) UINT GetPluginVersion();
__declspec( dllexport ) LPCTSTR GetPluginAuthor();
}
enum POWER_STATE
{ {
POWER_UNKNOWN, POWER_UNKNOWN,
POWER_ACLINE, POWER_ACLINE,
@ -61,272 +47,187 @@ enum POWER_STATE
POWER_HZ POWER_HZ
}; };
std::map<UINT, POWER_STATE> g_States; struct MeasureData
std::map<UINT, std::wstring> g_Formats; {
HINSTANCE hDLL = NULL; MeasureType type;
int g_Instances, g_NumOfProcessors = 0; CRawString format;
FPCALLNTPOWERINFORMATION fpCallNtPowerInformation = NULL;
MeasureData() : type(POWER_UNKNOWN) {}
};
UINT g_NumOfProcessors = 0;
void NullCRTInvalidParameterHandler(const wchar_t* expression, const wchar_t* function, const wchar_t* file, unsigned int line, uintptr_t pReserved) void NullCRTInvalidParameterHandler(const wchar_t* expression, const wchar_t* function, const wchar_t* file, unsigned int line, uintptr_t pReserved)
{ {
// Do nothing. // Do nothing.
} }
/* PLUGIN_EXPORT void Initialize(void** data)
This function is called when the measure is initialized. {
The function must return the maximum value that can be measured. MeasureData* measure = new MeasureData;
The return value can also be 0, which means that Rainmeter will *data = measure;
track the maximum value automatically. The parameters for this
function are:
instance The instance of this DLL if (!g_NumOfProcessors)
iniFile The name of the ini-file (usually Rainmeter.ini)
section The name of the section in the ini-file for this measure
id The identifier for the measure. This is used to identify the measures that use the same plugin.
*/
UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
{ {
g_Instances++; SYSTEM_INFO si;
if (hDLL == NULL) GetSystemInfo(&si);
{ g_NumOfProcessors = (UINT)si.dwNumberOfProcessors;
hDLL = LoadLibrary(L"powrprof.dll");
if (hDLL)
{
fpCallNtPowerInformation = (FPCALLNTPOWERINFORMATION)GetProcAddress(hDLL, "CallNtPowerInformation");
} }
} }
POWER_STATE powerState = POWER_UNKNOWN; PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
{
MeasureData* measure = (MeasureData*)data;
SYSTEM_INFO systemInfo = {0}; LPCWSTR value = RmReadString(rm, L"PowerState", L"");
GetSystemInfo(&systemInfo); if (_wcsicmp(L"ACLINE", value) == 0)
g_NumOfProcessors = (int)systemInfo.dwNumberOfProcessors; {
measure->type = POWER_ACLINE;
*maxValue = 1.0;
}
else if (_wcsicmp(L"STATUS", value) == 0)
{
measure->type = POWER_STATUS;
*maxValue = 4.0;
}
else if (_wcsicmp(L"STATUS2", value) == 0)
{
measure->type = POWER_STATUS2;
*maxValue = 255.0;
}
else if (_wcsicmp(L"LIFETIME", value) == 0)
{
measure->type= POWER_LIFETIME;
/* Read our own settings from the ini-file */ value = RmReadString(rm, L"Format", L"%H:%M");
LPCTSTR type = ReadConfigString(section, L"PowerState", L""); measure->format = value;
if (type)
{
if (_wcsicmp(L"ACLINE", type) == 0)
{
powerState = POWER_ACLINE;
}
else if (_wcsicmp(L"STATUS", type) == 0)
{
powerState = POWER_STATUS;
}
else if (_wcsicmp(L"STATUS2", type) == 0)
{
powerState = POWER_STATUS2;
}
else if (_wcsicmp(L"LIFETIME", type) == 0)
{
powerState= POWER_LIFETIME;
LPCTSTR format = ReadConfigString(section, L"Format", L"%H:%M"); SYSTEM_POWER_STATUS sps;
if (format) if (GetSystemPowerStatus(&sps))
{ {
g_Formats[id] = format; *maxValue = sps.BatteryFullLifeTime;
} }
} }
else if (_wcsicmp(L"MHZ", type) == 0) else if (_wcsicmp(L"MHZ", value) == 0)
{ {
powerState= POWER_MHZ; measure->type = POWER_MHZ;
} }
else if (_wcsicmp(L"HZ", type) == 0) else if (_wcsicmp(L"HZ", value) == 0)
{ {
powerState= POWER_HZ; measure->type = POWER_HZ;
} }
else if (_wcsicmp(L"PERCENT", type) == 0) else if (_wcsicmp(L"PERCENT", value) == 0)
{ {
powerState = POWER_PERCENT; measure->type = POWER_PERCENT;
*maxValue = 100.0;
}
} }
g_States[id] = powerState; PLUGIN_EXPORT double Update(void* data)
} {
MeasureData* measure = (MeasureData*)data;
switch(powerState) SYSTEM_POWER_STATUS sps;
if (GetSystemPowerStatus(&sps))
{
switch (measure->type)
{ {
case POWER_ACLINE: case POWER_ACLINE:
return 1; return sps.ACLineStatus == 1 ? 1.0 : 0.0;
case POWER_STATUS: case POWER_STATUS:
return 4; if (sps.BatteryFlag & 128)
case POWER_STATUS2:
return 255;
case POWER_LIFETIME:
{ {
SYSTEM_POWER_STATUS status; return 0.0; // No battery
if (GetSystemPowerStatus(&status))
{
return status.BatteryFullLifeTime;
} }
else if (sps.BatteryFlag & 8)
{
return 1.0; // Charging
} }
break; else if (sps.BatteryFlag & 4)
{
case POWER_PERCENT: return 2.0; // Critical
return 100;
} }
else if (sps.BatteryFlag & 2)
return 0; {
return 3.0; // Low
} }
else if (sps.BatteryFlag & 1)
/*
This function is called when new value should be measured.
The function returns the new value.
*/
double Update2(UINT id)
{ {
SYSTEM_POWER_STATUS status; return 4.0; // High
if (GetSystemPowerStatus(&status))
{
std::map<UINT, POWER_STATE>::iterator i = g_States.find(id);
if (i != g_States.end())
{
switch ((*i).second)
{
case POWER_ACLINE:
return status.ACLineStatus == 1 ? 1 : 0;
case POWER_STATUS:
if (status.BatteryFlag & 128)
{
return 0; // No battery
}
else if (status.BatteryFlag & 8)
{
return 1; // Charging
}
else if (status.BatteryFlag & 4)
{
return 2; // Critical
}
else if (status.BatteryFlag & 2)
{
return 3; // Low
}
else if (status.BatteryFlag & 1)
{
return 4; // High
} }
break; break;
case POWER_STATUS2: case POWER_STATUS2:
return status.BatteryFlag; return sps.BatteryFlag;
case POWER_LIFETIME: case POWER_LIFETIME:
return status.BatteryLifeTime; return sps.BatteryLifeTime;
case POWER_PERCENT: case POWER_PERCENT:
return status.BatteryLifePercent > 100 ? 100 : status.BatteryLifePercent; return sps.BatteryLifePercent == 255 ? 100.0 : sps.BatteryLifePercent;
case POWER_MHZ: case POWER_MHZ:
case POWER_HZ: case POWER_HZ:
if (fpCallNtPowerInformation && g_NumOfProcessors > 0) if (g_NumOfProcessors > 0)
{ {
PROCESSOR_POWER_INFORMATION* ppi = new PROCESSOR_POWER_INFORMATION[g_NumOfProcessors]; PROCESSOR_POWER_INFORMATION* ppi = new PROCESSOR_POWER_INFORMATION[g_NumOfProcessors];
memset(ppi, 0, sizeof(PROCESSOR_POWER_INFORMATION) * g_NumOfProcessors); memset(ppi, 0, sizeof(PROCESSOR_POWER_INFORMATION) * g_NumOfProcessors);
fpCallNtPowerInformation(ProcessorInformation, NULL, 0, ppi, sizeof(PROCESSOR_POWER_INFORMATION) * g_NumOfProcessors); CallNtPowerInformation(ProcessorInformation, NULL, 0, ppi, sizeof(PROCESSOR_POWER_INFORMATION) * g_NumOfProcessors);
double value = ((*i).second == POWER_MHZ) ? ppi[0].CurrentMhz : ppi[0].CurrentMhz * 1000000.0; double value = (measure->type == POWER_MHZ) ? ppi[0].CurrentMhz : ppi[0].CurrentMhz * 1000000.0;
delete [] ppi; delete [] ppi;
return value; return value;
} }
} }
} }
return 0.0;
} }
return 0; PLUGIN_EXPORT LPCWSTR GetString(void* data)
}
/*
This function is called when the value should be
returned as a string.
*/
LPCTSTR GetString(UINT id, UINT flags)
{ {
static WCHAR buffer[128]; static WCHAR buffer[128];
std::map<UINT, POWER_STATE>::iterator i = g_States.find(id); MeasureData* measure = (MeasureData*)data;
if (i != g_States.end())
if (measure->type == POWER_LIFETIME)
{ {
if ((*i).second == POWER_LIFETIME) SYSTEM_POWER_STATUS sps;
{ if (GetSystemPowerStatus(&sps))
SYSTEM_POWER_STATUS status;
if (GetSystemPowerStatus(&status))
{ {
// Change it to time string // Change it to time string
if (status.BatteryLifeTime == -1) if (sps.BatteryLifeTime == -1)
{ {
return L"Unknown"; return L"Unknown";
} }
else else
{
std::map<UINT, std::wstring>::iterator iter = g_Formats.find(id);
if (iter != g_Formats.end())
{ {
tm time = {0}; tm time = {0};
time.tm_sec = status.BatteryLifeTime % 60; time.tm_sec = sps.BatteryLifeTime % 60;
time.tm_min = (status.BatteryLifeTime / 60) % 60; time.tm_min = (sps.BatteryLifeTime / 60) % 60;
time.tm_hour = status.BatteryLifeTime / 60 / 60; time.tm_hour = sps.BatteryLifeTime / 60 / 60;
_invalid_parameter_handler oldHandler = _set_invalid_parameter_handler(NullCRTInvalidParameterHandler); _invalid_parameter_handler oldHandler = _set_invalid_parameter_handler(NullCRTInvalidParameterHandler);
_CrtSetReportMode(_CRT_ASSERT, 0); _CrtSetReportMode(_CRT_ASSERT, 0);
errno = 0; errno = 0;
wcsftime(buffer, 128, (*iter).second.c_str(), &time); wcsftime(buffer, 128, measure->format.c_str(), &time);
if (errno == EINVAL) if (errno == EINVAL)
{ {
buffer[0] = L'\0'; buffer[0] = L'\0';
} }
_set_invalid_parameter_handler(oldHandler); _set_invalid_parameter_handler(oldHandler);
}
else
{
wsprintf(buffer, L"%i:%02i:%02i", status.BatteryLifeTime / 60 / 60, (status.BatteryLifeTime / 60) % 60, status.BatteryLifeTime % 60);
}
return buffer; return buffer;
} }
} }
} }
}
return NULL; return NULL;
} }
/* PLUGIN_EXPORT void Finalize(void* data)
If the measure needs to free resources before quitting.
The plugin can export Finalize function, which is called
when Rainmeter quits (or refreshes).
*/
void Finalize(HMODULE instance, UINT id)
{ {
std::map<UINT, POWER_STATE>::iterator i = g_States.find(id); MeasureData* measure = (MeasureData*)data;
if (i != g_States.end()) delete measure;
{
g_States.erase(i);
}
std::map<UINT, std::wstring>::iterator i2 = g_Formats.find(id);
if (i2 != g_Formats.end())
{
g_Formats.erase(i2);
}
g_Instances--;
if (hDLL != NULL && g_Instances == 0)
{
FreeLibrary(hDLL);
hDLL = NULL;
fpCallNtPowerInformation = NULL;
}
}
UINT GetPluginVersion()
{
return 1004;
}
LPCTSTR GetPluginAuthor()
{
return L"Rainy (rainy@iki.fi)";
} }

View File

@ -18,117 +18,72 @@
#include <windows.h> #include <windows.h>
#include <Psapi.h> #include <Psapi.h>
#include <string> #include <algorithm>
#include <map> #include <vector>
#include "../../Library/RawString.h"
#include "../../Library/Export.h" // Rainmeter's exported functions #include "../../Library/Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point #include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"
{
__declspec(dllexport) UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id);
__declspec(dllexport) void Finalize(HMODULE instance, UINT id);
__declspec(dllexport) UINT Update(UINT id);
__declspec(dllexport) UINT GetPluginVersion();
__declspec(dllexport) LPCTSTR GetPluginAuthor();
}
struct MeasureData struct MeasureData
{ {
std::wstring processName; CRawString processName;
bool isRunning; bool isRunning;
MeasureData() : isRunning(false) {} MeasureData() : isRunning(false) {}
}; };
static std::map<UINT, MeasureData> g_Values;
static UINT g_UpdateCount = 0; static UINT g_UpdateCount = 0;
static std::vector<MeasureData*> g_Measures;
void CheckProcesses(); void CheckProcesses();
/* PLUGIN_EXPORT void Initialize(void** data)
This function is called when the measure is initialized.
The function must return the maximum value that can be measured.
The return value can also be 0, which means that Rainmeter will
track the maximum value automatically. The parameters for this
function are:
instance The instance of this DLL
iniFile The name of the ini-file (usually Rainmeter.ini)
section The name of the section in the ini-file for this measure
id The identifier for the measure. This is used to identify the measures that use the same plugin.
*/
UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
{ {
MeasureData data; MeasureData* measure = new MeasureData;
g_Measures.push_back(measure);
const WCHAR* value = ReadConfigString(section, L"ProcessName", L""); *data = measure;
if (*value)
{
data.processName = value;
g_Values[id] = std::move(data);
} }
return 1; PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
{
MeasureData* measure = (MeasureData*)data;
LPCWSTR value = RmReadString(rm, L"ProcessName", L"");
measure->processName = value;
} }
/* PLUGIN_EXPORT double Update(void* data)
This function is called when new value should be measured.
The function returns the new value.
*/
UINT Update(UINT id)
{ {
UINT result = 0; MeasureData* measure = (MeasureData*)data;
std::map<UINT, MeasureData>::const_iterator iter = g_Values.find(id);
if (iter != g_Values.end())
{
// Updates the measure only once per combined updates of all measures // Updates the measure only once per combined updates of all measures
++g_UpdateCount; ++g_UpdateCount;
if (g_UpdateCount >= g_Values.size()) if (g_UpdateCount >= g_Measures.size())
{ {
CheckProcesses(); CheckProcesses();
g_UpdateCount = 0; g_UpdateCount = 0;
} }
result = (UINT)(*iter).second.isRunning; return (double)measure->isRunning;
} }
return result; PLUGIN_EXPORT void Finalize(void* data)
} {
MeasureData* measure = (MeasureData*)data;
std::vector<MeasureData*>::iterator iter = std::find(g_Measures.begin(), g_Measures.end(), measure);
g_Measures.erase(iter);
/* delete measure;
If the measure needs to free resources before quitting.
The plugin can export Finalize function, which is called
when Rainmeter quits (or refreshes).
*/
void Finalize(HMODULE instance, UINT id)
{
std::map<UINT, MeasureData>::iterator iter = g_Values.find(id);
if (iter != g_Values.end())
{
g_Values.erase(iter);
}
}
UINT GetPluginVersion()
{
return 1000;
}
LPCTSTR GetPluginAuthor()
{
return L"Birunthan Mohanathas (poiru.net)";
} }
void CheckProcesses() void CheckProcesses()
{ {
// Set everything to false // Set everything to false
std::map<UINT, MeasureData>::iterator iter = g_Values.begin(); std::vector<MeasureData*>::iterator iter = g_Measures.begin();
for ( ; iter != g_Values.end(); ++iter) for ( ; iter != g_Measures.end(); ++iter)
{ {
(*iter).second.isRunning = false; (*iter)->isRunning = false;
} }
int bufSize = 256; int bufSize = 256;
@ -151,12 +106,12 @@ void CheckProcesses()
WCHAR buffer[MAX_PATH]; WCHAR buffer[MAX_PATH];
if (GetModuleBaseName(hProcess, NULL, buffer, _countof(buffer))) if (GetModuleBaseName(hProcess, NULL, buffer, _countof(buffer)))
{ {
iter = g_Values.begin(); iter = g_Measures.begin();
for ( ; iter != g_Values.end(); ++iter) for ( ; iter != g_Measures.end(); ++iter)
{ {
if (_wcsicmp(buffer, (*iter).second.processName.c_str()) == 0) if (_wcsicmp(buffer, (*iter)->processName.c_str()) == 0)
{ {
(*iter).second.isRunning = true; (*iter)->isRunning = true;
} }
} }
} }