Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release the HDC in wxGetSystemMetrics and wxSystemParametersInfo

Browse Source 
Use WindowHDC instead of calling ::GetDC() manually and never calling
::ReleaseDC() on it.

Closes https://github.com/wxWidgets/wxWidgets/pull/1437
This commit is contained in:
Maarten Bent
2019-07-21 23:55:02 +02:00
committed by Vadim Zeitlin
parent 211a42ef12
commit 37f806f1d6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/window.cpp
View File

@@ -4750,8 +4750,9 @@ int wxGetSystemMetrics(int nIndex, const wxWindow* win)
if ( s_pfnGetSystemMetricsForDpi )
{
const int y = ::GetDeviceCaps(::GetDC(tlw->GetHWND()), LOGPIXELSY);
return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)y);
WindowHDC hdc(tlw->GetHWND());
const int dpi = ::GetDeviceCaps(hdc, LOGPIXELSY);
return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
}
}
#else
@@ -4782,8 +4783,9 @@ bool wxSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWi
if ( s_pfnSystemParametersInfoForDpi )
{
const int y = ::GetDeviceCaps(::GetDC(tlw->GetHWND()), LOGPIXELSY);
if ( s_pfnSystemParametersInfoForDpi(uiAction, uiParam, pvParam, fWinIni, y) == TRUE )
WindowHDC hdc(tlw->GetHWND());
const int dpi = ::GetDeviceCaps(hdc, LOGPIXELSY);
if ( s_pfnSystemParametersInfoForDpi(uiAction, uiParam, pvParam, fWinIni, (UINT)dpi) == TRUE )
{
return true;
}