From fadad0db13e828e0b94bfa59085bf910ad977ca6 Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Wed, 17 Dec 2014 12:11:31 +0000
Subject: [PATCH] [RSHELL] - Simplify some code by using shlwapi helpers - See
 issue CORE-8919

svn path=/trunk/; revision=65700
---
 reactos/base/shell/rshell/CMenuDeskBar.cpp | 39 +++++-----------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/reactos/base/shell/rshell/CMenuDeskBar.cpp b/reactos/base/shell/rshell/CMenuDeskBar.cpp
index cdbca080aa6..25876288e43 100644
--- a/reactos/base/shell/rshell/CMenuDeskBar.cpp
+++ b/reactos/base/shell/rshell/CMenuDeskBar.cpp
@@ -89,13 +89,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::ContextSensitiveHelp(BOOL fEnterMode)
 
 HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus)
 {
-    CComPtr<IInputObjectSite> ios;
-
-    HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObjectSite, &ios));
-    if (FAILED_UNEXPECTEDLY(hr))
-        return hr;
-
-    return ios->OnFocusChangeIS(punkObj, fSetFocus);
+    return IUnknown_OnFocusChangeIS(m_Client, punkObj, fSetFocus);
 }
 
 HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds,
@@ -177,24 +171,12 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(BOOL fActivate, LPMSG lpMsg
 
 HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO()
 {
-    CComPtr<IInputObject> io;
-
-    HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io));
-    if (FAILED_UNEXPECTEDLY(hr))
-        return hr;
-
-    return io->HasFocusIO();
+    return IUnknown_HasFocusIO(m_Client);
 }
 
 HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg)
 {
-    CComPtr<IInputObject> io;
-
-    HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io));
-    if (FAILED_UNEXPECTEDLY(hr))
-        return hr;
-
-    return io->TranslateAcceleratorIO(lpMsg);
+    return IUnknown_TranslateAcceleratorIO(m_Client, lpMsg);
 }
 
 HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient)
@@ -564,20 +546,15 @@ BOOL CMenuDeskBar::_IsSubMenuParent(HWND hwnd)
     while (popup)
     {
         HRESULT hr;
-        CComPtr<IOleWindow> window;
-
-        hr = popup->QueryInterface(IID_PPV_ARG(IOleWindow, &window));
-        if (FAILED_UNEXPECTEDLY(hr))
-            return FALSE;
-
         HWND parent;
 
-        hr = window->GetWindow(&parent);
-        if (SUCCEEDED(hr) && hwnd == parent)
+        hr = IUnknown_GetWindow(popup, &parent);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return FALSE;
+        if (hwnd == parent)
             return TRUE;
 
-        popup = NULL;
-        hr = IUnknown_GetSite(window, IID_PPV_ARG(IMenuPopup, &popup));
+        hr = IUnknown_GetSite(popup, IID_PPV_ARG(IMenuPopup, &popup));
         if (FAILED(hr))
             return FALSE;
     }