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

PowerPlugin could unload the powrprof.dll even if some other skin was still using it. Fixed.

Browse Source
This commit is contained in:
Kimmo Pekkola 2009-11-01 10:00:12 +00:00
parent dcebc3bebd
commit 5d3d148b46
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Plugins/PluginPower/PowerPlugin.cpp
View File

@ -64,6 +64,7 @@ enum POWER_STATE
std::map<UINT, POWER_STATE> g_States; std::map<UINT, POWER_STATE> g_States;
std::map<UINT, std::wstring> g_Formats; std::map<UINT, std::wstring> g_Formats;
HINSTANCE hDLL = NULL; HINSTANCE hDLL = NULL;
int g_Instances = 0;
FPCALLNTPOWERINFORMATION fpCallNtPowerInformation = NULL; FPCALLNTPOWERINFORMATION fpCallNtPowerInformation = NULL;
/* /*
@ -80,14 +81,15 @@ FPCALLNTPOWERINFORMATION fpCallNtPowerInformation = NULL;
*/ */
UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id) UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
{ {
if (hDLL == NULL) g_Instances++;
{ if (hDLL == NULL)
hDLL = LoadLibrary(L"powrprof.dll"); {
if (hDLL) hDLL = LoadLibrary(L"powrprof.dll");
{ if (hDLL)
fpCallNtPowerInformation = (FPCALLNTPOWERINFORMATION)GetProcAddress(hDLL, "CallNtPowerInformation"); {
} fpCallNtPowerInformation = (FPCALLNTPOWERINFORMATION)GetProcAddress(hDLL, "CallNtPowerInformation");
} }
}
POWER_STATE powerState = POWER_UNKNOWN; POWER_STATE powerState = POWER_UNKNOWN;
@ -285,10 +287,12 @@ void Finalize(HMODULE instance, UINT id)
g_Formats.erase(i2); g_Formats.erase(i2);
} }
if (hDLL != NULL) g_Instances--;
if (hDLL != NULL && g_Instances == 0)
{ {
FreeLibrary(hDLL); FreeLibrary(hDLL);
hDLL = NULL; hDLL = NULL;
fpCallNtPowerInformation = NULL;
} }
} }

2
revision-number.h
View File

@ -1,2 +1,2 @@
#pragma once #pragma once
const int revision_number = 302; const int revision_number = 304;