Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 01:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSDM][USERINIT] Rewrite a if-condition in order to fail early, and save one level of code indentation.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2021-04-21 18:11:17 +02:00
parent 33c210da37
commit 89860ab543
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 80 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,8 +43,9 @@ 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)
{
if (hLogo == NULL || hMask == NULL)
goto Cleanup;
GetObject(hLogo, sizeof(logoBitmap), &logoBitmap);
GetObject(hMask, sizeof(maskBitmap), &maskBitmap);
@ -88,7 +89,6 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg)
pImgInfo->cySource = logoBitmap.bmHeight;
pImgInfo->iBits = logoBitmap.bmBitsPixel;
pImgInfo->iPlanes = logoBitmap.bmPlanes;
}
Cleanup:
if (hMask != NULL) DeleteObject(hMask);

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

@ -78,8 +78,9 @@ 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)
{
if (hLogo == NULL || hMask == NULL)
goto Cleanup;
GetObject(hLogo, sizeof(logoBitmap), &logoBitmap);
GetObject(hMask, sizeof(maskBitmap), &maskBitmap);
@ -123,7 +124,6 @@ static VOID InitLogo(HWND hwndDlg)
pImgInfo->cySource = logoBitmap.bmHeight;
pImgInfo->iBits = logoBitmap.bmBitsPixel;
pImgInfo->iPlanes = logoBitmap.bmPlanes;
}
Cleanup:
if (hMask != NULL) DeleteObject(hMask);