[PATCH v6 1/2] shell32: Try to lookup icon, with fallback on failure

[James McDonnell]

From: James McDonnell

Try to lookup icon information from shell32.dll.

This resolves the issue where in affinity photos installer it
would crash because hIcon was returned as 0
---
 dlls/shell32/iconcache.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 8f9519d2ca8..1b5c7078d82 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -1000,16 +1000,20 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO

GetSystemDirectoryW(sii->szPath, MAX_PATH);

-    /* no icons defined: use default */
     sii->iIcon = -IDI_SHELL_FILE;
     lstrcatW(sii->szPath, L"\shell32.dll");

-    if (flags)
-        FIXME("flags 0x%x not implemented\n", flags);
+    if (flags & ~SHGSI_ICON)
+        FIXME("unhandled flags 0x%x\n", flags);

sii->hIcon = NULL;
-    if (flags & SHGSI_ICON)
-        sii->hIcon = LoadIconW(GetModuleHandleW(sii->szPath), MAKEINTRESOURCEW(sii->iIcon));
+    if (flags & SHGSI_ICON) {
+        sii->hIcon = LoadIconW(GetModuleHandleW(sii->szPath), MAKEINTRESOURCEW(id + 1));
+
+        if (!sii->hIcon) {
+          FIXME("Stock icon %d missing.\n", id);
+        }
+    }
     sii->iSysImageIndex = -1;

TRACE("%3d: returning %s (%d)\n", id, debugstr_w(sii->szPath), sii->iIcon);