Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-29 19:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USER32]

Browse source 
- Fix LookupIconIdFromDirectoryEx, returning 0 when no matching entry is found.
 - Fix error handling when opening a cursor file.
 - Various code beautification here and there
CORE-7575

svn path=/trunk/; revision=64911
This commit is contained in:
Jérôme Gardou 2014-10-23 09:32:21 +00:00
parent 8dc7d09ca1
commit 797a6346f2
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/win32ss/user/user32/windows/cursoricon_new.c
View file

@ -393,10 +393,11 @@ get_best_icon_file_entry(
WORD i; WORD i;
const CURSORICONFILEDIRENTRY* entry; const CURSORICONFILEDIRENTRY* entry;
/* Check our file is what it claims to be */
if ( dwFileSize < sizeof(*dir) ) if ( dwFileSize < sizeof(*dir) )
return NULL; return NULL;
if ( dwFileSize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) if (dwFileSize < (sizeof(*dir) + FIELD_OFFSET(CURSORICONFILEDIR, idEntries[dir->idCount])))
return NULL; return NULL;
/* /*
@ -418,7 +419,8 @@ get_best_icon_file_entry(
fakeEntry = &fakeDir->idEntries[i]; fakeEntry = &fakeDir->idEntries[i];
entry = &dir->idEntries[i]; entry = &dir->idEntries[i];
/* Take this as an occasion to perform a size check */ /* Take this as an occasion to perform a size check */
if((entry->dwDIBOffset + entry->dwDIBSize) > dwFileSize) if ((entry->dwDIBOffset > dwFileSize)
|| ((entry->dwDIBOffset + entry->dwDIBSize) > dwFileSize))
{ {
ERR("Corrupted icon file?.\n"); ERR("Corrupted icon file?.\n");
HeapFree(GetProcessHeap(), 0, fakeDir); HeapFree(GetProcessHeap(), 0, fakeDir);
@ -1260,12 +1262,12 @@ CURSORICON_LoadFromFileW(
cursorData.rt = (USHORT)((ULONG_PTR)(bIcon ? RT_ICON : RT_CURSOR)); cursorData.rt = (USHORT)((ULONG_PTR)(bIcon ? RT_ICON : RT_CURSOR));
/* Do the dance */ /* Do the dance */
if(!CURSORICON_GetCursorDataFromBMI(&cursorData, (BITMAPINFO*)&bits[entry->dwDIBOffset])) if(!CURSORICON_GetCursorDataFromBMI(&cursorData, (BITMAPINFO*)(&bits[entry->dwDIBOffset])))
goto end; goto end;
hCurIcon = NtUserxCreateEmptyCurObject(FALSE); hCurIcon = NtUserxCreateEmptyCurObject(FALSE);
if(!hCurIcon) if(!hCurIcon)
goto end_error; goto end;
/* Tell win32k */ /* Tell win32k */
if(!NtUserSetCursorIconData(hCurIcon, NULL, NULL, &cursorData)) if(!NtUserSetCursorIconData(hCurIcon, NULL, NULL, &cursorData))
@ -1283,6 +1285,7 @@ end_error:
DeleteObject(cursorData.hbmMask); DeleteObject(cursorData.hbmMask);
if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor); if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor);
if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha); if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha);
UnmapViewOfFile(bits);
return NULL; return NULL;
} }
@ -2196,7 +2199,7 @@ int WINAPI LookupIconIdFromDirectoryEx(
/* No inferior or equal depth available. Get the smallest bigger one */ /* No inferior or equal depth available. Get the smallest bigger one */
BitCount = 0xFFFF; BitCount = 0xFFFF;
iIndex = 0; iIndex = -1;
for(i = 0; i < dir->idCount; i++) for(i = 0; i < dir->idCount; i++)
{ {
entry = &dir->idEntries[i]; entry = &dir->idEntries[i];
@ -2222,8 +2225,10 @@ int WINAPI LookupIconIdFromDirectoryEx(
BitCount = entry->wBitCount; BitCount = entry->wBitCount;
} }
} }
if (iIndex >= 0)
return dir->idEntries[iIndex].wResId;
return dir->idEntries[iIndex].wResId; return 0;
} }
HICON WINAPI CreateIcon( HICON WINAPI CreateIcon(