mirror of
https://github.com/reactos/reactos.git
synced 2025-04-28 01:11:35 +00:00
[BROWSEUI] Some parenthesizing clarification around "xxx & YYY" expressions in conditionals
This commit is contained in:
parent
64f40e7f30
commit
46ab34662d
5 changed files with 12 additions and 12 deletions
|
@ -353,7 +353,7 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters)
|
||||||
|
|
||||||
/* Handle /e parameter */
|
/* Handle /e parameter */
|
||||||
UINT wFlags = 0;
|
UINT wFlags = 0;
|
||||||
if ((parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E))
|
if (parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E)
|
||||||
wFlags |= SBSP_EXPLOREMODE;
|
wFlags |= SBSP_EXPLOREMODE;
|
||||||
|
|
||||||
/* Handle /select parameter */
|
/* Handle /select parameter */
|
||||||
|
|
|
@ -566,7 +566,7 @@ HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent,
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* Ignore streams */
|
/* Ignore streams */
|
||||||
if ((attrs & SFGAO_STREAM))
|
if (attrs & SFGAO_STREAM)
|
||||||
{
|
{
|
||||||
TRACE("Ignoring stream\n");
|
TRACE("Ignoring stream\n");
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -250,11 +250,11 @@ HRESULT CDockSite::GetRBBandInfo(REBARBANDINFOW &bandInfo)
|
||||||
bandInfo.fStyle |= RBBS_BREAK;
|
bandInfo.fStyle |= RBBS_BREAK;
|
||||||
if (fDeskBandInfo.dwModeFlags & DBIMF_TOPALIGN)
|
if (fDeskBandInfo.dwModeFlags & DBIMF_TOPALIGN)
|
||||||
bandInfo.fStyle |= RBBS_TOPALIGN;
|
bandInfo.fStyle |= RBBS_TOPALIGN;
|
||||||
if (fFlags & ITF_NOGRIPPER || fToolbar->pSettings->fLocked)
|
if ((fFlags & ITF_NOGRIPPER) || fToolbar->pSettings->fLocked)
|
||||||
bandInfo.fStyle |= RBBS_NOGRIPPER;
|
bandInfo.fStyle |= RBBS_NOGRIPPER;
|
||||||
if (fFlags & ITF_NOTITLE)
|
if (fFlags & ITF_NOTITLE)
|
||||||
bandInfo.fStyle |= RBBS_HIDETITLE;
|
bandInfo.fStyle |= RBBS_HIDETITLE;
|
||||||
if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->pSettings->fLocked)
|
if ((fFlags & ITF_GRIPPERALWAYS) && !fToolbar->pSettings->fLocked)
|
||||||
bandInfo.fStyle |= RBBS_GRIPPERALWAYS;
|
bandInfo.fStyle |= RBBS_GRIPPERALWAYS;
|
||||||
if (fFlags & ITF_FIXEDSIZE)
|
if (fFlags & ITF_FIXEDSIZE)
|
||||||
bandInfo.fStyle |= RBBS_FIXEDSIZE;
|
bandInfo.fStyle |= RBBS_FIXEDSIZE;
|
||||||
|
@ -736,9 +736,9 @@ void CInternetToolbar::RefreshLockedToolbarState()
|
||||||
if (dockSite != NULL)
|
if (dockSite != NULL)
|
||||||
{
|
{
|
||||||
rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS);
|
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;
|
rebarBandInfo.fStyle |= RBBS_NOGRIPPER;
|
||||||
if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !pSettings->fLocked)
|
if ((dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS) && !pSettings->fLocked)
|
||||||
rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS;
|
rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS;
|
||||||
SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo);
|
SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -154,7 +154,7 @@ VOID CBandSiteBase::_BuildBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi
|
||||||
prbi->fStyle |= RBBS_GRIPPERALWAYS;
|
prbi->fStyle |= RBBS_GRIPPERALWAYS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION))
|
if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION))
|
||||||
{
|
{
|
||||||
prbi->fMask |= RBBIM_STYLE;
|
prbi->fMask |= RBBIM_STYLE;
|
||||||
prbi->fStyle |= RBBS_HIDETITLE;
|
prbi->fStyle |= RBBS_HIDETITLE;
|
||||||
|
@ -680,9 +680,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetBandSiteInfo(const BANDSITEINFO *pbs
|
||||||
if (!pbsinfo)
|
if (!pbsinfo)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if ((pbsinfo->dwMask & BSIM_STATE))
|
if (pbsinfo->dwMask & BSIM_STATE)
|
||||||
m_dwState = pbsinfo->dwState;
|
m_dwState = pbsinfo->dwState;
|
||||||
if ((pbsinfo->dwMask & BSIM_STYLE))
|
if (pbsinfo->dwMask & BSIM_STYLE)
|
||||||
m_dwStyle = pbsinfo->dwStyle;
|
m_dwStyle = pbsinfo->dwStyle;
|
||||||
|
|
||||||
_UpdateAllBands();
|
_UpdateAllBands();
|
||||||
|
@ -694,9 +694,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandSiteInfo(BANDSITEINFO *pbsinfo)
|
||||||
if (!pbsinfo)
|
if (!pbsinfo)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if ((pbsinfo->dwMask & BSIM_STATE))
|
if (pbsinfo->dwMask & BSIM_STATE)
|
||||||
pbsinfo->dwState = m_dwState;
|
pbsinfo->dwState = m_dwState;
|
||||||
if ((pbsinfo->dwMask & BSIM_STYLE))
|
if (pbsinfo->dwMask & BSIM_STYLE)
|
||||||
pbsinfo->dwStyle = m_dwStyle;
|
pbsinfo->dwStyle = m_dwStyle;
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
|
|
|
@ -328,7 +328,7 @@ public:
|
||||||
FOLDERSETTINGS *folderSettings, long flags);
|
FOLDERSETTINGS *folderSettings, long flags);
|
||||||
HRESULT GetMenuBand(REFIID riid, void **shellMenu);
|
HRESULT GetMenuBand(REFIID riid, void **shellMenu);
|
||||||
HRESULT GetBaseBar(bool vertical, REFIID riid, void **theBaseBar);
|
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 ShowBand(const CLSID &classID, bool vertical);
|
||||||
HRESULT NavigateToParent();
|
HRESULT NavigateToParent();
|
||||||
HRESULT DoFolderOptions();
|
HRESULT DoFolderOptions();
|
||||||
|
|
Loading…
Reference in a new issue