Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:55:39 +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

20
base/shell/rshell/logging/CMenuDeskBarWrap.cpp
View file

@ -121,7 +121,7 @@ HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv
return E_OUTOFMEMORY;
hr = bar->InitWrap(deskBar);
if (FAILED(hr))
if (FAILED_UNEXPECTEDLY(hr))
{
bar->Release();
return hr;
@ -129,7 +129,7 @@ HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv
hr = bar->QueryInterface(riid, ppv);
if (FAILED(hr))
if (FAILED_UNEXPECTEDLY(hr))
bar->Release();
return hr;
@ -144,21 +144,21 @@ HRESULT CMenuDeskBarWrap::InitWrap(IDeskBar * deskBar)
m_IDeskBar = deskBar;
hr = deskBar->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = deskBar->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = deskBar->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_IMenuPopup));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = deskBar->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = deskBar->QueryInterface(IID_PPV_ARG(IInputObjectSite, &m_IInputObjectSite));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = deskBar->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = deskBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = deskBar->QueryInterface(IID_PPV_ARG(IBanneredBar, &m_IBanneredBar));
if (FAILED(hr)) return hr;
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = deskBar->QueryInterface(IID_PPV_ARG(IInitializeObject, &m_IInitializeObject));
return hr;
}