Alexandre Julliard : user32: Get rid of the unused icon cache refcount.
Alexandre Julliard
julliard at winehq.org
Fri Oct 8 12:38:08 CDT 2010
Module: wine
Branch: master
Commit: d9ae28926bd56f1c5b34ab7ccf74ccb26e196f5f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae28926bd56f1c5b34ab7ccf74ccb26e196f5f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Oct 8 15:09:37 2010 +0200
user32: Get rid of the unused icon cache refcount.
---
dlls/user32/cursoricon.c | 31 +------------------------------
1 files changed, 1 insertions(+), 30 deletions(-)
diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index ec9fd7e..e27365c 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,7 +464,6 @@ 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 );
@@ -476,29 +471,6 @@ static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroup
}
/**********************************************************************
- * 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
*/
BOOL get_icon_size( HICON handle, SIZE *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;
}
More information about the wine-cvs
mailing list