[SHELL32]

[reactos.git] / reactos / dll / win32 / shell32 / shellmenu / CMenuFocusManager.cpp

diff --git a/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp b/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp
index 73b7721..4301f90 100644 (file)
--- a/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp
+++ b/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp
@@ -814,14 +814,22 @@ HRESULT CMenuFocusManager::UpdateFocus()
             CComPtr<IServiceProvider> bandSite;
             CComPtr<IOleWindow> deskBar;
             hr = topMenu->mb->GetSite(IID_PPV_ARG(IServiceProvider, &bandSite));
+            if (FAILED(hr))
+                goto NoCapture;
             hr = bandSite->QueryService(SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &deskBar));
+            if (FAILED(hr))
+                goto NoCapture;
 
             CComPtr<IOleWindow> deskBarSite;
             hr = IUnknown_GetSite(deskBar, IID_PPV_ARG(IOleWindow, &deskBarSite));
+            if (FAILED(hr))
+                goto NoCapture;
 
             // FIXME: Find the correct place for this
             HWND hWndOwner;
-            deskBarSite->GetWindow(&hWndOwner);
+            hr = deskBarSite->GetWindow(&hWndOwner);
+            if (FAILED(hr))
+                goto NoCapture;
 
             m_PreviousForeground = ::GetForegroundWindow();
             if (m_PreviousForeground != hWndOwner)
@@ -832,9 +840,11 @@ HRESULT CMenuFocusManager::UpdateFocus()
             // Get the HWND of the top-level window
             HWND hWndSite;
             hr = deskBar->GetWindow(&hWndSite);
+            if (FAILED(hr))
+                goto NoCapture;
             SetMenuCapture(hWndSite);
-
         }
+NoCapture:
 
         if (!m_parent || m_parent->type == MenuBarEntry)
         {