ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ignore unexpected exceptions while extracting icons

Browse Source 
svn path=/trunk/; revision=10133
This commit is contained in:
Martin Fuchs
2004-07-15 21:04:02 +00:00
parent 4fd7ec5f63
commit e7d21fa39e
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsys/system/explorer/shell/shellfs.cpp
+10 -2
View File
@@ -306,7 +306,11 @@ 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)
entry->extract_icon();
try {
entry->extract_icon();
} catch(COMException&) {
// ignore unexpected exceptions while extracting icons
}
last = entry;
} while(FindNextFile(hFind, &w32fd));
@@ -408,7 +412,11 @@ void ShellDirectory::read_directory(int scan_flags)
if (!(entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ||
!(attribs & SFGAO_FILESYSTEM)) {
if (scan_flags & SCAN_EXTRACT_ICONS)
entry->extract_icon();
try {
entry->extract_icon();
} catch(COMException&) {
// ignore unexpected exceptions while extracting icons
}
} else if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
entry->_icon_id = ICID_FOLDER;
else
reactos/subsys/system/explorer/taskbar/startmenu.cpp
+1 -1
View File
@@ -153,7 +153,7 @@ HWND StartMenu::Create(int x, int y, const StartMenuFolders& folders, HWND hwndP
}
LRESULT StartMenu::Init(LPCREATESTRUCT pcs)
LRESULT StartMenu::Init(LPCREATESTRUCT pcs)
{
try {
AddEntries();