Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-25 05:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ICO_ExtractIconsW should process icons in large/small pairs

Browse source 
svn path=/trunk/; revision=7763
This commit is contained in:
Gé van Geldorp 2004-01-18 22:58:19 +00:00
parent d69891bf93
commit 917d9dbf90
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/lib/user32/misc/exticon.c
View file

@ -505,13 +505,13 @@ static UINT ICO_ExtractIconExW(
} }
/* assure we don't get too much */ /* assure we don't get too much */
if( nIcons > iconDirCount - nIconIndex ) if( nIcons / 2 > iconDirCount - nIconIndex )
nIcons = iconDirCount - nIconIndex; nIcons = 2 * (iconDirCount - nIconIndex);
/* starting from specified index */ /* starting from specified index */
xresent = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(icongroupresdir+1) + nIconIndex; xresent = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(icongroupresdir+1) + nIconIndex;
for (i=0; i < nIcons; i++,xresent++) for (i=0; i < nIcons; i++)
{ {
const IMAGE_RESOURCE_DIRECTORY *resdir; const IMAGE_RESOURCE_DIRECTORY *resdir;
@ -546,6 +546,7 @@ static UINT ICO_ExtractIconExW(
goto end; /* failure */ goto end; /* failure */
} }
pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags); pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags);
if (i & 1) xresent++;
} }
if (!(iconresdir=find_entry_by_id(rootresdir,LOWORD(RT_ICON),rootresdir))) if (!(iconresdir=find_entry_by_id(rootresdir,LOWORD(RT_ICON),rootresdir)))
@ -665,7 +666,7 @@ UINT WINAPI PrivateExtractIconExW (
UINT nIcons ) UINT nIcons )
{ {
DWORD cyicon, cysmicon, cxicon, cxsmicon; DWORD cyicon, cysmicon, cxicon, cxsmicon;
UINT ret = 0; INT ret = 0;
TRACE("%s %d %p %p %d\n", TRACE("%s %d %p %p %d\n",
debugstr_w(lpwstrFile),nIndex,phIconLarge, phIconSmall, nIcons); debugstr_w(lpwstrFile),nIndex,phIconLarge, phIconSmall, nIcons);
@ -684,8 +685,8 @@ UINT WINAPI PrivateExtractIconExW (
ret = ICO_ExtractIconExW(lpwstrFile, (HICON*) &hIcon, nIndex, 2, cxicon | (cxsmicon<<16), ret = ICO_ExtractIconExW(lpwstrFile, (HICON*) &hIcon, nIndex, 2, cxicon | (cxsmicon<<16),
cyicon | (cysmicon<<16), NULL, LR_DEFAULTCOLOR); cyicon | (cysmicon<<16), NULL, LR_DEFAULTCOLOR);
*phIconLarge = hIcon[0]; *phIconLarge = (1 <= ret ? hIcon[0] : NULL);
*phIconSmall = hIcon[1]; *phIconSmall = (2 <= ret ? hIcon[1] : NULL);
return ret; return ret;
} }