[RSHELL]

* 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

diff --git a/base/shell/rshell/CMakeLists.txt b/base/shell/rshell/CMakeLists.txt
index 00ff621..741b4a9 100644 (file)
--- a/base/shell/rshell/CMakeLists.txt
+++ b/base/shell/rshell/CMakeLists.txt
@@ -28,6 +28,7 @@ target_link_libraries(rshell
     wine)
 
 add_importlibs(rshell
     wine)
 
 add_importlibs(rshell

+    uxtheme

     shlwapi
     shell32
     gdi32
     shlwapi
     shell32
     gdi32

diff --git a/base/shell/rshell/CMenuBand.cpp b/base/shell/rshell/CMenuBand.cpp
index c263324..229cb1e 100644 (file)
--- a/base/shell/rshell/CMenuBand.cpp
+++ b/base/shell/rshell/CMenuBand.cpp
@@ -44,7 +44,7 @@ HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
 #else
     *ppv = NULL;
 
 #else
     *ppv = NULL;
 

-    CMenuBand * site = new CComDebugObject<CMenuBand>();
+    CMenuBand * site = new CComObject<CMenuBand>();

 
     if (!site)
         return E_OUTOFMEMORY;
 
     if (!site)
         return E_OUTOFMEMORY;

diff --git a/base/shell/rshell/CMenuToolbars.cpp b/base/shell/rshell/CMenuToolbars.cpp
index ec33127..3114193 100644 (file)
--- a/base/shell/rshell/CMenuToolbars.cpp
+++ b/base/shell/rshell/CMenuToolbars.cpp
@@ -21,6 +21,7 @@
 #include <windowsx.h>
 #include <commoncontrols.h>
 #include <shlwapi_undoc.h>
 #include <windowsx.h>
 #include <commoncontrols.h>
 #include <shlwapi_undoc.h>

+#include <uxtheme.h>

 
 #include "CMenuBand.h"
 #include "CMenuToolbars.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;
 
         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);
         {
             // 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)
 {
 
 HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
 {

-    m_menuBand->_KillPopupTimers();
+    this->m_menuBand->_KillPopupTimers();

 
     INT index;
     DWORD_PTR data;
 
     INT index;
     DWORD_PTR data;

diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp
index c630347..cb45d99 100644 (file)
--- a/dll/win32/browseui/internettoolbar.cpp
+++ b/dll/win32/browseui/internettoolbar.cpp
@@ -547,7 +547,7 @@ CInternetToolbar::CInternetToolbar()
     fLocked = false;
     fMenuBandWindow = NULL;
     fNavigationWindow = NULL;
     fLocked = false;
     fMenuBandWindow = NULL;
     fNavigationWindow = NULL;

-    fMenuCallback = new CComDebugObject<CMenuCallback>();
+    fMenuCallback = new CComObject<CMenuCallback>();

     fToolbarWindow = NULL;
     fAdviseCookie = 0;
 
     fToolbarWindow = NULL;
     fAdviseCookie = 0;
 

diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp
index 9d7e77c..ceea44f 100644 (file)
--- a/dll/win32/browseui/shellbrowser.cpp
+++ b/dll/win32/browseui/shellbrowser.cpp
@@ -1093,12 +1093,17 @@ HRESULT CShellBrowser::GetMenuBand(REFIID riid, void **shellMenu)
     CComPtr<IDeskBand>                      deskBand;
     HRESULT                                 hResult;
 
     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 = 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;
     hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0);
     if (FAILED_UNEXPECTEDLY(hResult))
         return hResult;

+

     return deskBand->QueryInterface(riid, shellMenu);
 }
 
     return deskBand->QueryInterface(riid, shellMenu);
 }