diff --git "a/win32ss/user/user32/misc/exticon.c" "b/win32ss/user/user32/misc/exticon.c" index 04d129ea0b0..76de155a54f 100644 --- "a/win32ss/user/user32/misc/exticon.c" +++ "b/win32ss/user/user32/misc/exticon.c" @@ -711,8 +711,8 @@ static UINT ICO_ExtractIconExW( } /* assure we don't get too much */ - if( nIcons > iconDirCount - nIconIndex ) - nIcons = iconDirCount - nIconIndex; + if( nIcons > iconDirCount - nIconIndex + 1 ) // + 1 (starts at zero index) + nIcons = iconDirCount - nIconIndex + 1; /* starting from specified index */ xresent = (const IMAGE_RESOURCE_DIRECTORY_ENTRY*)(icongroupresdir+1) + nIconIndex; @@ -738,7 +738,7 @@ static UINT ICO_ExtractIconExW( pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx1, cy1, flags); if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx2, cy2, flags); } - + TRACE("pIconId[0] %d pIconId[1] %d\n", pIconId[0], pIconId[1]); if (!(iconresdir=find_entry_by_id(rootresdir,LOWORD(RT_ICON),rootresdir))) { WARN("No Iconresourcedirectory!\n"); @@ -835,8 +835,13 @@ static UINT ICO_ExtractIconExW( continue; } RetPtr[i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx1, cy1, flags); - if (cx2 && cy2) - RetPtr[++i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx2, cy2, flags); + if (cx2 && cy2 && nIcons == 2 && i == 1) + { + /* Handling 2 icons at once.*/ + RetPtr[i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx2, cy2, flags); + ret = 2; + goto end; + } } ret = i; /* return number of retrieved icons */ } /* if(sig == IMAGE_NT_SIGNATURE) */