[ros-diffs] [dquintana] 62254: [RSHELL] * Reduce a few more log differences with windows. CORE-7586

Author: dquintana
Date: Wed Feb 19 13:58:28 2014
New Revision: 62254

URL: http://svn.reactos.org/svn/reactos?rev=62254&view=rev
Log:
[RSHELL]
* Reduce a few more log differences with windows.
CORE-7586

Modified:
    branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
    branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
    branches/shell-experiments/base/shell/rshell/precomp.h

Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp	[iso-8859-1] Wed Feb 19
13:58:28 2014
@@ -1289,8 +1289,28 @@
 
 HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg)
 {
-    UNIMPLEMENTED;
-    return S_OK;
+    HRESULT hr;
+
+    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()

Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] Wed Feb 19
13:58:28 2014
@@ -23,6 +23,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar);
 
+const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4, 0x00,
0xA0, 0xC9, 0x08, 0x26, 0x36 } };
+
 typedef CWinTraits<
     WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
     WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_PALETTEWINDOW
@@ -193,6 +195,18 @@
 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))
     {
     }

Modified: branches/shell-experiments/base/shell/rshell/precomp.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/precomp.h	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/precomp.h	[iso-8859-1] Wed Feb 19
13:58:28 2014
@@ -1,5 +1,5 @@
 
-#define USE_SYSTEM_MENUDESKBAR 1
+#define USE_SYSTEM_MENUDESKBAR 0
 #define USE_SYSTEM_MENUSITE 0
 #define USE_SYSTEM_MENUBAND 0