shell32: Use default system icons if PrivateExtractIconsW in SHGetFileInfoW fails.

5b680692 · Roy Shea · Alexandre Julliard · e0dd7216 · 5b680692
Commit 5b680692 authored Sep 10, 2008 by Roy Shea Committed by Alexandre Julliard Sep 11, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

shell32_main.c dlls/shell32/shell32_main.c +8 -4

No files found.
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -596,18 +596,22 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
                    }
                    else 
                    {
-                        IconNotYetLoaded=FALSE;
+                        UINT ret;
                        if (flags & SHGFI_SMALLICON)
-                            PrivateExtractIconsW( sTemp,icon_idx,
+                            ret = PrivateExtractIconsW( sTemp,icon_idx,
                                GetSystemMetrics( SM_CXSMICON ),
                                GetSystemMetrics( SM_CYSMICON ),
                                &psfi->hIcon, 0, 1, 0);
                        else
-                            PrivateExtractIconsW( sTemp, icon_idx,
+                            ret = PrivateExtractIconsW( sTemp, icon_idx,
                                GetSystemMetrics( SM_CXICON),
                                GetSystemMetrics( SM_CYICON),
                                &psfi->hIcon, 0, 1, 0);
-                        psfi->iIcon = icon_idx;
+                        if (ret != 0 && ret != 0xFFFFFFFF)
+                        {
+                            IconNotYetLoaded=FALSE;
+                            psfi->iIcon = icon_idx;
+                        }
                    }
                }
            }