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

WebParser: Changed FinishAction to be sent the !bang to the appropriate skin without #CURRENTCONFIG#.

Browse Source
This commit is contained in:
spx 2011-06-04 08:39:05 +00:00
parent 0841328ea0
commit 62c0268fef
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Plugins/PluginWebParser/WebParser.cpp
View File

@ -534,7 +534,7 @@ bool BelongToSameProcess(HWND wnd)
return (procId == GetCurrentProcessId()); return (procId == GetCurrentProcessId());
} }
HWND FindMeterWindow(HWND parent = NULL) HWND FindMeterWindow(HWND parent)
{ {
HWND wnd = NULL; HWND wnd = NULL;
@ -546,22 +546,22 @@ HWND FindMeterWindow(HWND parent = NULL)
} }
} }
// for backward compatibility (0.14 - 1.1) return NULL;
if (!parent) }
HWND FindMeterWindow(const std::wstring& iniFile)
{
std::wstring str = PluginBridge(L"getconfig", iniFile.c_str());
if (!str.empty())
{ {
while (parent = FindWindowEx(NULL, parent, L"Progman", NULL)) str = PluginBridge(L"getwindow", str.c_str());
if (str != L"error")
{ {
if (wnd = FindMeterWindow(parent)) return (HWND)UlongToPtr(wcstoul(str.c_str(), NULL, 10));
{
if (BelongToSameProcess(wnd))
{
return wnd;
}
}
} }
} }
return NULL; return FindMeterWindow(NULL); // Use old way to find
} }
/* /*
@ -1117,7 +1117,7 @@ void ParseData(UrlData* urlData, LPCSTR parseData)
{ {
if (!urlData->finishAction.empty()) if (!urlData->finishAction.empty())
{ {
HWND wnd = FindMeterWindow(); HWND wnd = FindMeterWindow(urlData->iniFile);
if (wnd != NULL) if (wnd != NULL)
{ {
@ -1424,7 +1424,7 @@ unsigned __stdcall NetworkDownloadThreadProc(void* pParam)
if (!urlData->finishAction.empty()) if (!urlData->finishAction.empty())
{ {
HWND wnd = FindMeterWindow(); HWND wnd = FindMeterWindow(urlData->iniFile);
if (wnd != NULL) if (wnd != NULL)
{ {