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] Fixed minor memory leak.

Browse Source 
- [WebParser] Modified the routine which finds the Rainmeter window.
This commit is contained in:
spx 2010-08-24 20:23:22 +00:00
parent 877d4a3f4d
commit 5b7a985a7e
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Plugins/PluginWebParser/WebParser.cpp
View File

@ -159,41 +159,42 @@ std::string ConvertAsciiToUTF8(LPCSTR str, int codepage)
return szUTF8; return szUTF8;
} }
HWND FindMeterWindow() bool BelongToSameProcess(HWND wnd)
{ {
HWND wnd = FindWindow(L"RainmeterMeterWindow", NULL); DWORD procId = 0;
if (wnd == NULL) GetWindowThreadProcessId(wnd, &procId);
return (procId == GetCurrentProcessId());
}
HWND FindMeterWindow(HWND parent = NULL)
{ {
// Check if all windows are "On Desktop" HWND wnd = NULL;
HWND ProgmanHwnd = FindWindow(L"Progman", L"Program Manager");
if (ProgmanHwnd) while (wnd = FindWindowEx(parent, wnd, L"RainmeterMeterWindow", NULL))
{ {
wnd = FindWindowEx(ProgmanHwnd, NULL, L"RainmeterMeterWindow", NULL); if (BelongToSameProcess(wnd))
if (wnd == NULL)
{ {
ProgmanHwnd = FindWindowEx(FindWindowEx(ProgmanHwnd, NULL, L"SHELLDLL_DefView", L""), NULL, L"SysListView32", L"FolderView"); return wnd;
if (ProgmanHwnd) }
}
// for backward compatibility (0.14 - 1.1)
if (!parent)
{ {
wnd = FindWindowEx(ProgmanHwnd, NULL, L"RainmeterMeterWindow", NULL); while (parent = FindWindowEx(NULL, parent, L"Progman", NULL))
{
if (wnd = FindMeterWindow(parent))
{
if (BelongToSameProcess(wnd))
{
return wnd;
}
} }
} }
} }
if (wnd == NULL) return NULL;
{
HWND WorkerWHwnd = NULL;
while ((WorkerWHwnd = FindWindowEx(NULL, WorkerWHwnd, L"WorkerW", L"")) != NULL)
{
ProgmanHwnd = FindWindowEx(FindWindowEx(WorkerWHwnd, NULL, L"SHELLDLL_DefView", L""), NULL, L"SysListView32", L"FolderView");
if (ProgmanHwnd)
{
wnd = FindWindowEx(ProgmanHwnd, NULL, L"RainmeterMeterWindow", NULL);
break;
}
}
}
}
return wnd;
} }
/* /*
@ -617,6 +618,9 @@ void ParseData(UrlData* urlData, LPCSTR parseData)
} }
LeaveCriticalSection(&g_CriticalSection); LeaveCriticalSection(&g_CriticalSection);
} }
// Release memory used for the compiled pattern
pcre_free(re);
} }
else else
{ {