Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changes based on reviewer comments.

Browse source
This commit is contained in:
Doug Lyons 2025-03-22 20:00:55 -05:00
parent bd4c2c7885
commit cec519f2ea
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
win32ss/user/user32/windows/cursoricon.c
View file

@ -95,9 +95,6 @@ CURSORICON_ConvertPngToBmpIcon(
_In_ DWORD fileSize,
_Out_ PDWORD pBmpIconSize)
{
if (!pngBits || fileSize < PNG_CHECK_SIG_SIZE || !png_check_sig(pngBits, PNG_CHECK_SIG_SIZE))
return NULL;
TRACE("pngBits %p fileSize %d\n", pngBits, fileSize);
if (!LibPngExists())
@ -106,6 +103,9 @@ CURSORICON_ConvertPngToBmpIcon(
return NULL;
}
if (!pngBits || fileSize < PNG_CHECK_SIG_SIZE || !png_check_sig(pngBits, PNG_CHECK_SIG_SIZE))
return NULL;
png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!png_ptr)
{
@ -2890,7 +2890,7 @@ HICON WINAPI CreateIconFromResourceEx(
/* Convert PNG raw data to BMP icon if the icon was PNG icon */
pbBmpIcon = CURSORICON_ConvertPngToBmpIcon(pbIconBits, cbIconBits, &BmpIconSize);
if (!pbBmpIcon)
goto end; /* Not PNG icon or failed */
return NULL; /* Not PNG icon or failed */
/* Find icon entry from BMP icon */
CURSORICONFILEDIR *dir = (CURSORICONFILEDIR *)pbBmpIcon;
@ -2926,7 +2926,6 @@ HICON WINAPI CreateIconFromResourceEx(
if(isAnimated)
HeapFree(GetProcessHeap(), 0, cursorData.aspcur);
end:
HeapFree(GetProcessHeap(), 0, pbBmpIcon);
return hIcon;
@ -2935,9 +2934,9 @@ end_error:
HeapFree(GetProcessHeap(), 0, pbBmpIcon);
if(isAnimated)
HeapFree(GetProcessHeap(), 0, cursorData.aspcur);
DeleteObject(cursorData.hbmMask);
if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor);
if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha);
if (cursorData.hbmMask) DeleteObject(cursorData.hbmMask);
if (cursorData.hbmColor) DeleteObject(cursorData.hbmColor);
if (cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha);
return NULL;
}