Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 04:33:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Improve logging in case of unexpected failures, and trace the creation of toolbar (menu) items.
CORE-7586

svn path=/branches/shell-experiments/; revision=62414
This commit is contained in:
David Quintana 2014-03-03 16:11:47 +00:00
parent 612d72cb58
commit 7fe9315c7e
13 changed files with 170 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

32
base/shell/rshell/logging/CMenuBandWrap.cpp
View file

@ -182,7 +182,7 @@ HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *pp
return E_OUTOFMEMORY;
hr = site->InitWrap(shellMenu);
if (FAILED(hr))
if (FAILED_UNEXPECTEDLY(hr))
{
site->Release();
return hr;
@ -190,7 +190,7 @@ HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *pp
hr = site->QueryInterface(riid, ppv);
if (FAILED(hr))
if (FAILED_UNEXPECTEDLY(hr))
site->Release();
return hr;
@ -205,33 +205,33 @@ HRESULT CMenuBandWrap::InitWrap(IShellMenu * shellMenu)
m_IShellMenu = shellMenu;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IDeskBand, &m_IDeskBand));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IDockingWindow, &m_IDockingWindow));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IPersistStream, &m_IPersistStream));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IPersist, &m_IPersist));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_IMenuPopup));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IDeskBar, &m_IDeskBar));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IMenuBand, &m_IMenuBand));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IShellMenu2, &m_IShellMenu2));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = shellMenu->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_IWinEventHandler));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
//hr = shellMenu->QueryInterface(IID_PPV_ARG(IShellMenuAcc, &m_IShellMenuAcc));
m_IShellMenuAcc = NULL;
return hr;