X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fsubsys%2Fsystem%2Fexplorer%2Fshell%2Fshellfs.cpp;h=effcf061288ee67d8a596d1b0ba434e1d4b7bf4e;hp=04936d0d76500e83ee25c5d2a2e1adf376388951;hb=deb261e2264f31de2ad01f0bc1baef01a5222907;hpb=f1b42e60e035b3ec638799eccbcca249b7d35d82

diff --git a/reactos/subsys/system/explorer/shell/shellfs.cpp b/reactos/subsys/system/explorer/shell/shellfs.cpp
index 04936d0d765..effcf061288 100644
--- a/reactos/subsys/system/explorer/shell/shellfs.cpp
+++ b/reactos/subsys/system/explorer/shell/shellfs.cpp
@@ -325,11 +325,7 @@ void ShellDirectory::read_directory(int scan_flags)
 				if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 					entry->_icon_id = ICID_FOLDER;
 /*				else if (scan_flags & SCAN_EXTRACT_ICONS)
-					try {
-						entry->extract_icon(big_icons);
-					} catch(COMException&) {
-						// ignore unexpected exceptions while extracting icons
-					}
+					entry->safe_extract_icon(large_icons);
 */
 				last = entry;
 			} while(FindNextFile(hFind, &w32fd));
@@ -431,11 +427,7 @@ void ShellDirectory::read_directory(int scan_flags)
 					if (!(entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ||
 						!(attribs & SFGAO_FILESYSTEM)) {
 /*						if (scan_flags & SCAN_EXTRACT_ICONS)
-							try {
-								entry->extract_icon(big_icons);
-							} catch(COMException&) {
-								// ignore unexpected exceptions while extracting icons
-							}
+							entry->extract_icon(large_icons);
 */					} else if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 						entry->_icon_id = ICID_FOLDER;
 					else
@@ -488,13 +480,13 @@ Entry* ShellDirectory::find_entry(const void* p)
 	return NULL;
 }
 
-int ShellDirectory::extract_icons(bool big_icons)
+int ShellDirectory::extract_icons(ICONCACHE_FLAGS flags)
 {
 	int cnt = 0;
 
 	for(Entry*entry=_down; entry; entry=entry->_next)
 		if (entry->_icon_id == ICID_UNKNOWN) {
-			entry->extract_icon(big_icons);
+			entry->_icon_id = entry->extract_icon(flags);
 
 			if (entry->_icon_id != ICID_NONE)
 				++cnt;