Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:03:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Reduce a few more log differences with windows.
CORE-7586

svn path=/branches/shell-experiments/; revision=62254
This commit is contained in:
David Quintana 2014-02-19 13:58:28 +00:00
parent 3b21639530
commit b6207043c9
3 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
base/shell/rshell/CMenuBand.cpp
View file

@ -1289,8 +1289,28 @@ HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode)
HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg)
{ {
UNIMPLEMENTED; HRESULT hr;
return S_OK;
CComPtr<IMenuPopup> pmp;
hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp));
if (FAILED(hr))
return hr;
hr = pmp->SetSubMenu(this, TRUE);
if (FAILED(hr))
return hr;
CComPtr<IOleWindow> pTopLevelWindow;
hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &pTopLevelWindow));
if (FAILED(hr))
return hr;
hr = pTopLevelWindow->GetWindow(&m_topLevelWindow);
if (FAILED(hr))
return hr;
return S_FALSE;
} }
HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO() HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO()

14
base/shell/rshell/CMenuDeskBar.cpp
View file

@ -23,6 +23,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar); WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar);
const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36 } };
typedef CWinTraits< typedef CWinTraits<
WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_PALETTEWINDOW WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_PALETTEWINDOW
@ -193,6 +195,18 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, U
HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID,
DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) 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)) if (IsEqualIID(*pguidCmdGroup, CGID_Explorer))
{ {
} }

2
base/shell/rshell/precomp.h
View file

@ -1,5 +1,5 @@
#define USE_SYSTEM_MENUDESKBAR 1 #define USE_SYSTEM_MENUDESKBAR 0
#define USE_SYSTEM_MENUSITE 0 #define USE_SYSTEM_MENUSITE 0
#define USE_SYSTEM_MENUBAND 0 #define USE_SYSTEM_MENUBAND 0