Detlef Riekenberg : taskmgr: Remove dead code in trayicon.c (Coverity).

Alexandre Julliard julliard at wine.codeweavers.com
Mon Sep 11 06:05:03 CDT 2006


Module: wine
Branch: master
Commit: ed8ce298e196c8c3020d0c12759321d615774756
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=ed8ce298e196c8c3020d0c12759321d615774756

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Sun Sep 10 21:15:11 2006 +0200

taskmgr: Remove dead code in trayicon.c (Coverity).

---

 programs/taskmgr/trayicon.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c
index 6a677fa..e088f3f 100644
--- a/programs/taskmgr/trayicon.c
+++ b/programs/taskmgr/trayicon.c
@@ -40,7 +40,7 @@ HICON TrayIcon_GetProcessorUsageIcon(voi
     HDC            hScreenDC = NULL;
     HDC            hDC = NULL;
     HBITMAP        hBitmap = NULL;
-    HBITMAP        hOldBitmap = NULL;
+    HBITMAP        hOldBitmap;
     HBITMAP        hBitmapMask = NULL;
     ICONINFO    iconInfo;
     ULONG        ProcessorUsage;
@@ -108,8 +108,7 @@ HICON TrayIcon_GetProcessorUsageIcon(voi
      * old bitmap back.
      */
     SelectObject(hDC, hOldBitmap);
-    hOldBitmap = NULL;
-    
+
     iconInfo.fIcon = TRUE;
     iconInfo.xHotspot = 0;
     iconInfo.yHotspot = 0;
@@ -124,8 +123,6 @@ done:
      */
     if (hScreenDC)
         ReleaseDC(NULL, hScreenDC);
-    if (hOldBitmap)
-        SelectObject(hDC, hOldBitmap);
     if (hDC)
         DeleteDC(hDC);
     if (hBitmapBrush)




More information about the wine-cvs mailing list