Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-23 13:00:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Make this crazy nested conditional mess a bit flatter.

svn path=/branches/shell-experiments/; revision=62510
This commit is contained in:
David Quintana 2014-03-15 21:44:49 +00:00
parent bacc079c22
commit 75f35dbf96
1 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
base/shell/rshell/CMenuBand.cpp
View file

@ -347,34 +347,20 @@ HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow)
return hr; return hr;
} }
CComPtr<IObjectWithSite> ows;
if (SUCCEEDED(m_subMenuParent->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ows))))
{
CComPtr<IServiceProvider> sp; CComPtr<IServiceProvider> sp;
if (SUCCEEDED(ows->GetSite(IID_PPV_ARG(IServiceProvider, &sp))))
{
CComPtr<IDeskBar> db0;
if (SUCCEEDED(sp->QueryInterface(IID_PPV_ARG(IDeskBar, &db0))))
{
CComPtr<IUnknown> unk0; CComPtr<IUnknown> unk0;
if (SUCCEEDED(db0->GetClient(&unk0))) CComPtr<IDeskBar> db0, db, db1;
{ if (SUCCEEDED(IUnknown_GetSite(m_subMenuParent, IID_PPV_ARG(IServiceProvider, &sp))) &&
CComPtr<IDeskBar> db; SUCCEEDED(sp->QueryInterface(IID_PPV_ARG(IDeskBar, &db0))) &&
if (SUCCEEDED(IUnknown_QueryService(unk0, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db)))) SUCCEEDED(db0->GetClient(&unk0)) &&
{ SUCCEEDED(IUnknown_QueryService(unk0, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db))) &&
CComPtr<IDeskBar> db1; SUCCEEDED(IUnknown_QueryService(m_site, SID_SMenuBandParent, IID_PPV_ARG(IDeskBar, &db1))))
if (SUCCEEDED(IUnknown_QueryService(m_site, SID_SMenuBandParent, IID_PPV_ARG(IDeskBar, &db1))))
{ {
if (fShow) if (fShow)
db->SetClient(db1); db->SetClient(db1);
else else
db->SetClient(NULL); db->SetClient(NULL);
} }
}
}
}
}
}
if (m_dwFlags & SMINIT_VERTICAL) if (m_dwFlags & SMINIT_VERTICAL)
{ {