mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 15:55:03 +00:00
Make the icon choice algorithm really choose the best icon.
This commit is contained in:
parent
b47e54d28c
commit
0876700949
|
@ -280,21 +280,17 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, const char *szXPMFile
|
||||||
for (i = 0; i < pIconDir->idCount; i++)
|
for (i = 0; i < pIconDir->idCount; i++)
|
||||||
{
|
{
|
||||||
if ((pIconDir->idEntries[i].wBitCount >= nMaxBits) && (pIconDir->idEntries[i].wBitCount <= 8))
|
if ((pIconDir->idEntries[i].wBitCount >= nMaxBits) && (pIconDir->idEntries[i].wBitCount <= 8))
|
||||||
{
|
|
||||||
if (pIconDir->idEntries[i].wBitCount > nMaxBits)
|
|
||||||
{
|
{
|
||||||
nMaxBits = pIconDir->idEntries[i].wBitCount;
|
nMaxBits = pIconDir->idEntries[i].wBitCount;
|
||||||
nMax = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) > nMax)
|
if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) >= nMax)
|
||||||
{
|
{
|
||||||
lpName = MAKEINTRESOURCEW(pIconDir->idEntries[i].nID);
|
lpName = MAKEINTRESOURCEW(pIconDir->idEntries[i].nID);
|
||||||
nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth;
|
nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
FreeResource(hResData);
|
FreeResource(hResData);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue