shell32: Don't hardcode icon sizes in SIC_LoadIcon.

77b75ca1 · Mark Harmstone · Alexandre Julliard · 27bffea1 · 77b75ca1
Commit 77b75ca1 authored Aug 01, 2015 by Mark Harmstone Committed by Alexandre Julliard Aug 03, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

iconcache.c dlls/shell32/iconcache.c +4 -2

No files found.
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -310,8 +310,10 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags)
 	HICON 	hiconLargeShortcut;
 	HICON	hiconSmallShortcut;

-        PrivateExtractIconsW( sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, 0, 1, 0 );
-        PrivateExtractIconsW( sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, 0, 1, 0 );
+        PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXICON),
+                              GetSystemMetrics(SM_CYICON), &hiconLarge, 0, 1, 0 );
+        PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXSMICON),
+                              GetSystemMetrics(SM_CYSMICON), &hiconSmall, 0, 1, 0 );

 	if ( !hiconLarge ||  !hiconSmall)
 	{