shell32: Properly init/use icon_idx.

Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Properly init/use icon_idx.
7cc2806e · Serge Gautherie · Alexandre Julliard · 36eb51b8 · 7cc2806e · 7cc2806e
Commit 7cc2806e authored Nov 18, 2019 by Serge Gautherie Committed by Alexandre Julliard Nov 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

classes.c dlls/shell32/classes.c +6 -1

folders.c dlls/shell32/folders.c +1 -1

No files found.
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -309,7 +309,12 @@ BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, int* picon_idx
 	  ret = HCR_RegGetDefaultIconA(hkey, szDest, len, picon_idx);
 	  RegCloseKey(hkey);
 	}
-	TRACE("-- %s %i\n", szDest, *picon_idx);
+
+    if (ret)
+        TRACE("-- %s %i\n", szDest, *picon_idx);
+    else
+        TRACE("-- not found\n");
+
 	return ret;
 }


--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -248,7 +248,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN
 	{
 	  static const WCHAR drive[] = { 'D','r','i','v','e',0 };

-	  int icon_idx = -1;
+	  icon_idx = -1;

 	  if (_ILGetDrive(pSimplePidl, sTemp, MAX_PATH))
 	  {