X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=base%2Fshell%2Frshell%2FCStartMenu.cpp;h=0abaacc0ddc975a6600cf1184c1035ee1ba17cae;hp=9889a950629abd1f17d241368dc792d910177ccc;hb=3da5418d3f19d5780bb237e45ea18cd06b431397;hpb=3b5e160482cdd4fd92c4b5b8131cd46c1f0b6237

diff --git a/base/shell/rshell/CStartMenu.cpp b/base/shell/rshell/CStartMenu.cpp
index 9889a950629..0abaacc0ddc 100644
--- a/base/shell/rshell/CStartMenu.cpp
+++ b/base/shell/rshell/CStartMenu.cpp
@@ -85,13 +85,20 @@ private:
             return S_OK;
 
         hr = IUnknown_GetSite(m_pDeskBar, IID_PPV_ARG(ITrayPriv, &m_pTrayPriv));
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
         hr = IUnknown_GetWindow(m_pTrayPriv, &m_hwndTray);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
         hr = m_pTrayPriv->AppendMenuW(&hmenu);
-#ifndef TEST_TRACKPOPUPMENU_SUBMENUS
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
         hr = m_pShellMenu->SetMenu(hmenu, NULL, SMSET_BOTTOM);
-#else
-        hr = m_pShellMenu->SetMenu(hmenu, m_hwndTray, SMSET_BOTTOM);
-#endif
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
 
         return hr;
     }