Module: wine Branch: master Commit: 7db6885da74d183104db52e9bd9065ebdf5e4e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7db6885da74d183104db52e9b...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Mar 21 09:27:15 2018 +0300
shell32: Add support for SHIL_SYSSMALL list.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shell32/iconcache.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index c6baf60..f26ff0e 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -61,7 +61,7 @@ typedef struct
static HDPA sic_hdpa; static INIT_ONCE sic_init_once = INIT_ONCE_STATIC_INIT; -static HIMAGELIST shell_imagelists[SHIL_EXTRALARGE+1]; +static HIMAGELIST shell_imagelists[SHIL_SYSSMALL+1];
static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -452,6 +452,8 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context
sizes[SHIL_EXTRALARGE].cx = (GetSystemMetrics( SM_CXICON ) * 3) / 2; sizes[SHIL_EXTRALARGE].cy = (GetSystemMetrics( SM_CYICON ) * 3) / 2; + sizes[SHIL_SYSSMALL].cx = GetSystemMetrics( SM_CXSMICON ); + sizes[SHIL_SYSSMALL].cy = GetSystemMetrics( SM_CYSMICON );
TRACE("large %dx%d small %dx%d\n", sizes[SHIL_LARGE].cx, sizes[SHIL_LARGE].cy, sizes[SHIL_SMALL].cx, sizes[SHIL_SMALL].cy);
@@ -1044,9 +1046,5 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) }
InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); - - if (iImageList == SHIL_SYSSMALL) - iImageList = SHIL_SMALL; - return HIMAGELIST_QueryInterface(shell_imagelists[iImageList], riid, ppv); }