Save a few megabytes of memory by loading the default icon only once

into the image lists.
This commit is contained in:
Ge van Geldorp 2005-09-13 11:24:52 +00:00 committed by Alexandre Julliard
parent 7e4c88c6d9
commit 348449a486
1 changed files with 14 additions and 6 deletions

View File

@ -350,9 +350,19 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags )
}
if ( INVALID_INDEX == index )
{
if (0 == strcmpiW (sSourceFile, swShell32Name) &&
-IDI_SHELL_MY_DOCUMENTS <= dwSourceIndex &&
dwSourceIndex < IDI_SHELL_MY_DOCUMENTS)
{
/* Return default icon for icons not present in shell32 */
ret = 0;
}
else
{
ret = SIC_LoadIcon (sSourceFile, dwSourceIndex, dwFlags);
}
}
else
{
TRACE("-- found\n");
@ -404,14 +414,12 @@ BOOL SIC_Initialize(void)
hSm = (HICON)LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(index), IMAGE_ICON, cx_small, cy_small, LR_SHARED);
hLg = (HICON)LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(index), IMAGE_ICON, cx_large, cy_large, LR_SHARED);
if(!hSm)
if(hSm)
{
hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(1), IMAGE_ICON, cx_small, cy_small, LR_SHARED);
hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(1), IMAGE_ICON, cx_large, cy_large, LR_SHARED);
}
SIC_IconAppend (swShell32Name, index - 1, hSm, hLg, 0);
SIC_IconAppend (swShell32Name, -index, hSm, hLg, 0);
}
}
TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);