From d9ae28926bd56f1c5b34ab7ccf74ccb26e196f5f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 8 Oct 2010 15:09:37 +0200 Subject: [PATCH] user32: Get rid of the unused icon cache refcount. --- dlls/user32/cursoricon.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ec9fd7ef648..e27365cada1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -85,9 +85,6 @@ typedef struct tagICONCACHE HRSRC hRsrc; HRSRC hGroupRsrc; HICON hIcon; - - INT count; - } ICONCACHE; static struct list icon_cache = LIST_INIT( icon_cache ); @@ -412,7 +409,6 @@ static HICON CURSORICON_FindSharedIcon( HMODULE hModule, HRSRC hRsrc ) LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) if ( ptr->hModule == hModule && ptr->hRsrc == hRsrc ) { - ptr->count++; hIcon = ptr->hIcon; break; } @@ -468,36 +464,12 @@ static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroup ptr->hRsrc = hRsrc; ptr->hIcon = hIcon; ptr->hGroupRsrc = hGroupRsrc; - ptr->count = 1; EnterCriticalSection( &IconCrst ); list_add_head( &icon_cache, &ptr->entry ); LeaveCriticalSection( &IconCrst ); } -/********************************************************************** - * CURSORICON_DelSharedIcon - */ -static INT CURSORICON_DelSharedIcon( HICON hIcon ) -{ - INT count = -1; - ICONCACHE *ptr; - - EnterCriticalSection( &IconCrst ); - - LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) - if ( ptr->hIcon == hIcon ) - { - if ( ptr->count > 0 ) ptr->count--; - count = ptr->count; - break; - } - - LeaveCriticalSection( &IconCrst ); - - return count; -} - /********************************************************************** * get_icon_size */ @@ -1599,8 +1571,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) { TRACE_(icon)("%p\n", hIcon ); - if (CURSORICON_DelSharedIcon( hIcon ) == -1) - free_icon_handle( hIcon ); + if (!CURSORICON_FindCache( hIcon )) free_icon_handle( hIcon ); return TRUE; }