https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46ab34662df606861b5fa8d730b19cc67b0f2920
commit 46ab34662df606861b5fa8d730b19cc67b0f2920 Author: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org> AuthorDate: Sat Oct 28 17:56:55 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org> CommitDate: Sat Oct 28 17:56:55 2023 +0200 [BROWSEUI] Some parenthesizing clarification around "xxx & YYY" expressions in conditionals --- dll/win32/browseui/desktopipc.cpp | 2 +- dll/win32/browseui/explorerband.cpp | 2 +- dll/win32/browseui/internettoolbar.cpp | 8 ++++---- dll/win32/browseui/shellbars/CBandSite.cpp | 10 +++++----- dll/win32/browseui/shellbrowser.cpp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp index 1e7cc68af6e..d8e11d9d65e 100644 --- a/dll/win32/browseui/desktopipc.cpp +++ b/dll/win32/browseui/desktopipc.cpp @@ -353,7 +353,7 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) /* Handle /e parameter */ UINT wFlags = 0; - if ((parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E)) + if (parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E) wFlags |= SBSP_EXPLOREMODE; /* Handle /select parameter */ diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 5dd2614bb54..5c90d5d9dd7 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -566,7 +566,7 @@ HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, return NULL; /* Ignore streams */ - if ((attrs & SFGAO_STREAM)) + if (attrs & SFGAO_STREAM) { TRACE("Ignoring stream\n"); return NULL; diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 226a637bc4f..697eb3936a7 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -250,11 +250,11 @@ HRESULT CDockSite::GetRBBandInfo(REBARBANDINFOW &bandInfo) bandInfo.fStyle |= RBBS_BREAK; if (fDeskBandInfo.dwModeFlags & DBIMF_TOPALIGN) bandInfo.fStyle |= RBBS_TOPALIGN; - if (fFlags & ITF_NOGRIPPER || fToolbar->pSettings->fLocked) + if ((fFlags & ITF_NOGRIPPER) || fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_NOGRIPPER; if (fFlags & ITF_NOTITLE) bandInfo.fStyle |= RBBS_HIDETITLE; - if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->pSettings->fLocked) + if ((fFlags & ITF_GRIPPERALWAYS) && !fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_GRIPPERALWAYS; if (fFlags & ITF_FIXEDSIZE) bandInfo.fStyle |= RBBS_FIXEDSIZE; @@ -736,9 +736,9 @@ void CInternetToolbar::RefreshLockedToolbarState() if (dockSite != NULL) { rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS); - if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || pSettings->fLocked) + if ((dockSite->fFlags & CDockSite::ITF_NOGRIPPER) || pSettings->fLocked) rebarBandInfo.fStyle |= RBBS_NOGRIPPER; - if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !pSettings->fLocked) + if ((dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS) && !pSettings->fLocked) rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS; SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); } diff --git a/dll/win32/browseui/shellbars/CBandSite.cpp b/dll/win32/browseui/shellbars/CBandSite.cpp index 09844fd48f2..632543284c1 100644 --- a/dll/win32/browseui/shellbars/CBandSite.cpp +++ b/dll/win32/browseui/shellbars/CBandSite.cpp @@ -154,7 +154,7 @@ VOID CBandSiteBase::_BuildBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi prbi->fStyle |= RBBS_GRIPPERALWAYS; } - if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION)) + if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION)) { prbi->fMask |= RBBIM_STYLE; prbi->fStyle |= RBBS_HIDETITLE; @@ -680,9 +680,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetBandSiteInfo(const BANDSITEINFO *pbs if (!pbsinfo) return E_INVALIDARG; - if ((pbsinfo->dwMask & BSIM_STATE)) + if (pbsinfo->dwMask & BSIM_STATE) m_dwState = pbsinfo->dwState; - if ((pbsinfo->dwMask & BSIM_STYLE)) + if (pbsinfo->dwMask & BSIM_STYLE) m_dwStyle = pbsinfo->dwStyle; _UpdateAllBands(); @@ -694,9 +694,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandSiteInfo(BANDSITEINFO *pbsinfo) if (!pbsinfo) return E_INVALIDARG; - if ((pbsinfo->dwMask & BSIM_STATE)) + if (pbsinfo->dwMask & BSIM_STATE) pbsinfo->dwState = m_dwState; - if ((pbsinfo->dwMask & BSIM_STYLE)) + if (pbsinfo->dwMask & BSIM_STYLE) pbsinfo->dwStyle = m_dwStyle; return S_OK; diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 114d6c59553..d24c203c915 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -328,7 +328,7 @@ public: FOLDERSETTINGS *folderSettings, long flags); HRESULT GetMenuBand(REFIID riid, void **shellMenu); HRESULT GetBaseBar(bool vertical, REFIID riid, void **theBaseBar); - BOOL IsBandLoaded(const CLSID clsidBand, bool verticali, DWORD *pdwBandID); + BOOL IsBandLoaded(const CLSID clsidBand, bool vertical, DWORD *pdwBandID); HRESULT ShowBand(const CLSID &classID, bool vertical); HRESULT NavigateToParent(); HRESULT DoFolderOptions();