Index: dll/win32/shell32/iconcache.cpp =================================================================== --- dll/win32/shell32/iconcache.cpp (revision 74448) +++ dll/win32/shell32/iconcache.cpp (working copy) @@ -453,9 +453,6 @@ sice.dwSourceIndex = dwSourceIndex; sice.dwFlags = dwFlags; - if (!sic_hdpa) - SIC_Initialize(); - EnterCriticalSection(&SHELL32_SicCS); if (NULL != DPA_GetPtr (sic_hdpa, 0)) @@ -690,9 +687,6 @@ RegCloseKey(hKeyShellIcons); } - if (!sic_hdpa) - SIC_Initialize(); - return SIC_LoadIcon(iconPath, iconIdx, 0); } @@ -704,17 +698,13 @@ * */ BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) -{ - TRACE("(%p,%p)\n",lpBigList,lpSmallList); - - if (!sic_hdpa) - SIC_Initialize(); - +{ TRACE("(%p,%p)\n",lpBigList,lpSmallList); if (lpBigList) - *lpBigList = ShellBigIconList; - + { *lpBigList = ShellBigIconList; + } if (lpSmallList) - *lpSmallList = ShellSmallIconList; + { *lpSmallList = ShellSmallIconList; + } return TRUE; } @@ -745,9 +735,6 @@ TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); - if (!sic_hdpa) - SIC_Initialize(); - if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei)))) { if (SUCCEEDED(ei->GetIconLocation(uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) Index: dll/win32/shell32/shell32.cpp =================================================================== --- dll/win32/shell32/shell32.cpp (revision 74448) +++ dll/win32/shell32/shell32.cpp (working copy) @@ -346,6 +346,7 @@ InitCommonControlsEx(&InitCtrls); /* Bad idea, initialization in DllMain! */ + SIC_Initialize(); InitChangeNotifications(); } else if (dwReason == DLL_PROCESS_DETACH) Index: dll/win32/shell32/wine/shellord.c =================================================================== --- dll/win32/shell32/wine/shellord.c (revision 74448) +++ dll/win32/shell32/wine/shellord.c (working copy) @@ -1292,8 +1292,8 @@ * */ BOOL WINAPI FileIconInit(BOOL bFullInit) -{ - return SIC_Initialize(); +{ FIXME("(%s)\n", bFullInit ? "true" : "false"); + return FALSE; } /*************************************************************************