Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-14 21:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSDM][DESK] Fix GetDC/ReleaseDC error management (#2707)

Browse source 
## Purpose
[SYSDM]
- When closing System Properties page, log show
(win32ss/user/ntuser/windc.c:749) err: [00060138] GetDC() without ReleaseDC()!
because GetDC() is called (multiple times) without properly calling ReleaseDC() as required in order to release a device context.
- This module also lacks some error management in case null DC are provided (on error).
- LiveCD Userinit, based on SYSDM is affected too.

[DESK]
- Fix missing ReleaseDC related to the spectrum (color depth)

## Proposed changes
- ReleaseDC() added.
- Error management in case of null DC.
- Overall alignement of LiveCD Userinit and SYSDM.
This commit is contained in:
Kyle Katarn 2020-05-07 12:57:46 +02:00 • committed by GitHub
parent 9ca52142b6
commit d635ce0cc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 80 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

14
base/system/userinit/livecd.c
View file

@ -34,6 +34,9 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg)
COLORREF *pBits; COLORREF *pBits;
INT line, column; INT line, column;
if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL)
goto Cleanup;
ZeroMemory(pImgInfo, sizeof(*pImgInfo)); ZeroMemory(pImgInfo, sizeof(*pImgInfo));
ZeroMemory(&bmpi, sizeof(bmpi)); ZeroMemory(&bmpi, sizeof(bmpi));
@ -76,7 +79,7 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg)
g = GetGValue(Color) * alpha / 255; g = GetGValue(Color) * alpha / 255;
b = GetBValue(Color) * alpha / 255; b = GetBValue(Color) * alpha / 255;
*pBits++ = b | g << 8 | r << 16 | alpha << 24; *pBits++ = b | (g << 8) | (r << 16) | (alpha << 24);
} }
} }
@ -88,10 +91,11 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg)
} }
Cleanup: Cleanup:
DeleteObject(hMask); if (hMask != NULL) DeleteObject(hMask);
DeleteObject(hLogo); if (hLogo != NULL) DeleteObject(hLogo);
DeleteDC(hDCMask); if (hDCMask != NULL) DeleteDC(hDCMask);
DeleteDC(hDCLogo); if (hDCLogo != NULL) DeleteDC(hDCLogo);
if (hDC != NULL) ReleaseDC(hwndDlg, hDC);
} }

6
dll/cpl/desk/settings.c
View file

@ -5,7 +5,7 @@
* PURPOSE: Settings property page * PURPOSE: Settings property page
* *
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com) * PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
* Hervé Poussineau (hpoussin@reactos.org) * Hervé Poussineau (hpoussin@reactos.org)
*/ */
#include "desk.h" #include "desk.h"
@ -472,8 +472,12 @@ OnBPPChanged(IN HWND hwndDlg, IN PSETTINGS_DATA pData)
/* Show a new spectrum bitmap */ /* Show a new spectrum bitmap */
hSpectrumControl = GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM); hSpectrumControl = GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM);
hSpectrumDC = GetDC(hSpectrumControl); hSpectrumDC = GetDC(hSpectrumControl);
if (hSpectrumDC == NULL)
return;
GetClientRect(hSpectrumControl, &client); GetClientRect(hSpectrumControl, &client);
ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pData); ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pData);
ReleaseDC(hSpectrumControl, hSpectrumDC);
/* Find if new parameters are valid */ /* Find if new parameters are valid */
Current = pData->CurrentDisplayDevice->CurrentSettings; Current = pData->CurrentDisplayDevice->CurrentSettings;

115
dll/cpl/sysdm/general.c
View file

