Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.9] Revert r73436 to avoid trouble with VirtualBox Guest Additions. CORE-13172 CORE-12700 CORE-12765

Browse source 
like in 0.4.8 before

(cherry picked from commit 766ef24948)
This commit is contained in:
Thomas Faber 2017-07-30 12:34:54 +00:00 committed by Joachim Henze
parent 7f96f90110
commit f926d742d5
3 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dll/win32/shell32/iconcache.cpp
View file

@ -453,9 +453,6 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags )
sice.dwSourceIndex = dwSourceIndex; sice.dwSourceIndex = dwSourceIndex;
sice.dwFlags = dwFlags; sice.dwFlags = dwFlags;
if (!sic_hdpa)
SIC_Initialize();
EnterCriticalSection(&SHELL32_SicCS); EnterCriticalSection(&SHELL32_SicCS);
if (NULL != DPA_GetPtr (sic_hdpa, 0)) if (NULL != DPA_GetPtr (sic_hdpa, 0))
@ -690,9 +687,6 @@ static int SIC_LoadOverlayIcon(int icon_idx)
RegCloseKey(hKeyShellIcons); RegCloseKey(hKeyShellIcons);
} }
if (!sic_hdpa)
SIC_Initialize();
return SIC_LoadIcon(iconPath, iconIdx, 0); return SIC_LoadIcon(iconPath, iconIdx, 0);
} }
@ -704,17 +698,13 @@ static int SIC_LoadOverlayIcon(int icon_idx)
* *
*/ */
BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList)
{ { TRACE("(%p,%p)\n",lpBigList,lpSmallList);
TRACE("(%p,%p)\n",lpBigList,lpSmallList);
if (!sic_hdpa)
SIC_Initialize();
if (lpBigList) if (lpBigList)
*lpBigList = ShellBigIconList; { *lpBigList = ShellBigIconList;
}
if (lpSmallList) if (lpSmallList)
*lpSmallList = ShellSmallIconList; { *lpSmallList = ShellSmallIconList;
}
return TRUE; return TRUE;
} }
@ -745,9 +735,6 @@ BOOL PidlToSicIndex (
TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); 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 (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei))))
{ {
if (SUCCEEDED(ei->GetIconLocation(uFlags &~ GIL_FORSHORTCUT, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) if (SUCCEEDED(ei->GetIconLocation(uFlags &~ GIL_FORSHORTCUT, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags)))

1
dll/win32/shell32/shell32.cpp
View file

@ -341,6 +341,7 @@ STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad)
InitCommonControlsEx(&InitCtrls); InitCommonControlsEx(&InitCtrls);
/* Bad idea, initialization in DllMain! */ /* Bad idea, initialization in DllMain! */
SIC_Initialize();
InitChangeNotifications(); InitChangeNotifications();
} }
else if (dwReason == DLL_PROCESS_DETACH) else if (dwReason == DLL_PROCESS_DETACH)

4
dll/win32/shell32/wine/shellord.c
View file

@ -1296,8 +1296,8 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs)
* *
*/ */
BOOL WINAPI FileIconInit(BOOL bFullInit) BOOL WINAPI FileIconInit(BOOL bFullInit)
{ { FIXME("(%s)\n", bFullInit ? "true" : "false");
return SIC_Initialize(); return FALSE;
} }
/************************************************************************* /*************************************************************************