From: Alex Henrie alexhenrie24@gmail.com
The functions always returned TRUE and nothing used the return value. --- programs/explorer/systray.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index b47c2239abd..4eafa41c2a5 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -129,8 +129,8 @@ static POINT balloon_pos; static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ); static LRESULT WINAPI tray_icon_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam );
-static BOOL show_icon( struct icon *icon ); -static BOOL hide_icon( struct icon *icon ); +static void show_icon( struct icon *icon ); +static void hide_icon( struct icon *icon ); static BOOL delete_icon( struct icon *icon );
static WNDCLASSEXW shell_traywnd_class = @@ -624,11 +624,11 @@ static void systray_remove_icon( struct icon *icon ) }
/* make an icon visible */ -static BOOL show_icon(struct icon *icon) +static void show_icon(struct icon *icon) { TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner );
- if (icon->display != ICON_DISPLAY_HIDDEN) return TRUE; /* already displayed */ + if (icon->display != ICON_DISPLAY_HIDDEN) return; /* already displayed */
if (enable_dock) { @@ -652,15 +652,14 @@ static BOOL show_icon(struct icon *icon)
update_tooltip_position( icon ); update_balloon( icon ); - return TRUE; }
/* make an icon invisible */ -static BOOL hide_icon(struct icon *icon) +static void hide_icon(struct icon *icon) { TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner );
- if (icon->display == ICON_DISPLAY_HIDDEN) return TRUE; /* already hidden */ + if (icon->display == ICON_DISPLAY_HIDDEN) return; /* already hidden */
if (enable_dock && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_REMOVE, 0, 0, NULL, NtUserSystemTrayCall, FALSE )) @@ -674,7 +673,6 @@ static BOOL hide_icon(struct icon *icon)
update_balloon( icon ); update_tooltip_position( icon ); - return TRUE; }
/* Modifies an existing icon record */