https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89860ab543994c4d91cd923d2beedba34db443b2
commit 89860ab543994c4d91cd923d2beedba34db443b2 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Wed Apr 21 18:11:17 2021 +0200 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Wed May 5 17:24:10 2021 +0200 [SYSDM][USERINIT] Rewrite a if-condition in order to fail early, and save one level of code indentation. --- base/system/userinit/livecd.c | 72 +++++++++++++++++++++---------------------- dll/cpl/sysdm/general.c | 72 +++++++++++++++++++++---------------------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/base/system/userinit/livecd.c b/base/system/userinit/livecd.c index e4940bcade0..40626609402 100644 --- a/base/system/userinit/livecd.c +++ b/base/system/userinit/livecd.c @@ -43,53 +43,53 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg) hLogo = (HBITMAP)LoadImageW(hInstance, MAKEINTRESOURCEW(IDB_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hMask = (HBITMAP)LoadImageW(hInstance, MAKEINTRESOURCEW(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - if (hLogo != NULL && hMask != NULL) - { - GetObject(hLogo, sizeof(logoBitmap), &logoBitmap); - GetObject(hMask, sizeof(maskBitmap), &maskBitmap); + if (hLogo == NULL || hMask == NULL) + goto Cleanup; - if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth) - goto Cleanup; + GetObject(hLogo, sizeof(logoBitmap), &logoBitmap); + GetObject(hMask, sizeof(maskBitmap), &maskBitmap); - bmpi.bmiHeader.biSize = sizeof(BITMAPINFO); - bmpi.bmiHeader.biWidth = logoBitmap.bmWidth; - bmpi.bmiHeader.biHeight = logoBitmap.bmHeight; - bmpi.bmiHeader.biPlanes = 1; - bmpi.bmiHeader.biBitCount = 32; - bmpi.bmiHeader.biCompression = BI_RGB; - bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight; + if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth) + goto Cleanup; - /* Create a premultiplied bitmap */ - hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0); - if (!hAlphaLogo) - goto Cleanup; + bmpi.bmiHeader.biSize = sizeof(BITMAPINFO); + bmpi.bmiHeader.biWidth = logoBitmap.bmWidth; + bmpi.bmiHeader.biHeight = logoBitmap.bmHeight; + bmpi.bmiHeader.biPlanes = 1; + bmpi.bmiHeader.biBitCount = 32; + bmpi.bmiHeader.biCompression = BI_RGB; + bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight; + + /* Create a premultiplied bitmap */ + hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0); + if (!hAlphaLogo) + goto Cleanup; - SelectObject(hDCLogo, hLogo); - SelectObject(hDCMask, hMask); + SelectObject(hDCLogo, hLogo); + 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 Color = GetPixel(hDCLogo, column, line); - DWORD r, g, b; + COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF; + COLORREF Color = GetPixel(hDCLogo, column, line); + DWORD r, g, b; - r = GetRValue(Color) * alpha / 255; - g = GetGValue(Color) * alpha / 255; - b = GetBValue(Color) * alpha / 255; + r = GetRValue(Color) * alpha / 255; + g = GetGValue(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; + pImgInfo->cxSource = logoBitmap.bmWidth; + pImgInfo->cySource = logoBitmap.bmHeight; + pImgInfo->iBits = logoBitmap.bmBitsPixel; + pImgInfo->iPlanes = logoBitmap.bmPlanes; + Cleanup: if (hMask != NULL) DeleteObject(hMask); if (hLogo != NULL) DeleteObject(hLogo); diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index e8f38e5a6b3..d43a75cf4e7 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -78,53 +78,53 @@ static VOID InitLogo(HWND hwndDlg) hLogo = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hMask = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - if (hLogo != NULL && hMask != NULL) - { - GetObject(hLogo, sizeof(logoBitmap), &logoBitmap); - GetObject(hMask, sizeof(maskBitmap), &maskBitmap); + if (hLogo == NULL || hMask == NULL) + goto Cleanup; - if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth) - goto Cleanup; + GetObject(hLogo, sizeof(logoBitmap), &logoBitmap); + GetObject(hMask, sizeof(maskBitmap), &maskBitmap); - bmpi.bmiHeader.biSize = sizeof(BITMAPINFO); - bmpi.bmiHeader.biWidth = logoBitmap.bmWidth; - bmpi.bmiHeader.biHeight = logoBitmap.bmHeight; - bmpi.bmiHeader.biPlanes = 1; - bmpi.bmiHeader.biBitCount = 32; - bmpi.bmiHeader.biCompression = BI_RGB; - bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight; + if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth) + goto Cleanup; - /* Create a premultiplied bitmap */ - hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0); - if (!hAlphaLogo) - goto Cleanup; + bmpi.bmiHeader.biSize = sizeof(BITMAPINFO); + bmpi.bmiHeader.biWidth = logoBitmap.bmWidth; + bmpi.bmiHeader.biHeight = logoBitmap.bmHeight; + bmpi.bmiHeader.biPlanes = 1; + bmpi.bmiHeader.biBitCount = 32; + bmpi.bmiHeader.biCompression = BI_RGB; + bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight; + + /* Create a premultiplied bitmap */ + hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0); + if (!hAlphaLogo) + goto Cleanup; - SelectObject(hDCLogo, hLogo); - SelectObject(hDCMask, hMask); + SelectObject(hDCLogo, hLogo); + 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 Color = GetPixel(hDCLogo, column, line); - DWORD r, g, b; + COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF; + COLORREF Color = GetPixel(hDCLogo, column, line); + DWORD r, g, b; - r = GetRValue(Color) * alpha / 255; - g = GetGValue(Color) * alpha / 255; - b = GetBValue(Color) * alpha / 255; + r = GetRValue(Color) * alpha / 255; + g = GetGValue(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; + pImgInfo->cxSource = logoBitmap.bmWidth; + pImgInfo->cySource = logoBitmap.bmHeight; + pImgInfo->iBits = logoBitmap.bmBitsPixel; + pImgInfo->iPlanes = logoBitmap.bmPlanes; + Cleanup: if (hMask != NULL) DeleteObject(hMask); if (hLogo != NULL) DeleteObject(hLogo);
