Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-24 06:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[UXTHEME] -Fix some resource leaks.

Browse source 
svn path=/trunk/; revision=74411
This commit is contained in:
Giannis Adamopoulos 2017-04-26 13:55:19 +00:00
parent 403ef47169
commit 79aeba8939
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
reactos/dll/win32/uxtheme/themehooks.c
View file

@ -60,6 +60,8 @@ void ThemeDestroyWndContext(HWND hWnd)
if (pContext->hTabBackgroundBrush != NULL)
{
CloseThemeData(GetWindowTheme(hWnd));
DeleteObject(pContext->hTabBackgroundBrush);
pContext->hTabBackgroundBrush = NULL;
}
@ -281,7 +283,7 @@ ThemePostWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, ULONG_PTR
{
return OnPostWinPosChanged(hWnd, (WINDOWPOS*)lParam);
}
case WM_DESTROY:
case WM_NCDESTROY:
{
ThemeDestroyWndContext(hWnd);
return 0;
@ -304,10 +306,6 @@ HRESULT GetDiaogTextureBrush(HTHEME theme, HWND hwnd, HDC hdc, HBRUSH* result, B
HBITMAP hbmp;
RECT dummy, bmpRect;
BOOL hasImageAlpha;
//HTHEME theme = GetWindowTheme(hwnd);
theme = MSSTYLES_OpenThemeClass(ActiveThemeFile, NULL, L"TAB");
if (!theme)
return E_FAIL;
UXTHEME_LoadImage(theme, 0, TABP_BODY, 0, &dummy, FALSE, &hbmp, &bmpRect, &hasImageAlpha);
if (changeOrigin)
@ -384,7 +382,7 @@ ThemeDlgPostWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, ULONG_
HWND hwndTarget = (HWND)lParam;
HDC hdc = (HDC)wParam;
HBRUSH* phbrush = (HBRUSH*)ret;
HTHEME theme = GetWindowTheme ( hWnd );
HTHEME hTheme;
if (!IsAppThemed())
break;
@ -392,7 +390,14 @@ ThemeDlgPostWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, ULONG_
if (!IsThemeDialogTextureEnabled (hWnd))
break;
GetDiaogTextureBrush(theme, hwndTarget, hdc, phbrush, Msg != WM_CTLCOLORDLG);
hTheme = GetWindowTheme(hWnd);
if (!hTheme)
hTheme = OpenThemeData(hWnd, L"TAB");
if (!hTheme)
break;
GetDiaogTextureBrush(hTheme, hwndTarget, hdc, phbrush, Msg != WM_CTLCOLORDLG);
#if 1
{
@ -491,7 +496,7 @@ ThemeInitApiHook(UAPIHK State, PUSERAPIHOOK puah)
puah->DefWndProcArray.Size = UAHOWP_MAX_SIZE;
puah->WndProcArray.MsgBitArray = gabMSGPmessages;
puah->WndProcArray.Size = UAHOWP_MAX_SIZE;
puah->DlgProcArray.MsgBitArray = gabMSGPmessages;
puah->DlgProcArray.MsgBitArray = gabDLGPmessages;
puah->DlgProcArray.Size = UAHOWP_MAX_SIZE;
puah->SetWindowRgn = ThemeSetWindowRgn;