[SHELL32]

Fix redundant check
Clarify variable usage

svn path=/trunk/; revision=56114
This commit is contained in:
Pierre Schweitzer
2012-03-11 11:13:17 +00:00
parent 7dd8434997
commit f278ce2aee
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -908,7 +908,7 @@ UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAd
{
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 @@ UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAd
{
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 */
+2 -2
View File
@@ -1421,7 +1421,7 @@ void CDefView::DoActivate(UINT uState)
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 @@ HRESULT WINAPI CDefView::UIActivate(UINT uState)
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;
}