/*
-* Shell Menu Desk Bar
-*
-* Copyright 2014 David Quintana
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-*/
+ * Shell Menu Desk Bar
+ *
+ * Copyright 2014 David Quintana
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
#include "precomp.h"
-#include "wraplog.h"
#include <atlwin.h>
#include <shlwapi_undoc.h>
+#include "CMenuDeskBar.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar);
-#define WRAP_LOG 1
-
-typedef CWinTraits<
- WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
- WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_PALETTEWINDOW
-> CMenuWinTraits;
-
-class CMenuDeskBar :
-#if !WRAP_LOG
- public CWindowImpl<CMenuDeskBar, CWindow, CMenuWinTraits>,
-#endif
- public CComCoClass<CMenuDeskBar>,
- public CComObjectRootEx<CComMultiThreadModelNoCS>,
- public IOleCommandTarget,
- public IServiceProvider,
- public IInputObjectSite,
- public IInputObject,
- public IMenuPopup,
- public IObjectWithSite,
- public IBanneredBar,
- public IInitializeObject
-{
-public:
- CMenuDeskBar();
- ~CMenuDeskBar();
-
-private:
-#if WRAP_LOG
- IUnknown * m_IUnknown;
- IMenuPopup * m_IMenuPopup;
- IOleCommandTarget * m_IOleCommandTarget;
- IServiceProvider * m_IServiceProvider;
- IDeskBar * m_IDeskBar;
- IOleWindow * m_IOleWindow;
- IInputObjectSite * m_IInputObjectSite;
- IInputObject * m_IInputObject;
- IObjectWithSite * m_IObjectWithSite;
- IBanneredBar * m_IBanneredBar;
- IInitializeObject * m_IInitializeObject;
-#else
-
- CComPtr<IUnknown> m_Site;
- CComPtr<IUnknown> m_Client;
- CComPtr<IMenuPopup> m_SubMenuParent;
-
- DWORD m_IconSize;
- HBITMAP m_Banner;
-
-#endif
-
-public:
- // *** IMenuPopup methods ***
- virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags);
- virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType);
- virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet);
-
- // *** IOleWindow methods ***
- virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
- virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
-
- // *** IObjectWithSite methods ***
- virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite);
- virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite);
-
- // *** IBanneredBar methods ***
- virtual HRESULT STDMETHODCALLTYPE SetIconSize(DWORD iIcon);
- virtual HRESULT STDMETHODCALLTYPE GetIconSize(DWORD* piIcon);
- virtual HRESULT STDMETHODCALLTYPE SetBitmap(HBITMAP hBitmap);
- virtual HRESULT STDMETHODCALLTYPE GetBitmap(HBITMAP* phBitmap);
-
- // *** IInitializeObject methods ***
- virtual HRESULT STDMETHODCALLTYPE Initialize(THIS);
-
- // *** IOleCommandTarget methods ***
- virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText);
- virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
-
- // *** IServiceProvider methods ***
- virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
-
- // *** IInputObjectSite methods ***
- virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus);
-
- // *** IInputObject methods ***
- virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL bActivating, LPMSG lpMsg);
- virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS);
- virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg);
-
- // *** IDeskBar methods ***
- virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient);
- virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient);
- virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc);
-
- DECLARE_NOT_AGGREGATABLE(CMenuDeskBar)
- DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-#if !WRAP_LOG
- DECLARE_WND_CLASS_EX(_T("BaseBar"), CS_SAVEBITS | CS_DROPSHADOW, COLOR_3DFACE)
-
- BEGIN_MSG_MAP(CMenuDeskBar)
- MESSAGE_HANDLER(WM_SIZE, OnSize)
- MESSAGE_HANDLER(WM_NOTIFY, OnNotify)
- MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged)
- MESSAGE_HANDLER(WM_PAINT, OnPaint)
- END_MSG_MAP()
-
- // message handlers
- LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
- LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
- LRESULT OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
- LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
-
-#endif
-
- BEGIN_COM_MAP(CMenuDeskBar)
- COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup)
- COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
- COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
- COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite)
- COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
- COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup)
- COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IMenuPopup)
- COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
- COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar)
- COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject)
- END_COM_MAP()
-};
+const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36 } };
extern "C"
-HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
+HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
{
*ppv = NULL;
HRESULT hr = deskbar->QueryInterface(riid, ppv);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
deskbar->Release();
return hr;
}
-#if WRAP_LOG
-CMenuDeskBar::CMenuDeskBar()
+CMenuDeskBar::CMenuDeskBar() :
+ m_Client(NULL),
+ m_Banner(NULL),
+ m_Shown(FALSE)
{
- HRESULT hr;
- WrapLogOpen();
-
- hr = CoCreateInstance(CLSID_MenuDeskBar, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IMenuPopup, &m_IMenuPopup));
- hr = m_IMenuPopup->QueryInterface(IID_PPV_ARG(IUnknown, &m_IUnknown));
-
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget));
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider));
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IDeskBar, &m_IDeskBar));
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow));
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IInputObjectSite, &m_IInputObjectSite));
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject));
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite));
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IBanneredBar, &m_IBanneredBar));
- hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IInitializeObject, &m_IInitializeObject));
}
CMenuDeskBar::~CMenuDeskBar()
{
- m_IUnknown->Release();
- m_IMenuPopup->Release();
- m_IOleCommandTarget->Release();
- m_IServiceProvider->Release();
- m_IDeskBar->Release();
- m_IOleWindow->Release();
- m_IInputObjectSite->Release();
- m_IInputObject->Release();
- m_IObjectWithSite->Release();
- m_IBanneredBar->Release();
- m_IInitializeObject->Release();
-
- WrapLogClose();
-}
-
-// *** IMenuPopup methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags)
-{
- WrapLogEnter("CMenuDeskBar<%p>::Popup(POINTL *ppt=%p, RECTL *prcExclude=%p, MP_POPUPFLAGS dwFlags=%08x)\n", this, ppt, prcExclude, dwFlags);
- HRESULT hr = m_IMenuPopup->Popup(ppt, prcExclude, dwFlags);
- WrapLogExit("CMenuDeskBar::Popup() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(DWORD dwSelectType)
-{
- WrapLogEnter("CMenuDeskBar<%p>::OnSelect(DWORD dwSelectType=%08x)\n", this, dwSelectType);
- HRESULT hr = m_IMenuPopup->OnSelect(dwSelectType);
- WrapLogExit("CMenuDeskBar::OnSelect() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(IMenuPopup *pmp, BOOL fSet)
-{
- WrapLogEnter("CMenuDeskBar<%p>::SetSubMenu(IMenuPopup *pmp=%p, BOOL fSet=%d)\n", this, pmp, fSet);
- HRESULT hr = m_IMenuPopup->SetSubMenu(pmp, fSet);
- WrapLogExit("CMenuDeskBar::SetSubMenu() = %08x\n", hr);
- return hr;
-}
-
-// *** IOleWindow methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *phwnd)
-{
- WrapLogEnter("CMenuDeskBar<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd);
- HRESULT hr = m_IOleWindow->GetWindow(phwnd);
- if (phwnd) WrapLogMsg("*phwnd=%p\n", *phwnd);
- WrapLogExit("CMenuDeskBar::GetWindow() = %08x\n", hr);
- return hr;
}
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::ContextSensitiveHelp(BOOL fEnterMode)
-{
- WrapLogEnter("CMenuDeskBar<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode);
- HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode);
- WrapLogExit("CMenuDeskBar::ContextSensitiveHelp() = %08x\n", hr);
- return hr;
-}
-
-// *** IObjectWithSite methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite)
-{
- WrapLogEnter("CMenuDeskBar<%p>::SetSite(IUnknown *pUnkSite=%p)\n", this, pUnkSite);
- HRESULT hr = m_IObjectWithSite->SetSite(pUnkSite);
- WrapLogExit("CMenuDeskBar::SetSite() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite(REFIID riid, PVOID *ppvSite)
-{
- WrapLogEnter("CMenuDeskBar<%p>::GetSite(REFIID riid=%s, PVOID *ppvSite=%p)\n", this, Wrap(riid), ppvSite);
- HRESULT hr = m_IObjectWithSite->GetSite(riid, ppvSite);
- if (ppvSite) WrapLogMsg("*ppvSite=%p\n", *ppvSite);
- WrapLogExit("CMenuDeskBar::GetSite() = %08x\n", hr);
- return hr;
-}
-
-// *** IBanneredBar methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetIconSize(DWORD iIcon)
-{
- WrapLogEnter("CMenuDeskBar<%p>::SetIconSize(DWORD iIcon=%d)\n", this, iIcon);
- HRESULT hr = m_IBanneredBar->SetIconSize(iIcon);
- WrapLogExit("CMenuDeskBar::SetIconSize() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetIconSize(DWORD* piIcon)
-{
- WrapLogEnter("CMenuDeskBar<%p>::GetIconSize(DWORD* piIcon=%p)\n", this, piIcon);
- HRESULT hr = m_IBanneredBar->GetIconSize(piIcon);
- if (piIcon) WrapLogMsg("*piIcon=%d\n", *piIcon);
- WrapLogExit("CMenuDeskBar::GetIconSize() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(HBITMAP hBitmap)
-{
- WrapLogEnter("CMenuDeskBar<%p>::SetBitmap(HBITMAP hBitmap=%p)\n", this, hBitmap);
- HRESULT hr = m_IBanneredBar->SetBitmap(hBitmap);
- WrapLogExit("CMenuDeskBar::SetBitmap() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetBitmap(HBITMAP* phBitmap)
-{
- WrapLogEnter("CMenuDeskBar<%p>::GetBitmap(HBITMAP* phBitmap=%p)\n", this, phBitmap);
- HRESULT hr = m_IBanneredBar->GetBitmap(phBitmap);
- if (phBitmap) WrapLogMsg("*phBitmap=%p\n", *phBitmap);
- WrapLogExit("CMenuDeskBar::GetBitmap() = %08x\n", hr);
- return hr;
-}
-
-
-// *** IInitializeObject methods ***
HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS)
{
- WrapLogEnter("CMenuDeskBar<%p>::Initialize()\n", this);
- HRESULT hr = m_IInitializeObject->Initialize();
- WrapLogExit("CMenuDeskBar::Initialize() = %08x\n", hr);
- return hr;
-}
-
-// *** IOleCommandTarget methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText)
-{
- WrapLogEnter("CMenuDeskBar<%p>::QueryStatus(const GUID *pguidCmdGroup=%p, ULONG cCmds=%u, prgCmds=%p, pCmdText=%p)\n", this, pguidCmdGroup, cCmds, prgCmds, pCmdText);
- HRESULT hr = m_IOleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText);
- if (pguidCmdGroup) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
- WrapLogExit("CMenuDeskBar::QueryStatus() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
-{
- WrapLogEnter("CMenuDeskBar<%p>::Exec(const GUID *pguidCmdGroup=%p, DWORD nCmdID=%d, DWORD nCmdexecopt=%d, VARIANT *pvaIn=%p, VARIANT *pvaOut=%p)\n", this, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
- if (pguidCmdGroup) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup));
- HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
- WrapLogExit("CMenuDeskBar::Exec() = %08x\n", hr);
- return hr;
-}
-
-// *** IServiceProvider methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
-{
- WrapLogEnter("CMenuDeskBar<%p>::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", this, Wrap(guidService), Wrap(riid), ppvObject);
-
- if (IsEqualIID(guidService, SID_SMenuPopup))
- {
- WrapLogMsg("SID is SID_SMenuPopup. Using QueryInterface of self instead of wrapped object.\n");
- HRESULT hr = this->QueryInterface(riid, ppvObject);
- if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject);
- if (SUCCEEDED(hr))
- {
- WrapLogExit("CMenuDeskBar::QueryService() = %08x\n", hr);
- return hr;
- }
- else
- {
- WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n");
- }
- }
- else if (IsEqualIID(guidService, SID_SMenuBandParent))
- {
- WrapLogMsg("SID is SID_SMenuBandParent. Using QueryInterface of self instead of wrapped object.\n");
- HRESULT hr = this->QueryInterface(riid, ppvObject);
- if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject);
- if (SUCCEEDED(hr))
- {
- WrapLogExit("CMenuDeskBar::QueryService() = %08x\n", hr);
- return hr;
- }
- else
- {
- WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n");
- }
- }
- else if (IsEqualIID(guidService, SID_STopLevelBrowser))
- {
- WrapLogMsg("SID is SID_STopLevelBrowser. Using QueryInterface of self instead of wrapped object.\n");
- HRESULT hr = this->QueryInterface(riid, ppvObject);
- if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject);
- if (SUCCEEDED(hr))
- {
- WrapLogExit("CMenuDeskBar::QueryService() = %08x\n", hr);
- return hr;
- }
- else
- {
- WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n");
- }
- }
- else
- {
- WrapLogMsg("SID not identified. Calling wrapped object's QueryService.\n");
- }
- HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject);
- if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject);
- WrapLogExit("CMenuDeskBar::QueryService() = %08x\n", hr);
- return hr;
-}
-
-// *** IInputObjectSite methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus)
-{
- WrapLogEnter("CMenuDeskBar<%p>::OnFocusChangeIS(LPUNKNOWN lpUnknown=%p, BOOL bFocus=%d)\n", this, lpUnknown, bFocus);
- HRESULT hr = m_IInputObjectSite->OnFocusChangeIS(lpUnknown, bFocus);
- WrapLogExit("CMenuDeskBar::OnFocusChangeIS() = %08x\n", hr);
- return hr;
-}
-
-// *** IInputObject methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(BOOL bActivating, LPMSG lpMsg)
-{
- WrapLogEnter("CMenuDeskBar<%p>::UIActivateIO(BOOL bActivating=%d, LPMSG lpMsg=%p)\n", this, bActivating, lpMsg);
- HRESULT hr = m_IInputObject->UIActivateIO(bActivating, lpMsg);
- WrapLogExit("CMenuDeskBar::UIActivateIO() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO(THIS)
-{
- WrapLogEnter("CMenuDeskBar<%p>::HasFocusIO()\n", this);
- HRESULT hr = m_IInputObject->HasFocusIO();
- WrapLogExit("CMenuDeskBar::HasFocusIO() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg)
-{
- WrapLogEnter("CMenuDeskBar<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg);
- if (lpMsg) WrapLogMsg("*lpMsg=%s\n", Wrap(*lpMsg));
- HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg);
- WrapLogExit("CMenuDeskBar::TranslateAcceleratorIO() = %08x\n", hr);
- return hr;
-}
-
-// *** IDeskBar methods ***
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient)
-{
- WrapLogEnter("CMenuDeskBar<%p>::SetClient(IUnknown *punkClient=%p)\n", this, punkClient);
- HRESULT hr = m_IDeskBar->SetClient(punkClient);
- WrapLogExit("CMenuDeskBar::SetClient() = %08x\n", hr);
-
- CComPtr<IDeskBarClient> dbc;
- punkClient->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc));
- dbc->SetDeskBarSite(static_cast<IDeskBar*>(this));
-
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient(IUnknown **ppunkClient)
-{
- WrapLogEnter("CMenuDeskBar<%p>::GetClient(IUnknown **ppunkClient=%p)\n", this, ppunkClient);
- HRESULT hr = m_IDeskBar->GetClient(ppunkClient);
- if (ppunkClient) WrapLogMsg("*ppunkClient=%p\n", *ppunkClient);
- WrapLogExit("CMenuDeskBar::GetClient() = %08x\n", hr);
- return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnPosRectChangeDB(LPRECT prc)
-{
- WrapLogEnter("CMenuDeskBar<%p>::OnPosRectChangeDB(RECT *prc=%p)\n", this, prc);
- HRESULT hr = m_IDeskBar->OnPosRectChangeDB(prc);
- if (prc) WrapLogMsg("*prc=%s\n", Wrap(*prc));
- WrapLogExit("CMenuDeskBar::OnPosRectChangeDB() = %08x\n", hr);
- return hr;
-}
-#else
-
-CMenuDeskBar::CMenuDeskBar() :
- m_Client(NULL),
- m_Banner(NULL)
-{
-}
-
-CMenuDeskBar::~CMenuDeskBar()
-{
+ return S_OK;
}
HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *lphwnd)
CComPtr<IInputObjectSite> ios;
HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObjectSite, &ios));
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
return ios->OnFocusChangeIS(punkObj, fSetFocus);
HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID,
DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
+ if (IsEqualIID(*pguidCmdGroup, CGID_MenuDeskBar))
+ {
+ switch (nCmdID)
+ {
+ case 2: // refresh
+ return S_OK;
+ case 3: // load complete
+ return S_OK;
+ case 4: // set font metrics
+ return S_OK;
+ }
+ }
if (IsEqualIID(*pguidCmdGroup, CGID_Explorer))
{
}
HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
{
- if (m_Site == NULL)
- return E_FAIL;
-
if (IsEqualGUID(guidService, SID_SMenuPopup) ||
IsEqualGUID(guidService, SID_SMenuBandParent) ||
IsEqualGUID(guidService, SID_STopLevelBrowser))
{
return this->QueryInterface(riid, ppvObject);
}
+
+ if (IsEqualGUID(guidService, SID_SMenuBandBottom) ||
+ IsEqualGUID(guidService, SID_SMenuBandBottomSelected) ||
+ IsEqualGUID(guidService, SID_SMenuBandChild))
+ {
+ if (m_Client == NULL)
+ return E_NOINTERFACE;
+
+ return IUnknown_QueryService(m_Client, guidService, riid, ppvObject);
+ }
+
+
+ if (m_Site == NULL)
+ return E_NOINTERFACE;
return IUnknown_QueryService(m_Site, guidService, riid, ppvObject);
}
CComPtr<IInputObject> io;
HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io));
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
return io->HasFocusIO();
CComPtr<IInputObject> io;
HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io));
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
return io->TranslateAcceleratorIO(lpMsg);
HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient)
{
CComPtr<IDeskBarClient> pDeskBandClient;
- HRESULT hResult;
+ HRESULT hr;
m_Client.Release();
Create(NULL);
}
- hResult = punkClient->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&m_Client));
- if (FAILED(hResult))
- return hResult;
+ hr = punkClient->QueryInterface(IID_PPV_ARG(IUnknown, &m_Client));
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
- hResult = m_Client->QueryInterface(IID_IDeskBarClient, (VOID**) &pDeskBandClient);
- if (FAILED(hResult))
- return hResult;
+ hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &pDeskBandClient));
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
- return pDeskBandClient->SetDeskBarSite(static_cast<IDeskBar*>(this));
+ hr = pDeskBandClient->SetDeskBarSite(static_cast<IDeskBar*>(this));
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+
+ return IUnknown_GetWindow(m_Client, &m_ClientWindow);
}
HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient(IUnknown **ppunkClient)
{
if (prc == NULL)
return E_POINTER;
+
return S_OK;
}
HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite)
{
+ // Windows closes the bar if this is called when the bar is shown
+
+ if (m_Shown)
+ _CloseBar();
+
m_Site = pUnkSite;
+ IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_SubMenuParent));
+
return S_OK;
}
return m_Site->QueryInterface(riid, ppvSite);
}
-LRESULT CMenuDeskBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
-{
- HRESULT hr;
-
- if (m_Client)
- {
- CComPtr<IOleWindow> pOw;
- hr = m_Client->QueryInterface(IID_PPV_ARG(IOleWindow, &pOw));
- if (FAILED(hr))
- {
- ERR("IUnknown_QueryInterface pBs failed: %x\n", hr);
- return 0;
- }
-
- HWND clientWnd;
- pOw->GetWindow(&clientWnd);
-
- RECT rc;
-
- GetClientRect(&rc);
-
- if (m_Banner != NULL)
- {
- BITMAP bm;
- ::GetObject(m_Banner, sizeof(bm), &bm);
- rc.left += bm.bmWidth;
- }
-
- ::SetWindowPos(clientWnd, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, 0);
- }
-
- return 0;
-}
-
-LRESULT CMenuDeskBar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
-{
- CComPtr<IWinEventHandler> winEventHandler;
- LRESULT result;
- HRESULT hResult;
-
- result = 0;
- if (m_Client.p != NULL)
- {
- hResult = m_Client->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler));
- if (SUCCEEDED(hResult) && winEventHandler.p != NULL)
- hResult = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result);
- }
- return result;
-}
-
-LRESULT CMenuDeskBar::OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
-{
- return 0;
-}
-
-LRESULT CMenuDeskBar::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
-{
- TRACE("OnPaint\n");
-
- if (m_Banner && !m_IconSize)
- {
- BITMAP bm;
- PAINTSTRUCT ps;
- HDC hdc = BeginPaint(&ps);
-
- HDC hdcMem = ::CreateCompatibleDC(hdc);
- HGDIOBJ hbmOld = ::SelectObject(hdcMem, m_Banner);
-
- ::GetObject(m_Banner, sizeof(bm), &bm);
-
- RECT rc;
- if (!GetClientRect(&rc))
- WARN("GetClientRect failed\n");
-
- const int bx = bm.bmWidth;
- const int by = bm.bmHeight;
- const int cx = rc.right;
- const int cy = rc.bottom;
-
- TRACE("Painting banner: %d by %d\n", bm.bmWidth, bm.bmHeight);
-
- if (!::StretchBlt(hdc, 0, 0, bx, cy - by, hdcMem, 0, 0, bx, 1, SRCCOPY))
- WARN("StretchBlt failed\n");
-
- if (!::BitBlt(hdc, 0, cy - by, bx, by, hdcMem, 0, 0, SRCCOPY))
- WARN("BitBlt failed\n");
-
- ::SelectObject(hdcMem, hbmOld);
- ::DeleteDC(hdcMem);
-
- EndPaint(&ps);
- }
-
- return 0;
-}
-
HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags)
{
HRESULT hr;
return E_FAIL;
hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IOleCommandTarget, &oct));
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc));
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
+ // Windows calls this, but it appears to be unimplemented?
+ hr = dbc->SetModeDBC(1);
+ // Allow it to fail with E_NOTIMPL.
+
// No clue about the arg, using anything != 0
hr = dbc->UIActivateDBC(TRUE);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
RECT rc = { 0 };
hr = dbc->GetSize(0, &rc);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
// Unknown meaning
const int CMD_EXEC_OPT = 0;
hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
::AdjustWindowRect(&rc, ::GetWindowLong(m_hWnd, GWL_STYLE), FALSE);
- rc.right -= rc.left;
- rc.bottom -= rc.top;
+ ::OffsetRect(&rc, -rc.left, -rc.top);
if (m_Banner != NULL)
{
::GetObject(m_Banner, sizeof(bm), &bm);
rc.right += bm.bmWidth;
}
+
+ int x, y, cx, cy;
- int x = ppt->x;
- int y = ppt->y - rc.bottom;
- int cx = rc.right;
- int cy = rc.bottom;
+ RECT rcWorkArea;
+ GetWindowRect(GetDesktopWindow(), &rcWorkArea);
+ int waHeight = rcWorkArea.bottom - rcWorkArea.top;
- if (y < 0)
+ switch (dwFlags & 0xFF000000)
{
- y = 0;
+ case MPPF_BOTTOM:
+ x = ppt->x;
+ cx = rc.right - rc.left;
+ y = ppt->y - rc.bottom;
+ cy = rc.bottom - rc.top;
+ break;
+ case MPPF_RIGHT:
+ x = ppt->x + rc.left;
+ cx = rc.right - rc.left;
+ y = ppt->y + rc.top;
+ cy = rc.bottom - rc.top;
+ break;
+ case MPPF_TOP | MPPF_ALIGN_LEFT:
+ x = ppt->x - rc.right;
+ cx = rc.right - rc.left;
+ y = ppt->y + rc.top;
+ cy = rc.bottom - rc.top;
+ break;
+ case MPPF_TOP | MPPF_ALIGN_RIGHT:
+ x = ppt->x;
+ cx = rc.right - rc.left;
+ y = ppt->y + rc.top;
+ cy = rc.bottom - rc.top;
+ break;
}
- // if (y+cy > work area height) cy = work area height - y
+ if (x + cx > rcWorkArea.right)
+ {
+ // FIXME: Works, but it's oversimplified.
+ x = prcExclude->left - cx;
+ dwFlags = (dwFlags & (~MPPF_TOP)) | MPPF_LEFT;
+ }
- this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW);
+ if (y < rcWorkArea.top)
+ {
+ y = rcWorkArea.top;
+ }
+
+ if (cy > waHeight)
+ {
+ cy = waHeight;
+ }
+
+ if (y + cy > rcWorkArea.bottom)
+ {
+ y = rcWorkArea.bottom - cy;
+ }
+
+ this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW | SWP_NOACTIVATE);
+
+ m_ShowFlags = dwFlags;
+ m_Shown = true;
// HACK: The bar needs to be notified of the size AFTER it is shown.
// Quick & dirty way of getting it done.
BOOL bHandled;
- OnSize(WM_SIZE, 0, 0, bHandled);
+ _OnSize(WM_SIZE, 0, 0, bHandled);
UIActivateIO(TRUE, NULL);
const int CMD_EXEC_OPT = iIcon ? 0 : 2; // seems to work
hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL);
- if (FAILED(hr))
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
BOOL bHandled;
- OnSize(WM_SIZE, 0, 0, bHandled);
+ _OnSize(WM_SIZE, 0, 0, bHandled);
return hr;
}
m_Banner = hBitmap;
BOOL bHandled;
- OnSize(WM_SIZE, 0, 0, bHandled);
+ _OnSize(WM_SIZE, 0, 0, bHandled);
return S_OK;
}
return S_OK;
}
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(
- DWORD dwSelectType)
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(IMenuPopup *pmp, BOOL fSet)
{
- CComPtr<IDeskBarClient> dbc;
- HRESULT hr;
-
- bool bubbleUp = false;
- bool cancel = false;
+ // Called by the MenuBand to assign itself as the logical child of the DeskBar
+
+ if (fSet)
+ {
+ m_SubMenuChild = pmp;
+ }
+ else
+ {
+ if (m_SubMenuChild)
+ {
+ if (pmp == m_SubMenuChild)
+ {
+ m_SubMenuChild = NULL;
+ }
+ }
+ }
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(DWORD dwSelectType)
+{
+ /* As far as I can tell, the submenu hierarchy looks like this:
+
+ The DeskBar's Child is the Band it contains.
+ The DeskBar's Parent is the SID_SMenuPopup of the Site.
+
+ The Band's Child is the IMenuPopup of the child submenu.
+ The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar).
+
+ When the DeskBar receives a selection event:
+ If it requires closing the window, it will notify the Child (Band) using CancelLevel.
+ If it has to spread upwards (everything but CancelLevel), it will notify the Parent.
+
+ When the Band receives a selection event, this is where it gets fuzzy:
+ In which cases does it call the Parent? Probably not CancelLevel.
+ In which cases does it call the Child?
+ How does it react to calls?
+
+ */
switch (dwSelectType)
{
- case MPOS_FULLCANCEL:
case MPOS_EXECUTE:
- bubbleUp = true;
- cancel = true;
- // fall through
+ case MPOS_FULLCANCEL:
case MPOS_CANCELLEVEL:
- cancel = true;
- break;
+
+ _CloseBar();
+
+ if (dwSelectType == MPOS_CANCELLEVEL)
+ return S_OK;
+
case MPOS_SELECTLEFT:
case MPOS_SELECTRIGHT:
- // if unhandled, spread upwards?
- bubbleUp = true;
- return S_OK;
case MPOS_CHILDTRACKING:
- return S_OK;
+ if (m_SubMenuParent)
+ return m_SubMenuParent->OnSelect(dwSelectType);
+ break;
}
- if (cancel)
+ return S_OK;
+}
+
+HRESULT CMenuDeskBar::_CloseBar()
+{
+ CComPtr<IDeskBarClient> dbc;
+ HRESULT hr;
+
+ m_Shown = false;
+
+ if (m_SubMenuChild)
{
- hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc));
- if (FAILED(hr))
+ hr = m_SubMenuChild->OnSelect(MPOS_CANCELLEVEL);
+ if (FAILED_UNEXPECTEDLY(hr))
return hr;
+ }
- hr = dbc->UIActivateDBC(FALSE);
+ hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc));
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+
+ hr = dbc->UIActivateDBC(FALSE);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return hr;
+
+ SetWindowPos(NULL, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE);
+
+ return UIActivateIO(FALSE, NULL);
+}
+
+BOOL CMenuDeskBar::_IsSubMenuParent(HWND hwnd)
+{
+ CComPtr<IMenuPopup> popup = m_SubMenuParent;
+
+ 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)
+ return TRUE;
+
+ popup = NULL;
+ hr = IUnknown_GetSite(window, IID_PPV_ARG(IMenuPopup, &popup));
if (FAILED(hr))
- return hr;
+ return FALSE;
+ }
- SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
+ return FALSE;
+}
- UIActivateIO(FALSE, NULL);
+LRESULT CMenuDeskBar::_OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+ if (m_Client)
+ {
+ RECT rc;
+
+ GetClientRect(&rc);
+
+ if (m_Banner != NULL)
+ {
+ BITMAP bm;
+ ::GetObject(m_Banner, sizeof(bm), &bm);
+ rc.left += bm.bmWidth;
+ }
+
+ ::SetWindowPos(m_ClientWindow, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, 0);
}
- //if (bubbleUp && m_Site)
- //{
- // CComPtr<IMenuPopup> pmp;
- // HRESULT hr = IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp));
- // if (FAILED(hr))
- // return hr;
- // pmp->OnSelect(dwSelectType);
- //}
+ return 0;
+}
- return S_OK;
+LRESULT CMenuDeskBar::_OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+ if (!m_Client)
+ return 0;
+
+ CComPtr<IWinEventHandler> winEventHandler;
+ HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler));
+ if (FAILED_UNEXPECTEDLY(hr))
+ return 0;
+
+ if (winEventHandler)
+ {
+ LRESULT result;
+ hr = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return 0;
+ return result;
+ }
+
+ return 0;
}
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(
- IMenuPopup *pmp,
- BOOL fSet)
+LRESULT CMenuDeskBar::_OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
- if (fSet)
+ bHandled = FALSE;
+
+ if (m_Banner && !m_IconSize)
{
- m_SubMenuParent = pmp;
+ BITMAP bm;
+ PAINTSTRUCT ps;
+ HDC hdc = BeginPaint(&ps);
+
+ HDC hdcMem = ::CreateCompatibleDC(hdc);
+ HGDIOBJ hbmOld = ::SelectObject(hdcMem, m_Banner);
+
+ ::GetObject(m_Banner, sizeof(bm), &bm);
+
+ RECT rc;
+ if (!GetClientRect(&rc))
+ WARN("GetClientRect failed\n");
+
+ const int bx = bm.bmWidth;
+ const int by = bm.bmHeight;
+ const int cy = rc.bottom;
+
+ TRACE("Painting banner: %d by %d\n", bm.bmWidth, bm.bmHeight);
+
+ if (!::StretchBlt(hdc, 0, 0, bx, cy - by, hdcMem, 0, 0, bx, 1, SRCCOPY))
+ WARN("StretchBlt failed\n");
+
+ if (!::BitBlt(hdc, 0, cy - by, bx, by, hdcMem, 0, 0, SRCCOPY))
+ WARN("BitBlt failed\n");
+
+ ::SelectObject(hdcMem, hbmOld);
+ ::DeleteDC(hdcMem);
+
+ EndPaint(&ps);
}
- else
+
+ return TRUE;
+}
+
+LRESULT CMenuDeskBar::_OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+ // BUG in ReactOS: WM_ACTIVATE/WA_INACTIVE makes no sense with lParam==hWnd
+ if (LOWORD(wParam) != 0 || reinterpret_cast<HWND>(lParam) == m_hWnd)
{
- if (m_SubMenuParent)
+ return 0;
+ }
+
+ // HACK! I just want it to work !!!
+ CComPtr<IDeskBar> db;
+ HRESULT hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db));
+ if (FAILED_UNEXPECTEDLY(hr))
+ return 0;
+
+ CComPtr<IUnknown> punk;
+
+ hr = db->GetClient(&punk);
+ if (FAILED_UNEXPECTEDLY(hr))
+ return 0;
+
+ if (!punk && m_Shown)
+ {
+ if (!_IsSubMenuParent(reinterpret_cast<HWND>(lParam)))
{
- if (SHIsSameObject(pmp, m_SubMenuParent))
- {
- m_SubMenuParent = NULL;
- }
+ OnSelect(MPOS_FULLCANCEL);
}
}
- return S_OK;
-}
+ return 0;
+}
-HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS)
+LRESULT CMenuDeskBar::_OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
- return S_OK;
+ return MA_NOACTIVATE;
}
-#endif
\ No newline at end of file
+LRESULT CMenuDeskBar::_OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+ if (wParam == 0 && m_Shown)
+ {
+ OnSelect(MPOS_FULLCANCEL);
+ }
+ return 0;
+}
projects / reactos.git / blobdiff