@ -69,22 +69,22 @@ static VOID InitLogo(HWND hwndDlg)
COLORREF *pBits; COLORREF *pBits;
INT line, column; INT line, column;
if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL)
goto Cleanup;
ZeroMemory(pImgInfo, sizeof(*pImgInfo)); ZeroMemory(pImgInfo, sizeof(*pImgInfo));
ZeroMemory(&bmpi, sizeof(bmpi)); ZeroMemory(&bmpi, sizeof(bmpi));
hLogo = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hLogo = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
hMask = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hMask = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
if (hLogo != NULL && hMask != NULL) if (hLogo != NULL && hMask != NULL)
{ {
GetObject(hLogo, sizeof(BITMAP), &logoBitmap); GetObject(hLogo, sizeof(logoBitmap), &logoBitmap);
GetObject(hMask, sizeof(BITMAP), &maskBitmap); GetObject(hMask, sizeof(maskBitmap), &maskBitmap);
if(logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth) if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth)
return; goto Cleanup;
pImgInfo->cxSource = logoBitmap.bmWidth;
pImgInfo->cySource = logoBitmap.bmHeight;
bmpi.bmiHeader.biSize = sizeof(BITMAPINFO); bmpi.bmiHeader.biSize = sizeof(BITMAPINFO);
bmpi.bmiHeader.biWidth = logoBitmap.bmWidth; bmpi.bmiHeader.biWidth = logoBitmap.bmWidth;
@ -94,17 +94,17 @@ static VOID InitLogo(HWND hwndDlg)
bmpi.bmiHeader.biCompression = BI_RGB; bmpi.bmiHeader.biCompression = BI_RGB;
bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight; bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight;
/* Create a premultiplied bitmap */
hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0); hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0);
if (!hAlphaLogo)
if(!hAlphaLogo) goto Cleanup;
return;
SelectObject(hDCLogo, hLogo); SelectObject(hDCLogo, hLogo);
SelectObject(hDCMask, hMask); SelectObject(hDCMask, hMask);
for(line = logoBitmap.bmHeight - 1; line >= 0; line--) for (line = logoBitmap.bmHeight - 1; line >= 0; line--)
{ {
for(column = 0; column < logoBitmap.bmWidth; column++) for (column = 0; column < logoBitmap.bmWidth; column++)
{ {
COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF; COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF;
COLORREF Color = GetPixel(hDCLogo, column, line); COLORREF Color = GetPixel(hDCLogo, column, line);
@ -114,22 +114,23 @@ static VOID InitLogo(HWND hwndDlg)
g = GetGValue(Color) * alpha / 255; g = GetGValue(Color) * alpha / 255;
b = GetBValue(Color) * alpha / 255; b = GetBValue(Color) * alpha / 255;
*pBits++ = b | g << 8 | r << 16 | alpha << 24; *pBits++ = b | (g << 8) | (r << 16) | (alpha << 24);
} }
} }
pImgInfo->hBitmap = hAlphaLogo;
pImgInfo->cxSource = logoBitmap.bmWidth;
pImgInfo->cySource = logoBitmap.bmHeight;
pImgInfo->iBits = logoBitmap.bmBitsPixel;
pImgInfo->iPlanes = logoBitmap.bmPlanes;
} }
pImgInfo->hBitmap = hAlphaLogo; Cleanup:
pImgInfo->cxSource = logoBitmap.bmWidth; if (hMask != NULL) DeleteObject(hMask);
pImgInfo->cySource = logoBitmap.bmHeight; if (hLogo != NULL) DeleteObject(hLogo);
pImgInfo->iBits = logoBitmap.bmBitsPixel; if (hDCMask != NULL) DeleteDC(hDCMask);
pImgInfo->iPlanes = logoBitmap.bmPlanes; if (hDCLogo != NULL) DeleteDC(hDCLogo);
if (hDC != NULL) ReleaseDC(hwndDlg, hDC);
DeleteObject(hLogo);
DeleteObject(hMask);
DeleteDC(hDCLogo);
DeleteDC(hDCMask);
} }
LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@ -145,19 +146,23 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
if (timerid == 0) if (timerid == 0)
{ {
HDC hCreditsDC, hLogoDC; HDC hCreditsDC, hLogoDC;
HFONT hFont; HDC hDC = GetDC(NULL);
HFONT hFont = NULL;
NONCLIENTMETRICS ncm; NONCLIENTMETRICS ncm;
RECT rcCredits; RECT rcCredits;
TCHAR szCredits[2048]; TCHAR szCredits[2048];
INT iDevsHeight; INT iDevsHeight;
top = 0; if (hDC == NULL)
goto Cleanup;
top = 0;
offset = 0; offset = 0;
hCreditsDC = CreateCompatibleDC(GetDC(NULL)); hCreditsDC = CreateCompatibleDC(hDC);
hLogoDC = CreateCompatibleDC(hCreditsDC); hLogoDC = CreateCompatibleDC(hCreditsDC);
if (hCreditsDC == NULL || hLogoDC == NULL) if (hCreditsDC == NULL || hLogoDC == NULL)
break; goto Cleanup;
SetRect(&rcCredits, 0, 0, 0, 0); SetRect(&rcCredits, 0, 0, 0, 0);
@ -165,6 +170,8 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0);
hFont = CreateFontIndirect(&ncm.lfMessageFont); hFont = CreateFontIndirect(&ncm.lfMessageFont);
if (!hFont)
goto Cleanup;
SelectObject(hCreditsDC, hFont); SelectObject(hCreditsDC, hFont);
LoadString(hApplet, IDS_DEVS, szCredits, sizeof(szCredits) / sizeof(TCHAR)); LoadString(hApplet, IDS_DEVS, szCredits, sizeof(szCredits) / sizeof(TCHAR));
@ -174,8 +181,8 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL); hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL);
if(!hCreditsBitmap) if (!hCreditsBitmap)
break; goto Cleanup;
SelectObject(hLogoDC, pImgInfo->hBitmap); SelectObject(hLogoDC, pImgInfo->hBitmap);
SelectObject(hCreditsDC, hCreditsBitmap); SelectObject(hCreditsDC, hCreditsBitmap);
@ -201,10 +208,13 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
AlphaBlend(hCreditsDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); AlphaBlend(hCreditsDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
AlphaBlend(hCreditsDC, 0, offset, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); AlphaBlend(hCreditsDC, 0, offset, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
DeleteDC(hLogoDC);
DeleteDC(hCreditsDC);
timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL); timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL);
Cleanup:
if (hFont != NULL) DeleteObject(hFont);
if (hLogoDC != NULL) DeleteDC(hLogoDC);
if (hCreditsDC != NULL) DeleteDC(hCreditsDC);
if (hDC != NULL) ReleaseDC(NULL, hDC);
} }
} }
break; break;
@ -213,18 +223,22 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
{ {
RECT rcCredits; RECT rcCredits;
HDC hDC = GetDC(hwnd); HDC hDC = GetDC(hwnd);
if (hDC != NULL)
GetClientRect(hwnd, &rcCredits); {
SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); GetClientRect(hwnd, &rcCredits);
FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
ReleaseDC(hwnd, hDC);
}
KillTimer(hwnd, timerid); KillTimer(hwnd, timerid);
DeleteObject(hCreditsBitmap); if (hCreditsBitmap != NULL)
InvalidateRect(hwnd, NULL, FALSE); DeleteObject(hCreditsBitmap);
top = 0; top = 0;
timerid = 0; timerid = 0;
} }
InvalidateRect(hwnd, NULL, FALSE);
break; break;
case WM_TIMER: case WM_TIMER:
top += ANIM_STEP; top += ANIM_STEP;
@ -233,13 +247,16 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
{ {
RECT rcCredits; RECT rcCredits;
HDC hDC = GetDC(hwnd); HDC hDC = GetDC(hwnd);
if (hDC != NULL)
GetClientRect(hwnd, &rcCredits); {
SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); GetClientRect(hwnd, &rcCredits);
FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
ReleaseDC(hwnd, hDC);
}
KillTimer(hwnd, timerid); KillTimer(hwnd, timerid);
DeleteObject(hCreditsBitmap); if (hCreditsBitmap != NULL)
DeleteObject(hCreditsBitmap);
top = 0; top = 0;
timerid = 0; timerid = 0;