[pschweitzer] 56114: [SHELL32] Fix redundant check Clarify variable usage

Author: pschweitzer
Date: Sun Mar 11 11:13:17 2012
New Revision: 56114

URL: http://svn.reactos.org/svn/reactos?rev=56114&view=rev
Log:
[SHELL32]
Fix redundant check
Clarify variable usage

Modified:
    trunk/reactos/dll/win32/shell32/shlmenu.cpp
    trunk/reactos/dll/win32/shell32/shlview.cpp

Modified: trunk/reactos/dll/win32/shell32/shlmenu.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlmenu.c...
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlmenu.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlmenu.cpp [iso-8859-1] Sun Mar 11 11:13:17 2012
@@ -908,7 +908,7 @@
         {
           miiSrc.wID += uIDAdjust;            /* add uIDAdjust to the ID */

-          if (miiSrc.wID > uIDAdjustMax && miiSrc.wID > uIDAdjustMax)        /* skip ID's higher uIDAdjustMax */
+          if (miiSrc.wID > uIDAdjustMax)        /* skip ID's higher uIDAdjustMax */
             continue;
           if (uIDMax <= miiSrc.wID)            /* remember the highest ID */
             uIDMax = miiSrc.wID + 1;
@@ -934,7 +934,7 @@
       {
         miiSrc.wID += uIDAdjust;            /* add uIDAdjust to the ID */

-        if (miiSrc.wID > uIDAdjustMax && miiSrc.wID > uIDAdjustMax)        /* skip ID's higher uIDAdjustMax */{
+        if (miiSrc.wID > uIDAdjustMax)        /* skip ID's higher uIDAdjustMax */{
           continue;
         }
         if (uIDMax <= miiSrc.wID)            /* remember the highest ID */

Modified: trunk/reactos/dll/win32/shell32/shlview.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.c...
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sun Mar 11 11:13:17 2012
@@ -1421,7 +1421,7 @@
     TRACE("%p uState=%x\n", this, uState);

/*don't do anything if the state isn't really changing */
-    if (uState == uState)
+    if (this->uState == uState)
     {
         return;
     }
@@ -2179,7 +2179,7 @@
     TRACE("(%p)->(state=%x) stub\n", this, uState);

/*don't do anything if the state isn't really changing*/
-    if (uState == uState)
+    if (this->uState == uState)
     {
         return S_OK;
     }