Author: gadamopoulos Date: Thu Sep 22 16:09:28 2016 New Revision: 72769
URL: http://svn.reactos.org/svn/reactos?rev=72769&view=rev Log: [SHELL32] - HCR_GetFolderAttributes already calls GetAttributesOf when needed, calling it when it is not needed can lead to crashes.
Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp
Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/C... ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Thu Sep 22 16:09:28 2016 @@ -179,15 +179,6 @@ if (HCR_GetFolderAttributes(pidl, pdwAttributes) && *pdwAttributes) { return S_OK; - } - else - { - /* If we can't get it from the registry we have to query the child */ - CComPtr<IShellFolder> psf2; - if (SUCCEEDED(BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) - { - return psf2->GetAttributesOf(0, NULL, pdwAttributes); - } }
*pdwAttributes &= SFGAO_CANLINK;