[RSHELL]
authorDavid Quintana <gigaherz@gmail.com>
Thu, 19 Jun 2014 23:14:39 +0000 (23:14 +0000)
committerDavid Quintana <gigaherz@gmail.com>
Thu, 19 Jun 2014 23:14:39 +0000 (23:14 +0000)
* Turn off spammy log.
* A small themeing tweak for the menubar.

[BROWSEUI]
* Turn off spammy log.
* A small tweak to a function.

svn path=/branches/shell-experiments/; revision=63620

base/shell/rshell/CMakeLists.txt
base/shell/rshell/CMenuBand.cpp
base/shell/rshell/CMenuToolbars.cpp
dll/win32/browseui/internettoolbar.cpp
dll/win32/browseui/shellbrowser.cpp

index 00ff621..741b4a9 100644 (file)
@@ -28,6 +28,7 @@ target_link_libraries(rshell
     wine)
 
 add_importlibs(rshell
+    uxtheme
     shlwapi
     shell32
     gdi32
index c263324..229cb1e 100644 (file)
@@ -44,7 +44,7 @@ HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
 #else
     *ppv = NULL;
 
-    CMenuBand * site = new CComDebugObject<CMenuBand>();
+    CMenuBand * site = new CComObject<CMenuBand>();
 
     if (!site)
         return E_OUTOFMEMORY;
index ec33127..3114193 100644 (file)
@@ -21,6 +21,7 @@
 #include <windowsx.h>
 #include <commoncontrols.h>
 #include <shlwapi_undoc.h>
+#include <uxtheme.h>
 
 #include "CMenuBand.h"
 #include "CMenuToolbars.h"
@@ -195,7 +196,7 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
         isHot = m_hotBar == this && (int) cdraw->nmcd.dwItemSpec == m_hotItem;
         isPopup = m_popupBar == this && (int) cdraw->nmcd.dwItemSpec == m_popupItem;
 
-        if (m_initFlags & SMINIT_VERTICAL)
+        if (m_initFlags & SMINIT_VERTICAL || IsAppThemed())
         {
             // Remove HOT and CHECKED flags (will restore HOT if necessary)
             cdraw->nmcd.uItemState &= ~(CDIS_HOT | CDIS_CHECKED);
@@ -829,7 +830,7 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theRe
 
 HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
 {
-    m_menuBand->_KillPopupTimers();
+    this->m_menuBand->_KillPopupTimers();
 
     INT index;
     DWORD_PTR data;
index c630347..cb45d99 100644 (file)
@@ -547,7 +547,7 @@ CInternetToolbar::CInternetToolbar()
     fLocked = false;
     fMenuBandWindow = NULL;
     fNavigationWindow = NULL;
-    fMenuCallback = new CComDebugObject<CMenuCallback>();
+    fMenuCallback = new CComObject<CMenuCallback>();
     fToolbarWindow = NULL;
     fAdviseCookie = 0;
 
index 9d7e77c..ceea44f 100644 (file)
@@ -1093,12 +1093,17 @@ HRESULT CShellBrowser::GetMenuBand(REFIID riid, void **shellMenu)
     CComPtr<IDeskBand>                      deskBand;
     HRESULT                                 hResult;
 
+    if (!fClientBars[BIInternetToolbar].clientBar)
+        return E_FAIL;
+
     hResult = IUnknown_QueryService(fClientBars[BIInternetToolbar].clientBar, SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite));
     if (FAILED_UNEXPECTEDLY(hResult))
         return hResult;
+
     hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0);
     if (FAILED_UNEXPECTEDLY(hResult))
         return hResult;
+
     return deskBand->QueryInterface(riid, shellMenu);
 }