Author: cwittich
Date: Thu Sep  3 06:24:13 2015
New Revision: 68923

URL: http://svn.reactos.org/svn/reactos?rev=68923&view=rev
Log:
[EXPLORER] remove dead code CID 1321923, 1321924

Modified:
    trunk/reactos/base/shell/explorer/traywnd.cpp

Modified: trunk/reactos/base/shell/explorer/traywnd.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywnd.cpp?rev=68923&r1=68922&r2=68923&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/traywnd.cpp       [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/traywnd.cpp       [iso-8859-1] Thu Sep  3 
06:24:13 2015
@@ -190,7 +190,7 @@
         HDC hDC = NULL;
         HDC hDCScreen = NULL;
         SIZE Size, SmallIcon;
-        HBITMAP hbmpOld, hbmp = NULL;
+        HBITMAP hbmpOld;
         HBITMAP hBitmap = NULL;
         HICON hIconStart;
         BOOL Ret;
@@ -243,10 +243,10 @@
         Size.cy = max(Size.cy, SmallIcon.cy);
 
         /* Create the bitmap */
-        hbmp = CreateCompatibleBitmap(hDCScreen,
+        hBitmap = CreateCompatibleBitmap(hDCScreen,
                                       Size.cx,
                                       Size.cy);
-        if (hbmp == NULL)
+        if (hBitmap == NULL)
             goto Cleanup;
 
         /* Caluclate the button rect */
@@ -256,7 +256,7 @@
         rcButton.bottom = Size.cy;
 
         /* Draw the button */
-        hbmpOld = (HBITMAP) SelectObject(hDC, hbmp);
+        hbmpOld = (HBITMAP) SelectObject(hDC, hBitmap);
 
         Flags = DC_TEXT | DC_INBUTTON;
         if (hIconStart != NULL)
@@ -275,18 +275,11 @@
         if (!Ret)
             goto Cleanup;
 
-        /* We successfully created the bitmap! */
-        hBitmap = hbmp;
-        hbmp = NULL;
-
 Cleanup:
         if (hDCScreen != NULL)
         {
             ::ReleaseDC(NULL, hDCScreen);
         }
-
-        if (hbmp != NULL)
-            DeleteObject(hbmp);
 
         if (hDC != NULL)
             DeleteDC(hDC);


Reply via email to