[ros-diffs] [dquintana] 63620: [RSHELL] * Turn off spammy log. * A small themeing tweak for the menubar. [BROWSEUI] * Turn off spammy log. * A small tweak to a function.

Author: dquintana
Date: Thu Jun 19 23:14:39 2014
New Revision: 63620

URL: http://svn.reactos.org/svn/reactos?rev=63620&view=rev
Log:
[RSHELL]
* Turn off spammy log.
* A small themeing tweak for the menubar.

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

Modified:
    branches/shell-experiments/base/shell/rshell/CMakeLists.txt
    branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
    branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp
    branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp
    branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp

Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMakeLists.txt	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt	[iso-8859-1] Thu Jun 19
23:14:39 2014
@@ -28,6 +28,7 @@
     wine)
 
 add_importlibs(rshell
+    uxtheme
     shlwapi
     shell32
     gdi32

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] Thu Jun 19
23:14:39 2014
@@ -44,7 +44,7 @@
 #else
     *ppv = NULL;
 
-    CMenuBand * site = new CComDebugObject<CMenuBand>();
+    CMenuBand * site = new CComObject<CMenuBand>();
 
     if (!site)
         return E_OUTOFMEMORY;

Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp	[iso-8859-1] Thu Jun 19
23:14:39 2014
@@ -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 @@
         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::ExecuteItem(INT iItem)
 {
-    m_menuBand->_KillPopupTimers();
+    this->m_menuBand->_KillPopupTimers();
 
     INT index;
     DWORD_PTR data;

Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro…
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp	[iso-8859-1] Thu Jun
19 23:14:39 2014
@@ -547,7 +547,7 @@
     fLocked = false;
     fMenuBandWindow = NULL;
     fNavigationWindow = NULL;
-    fMenuCallback = new CComDebugObject<CMenuCallback>();
+    fMenuCallback = new CComObject<CMenuCallback>();
     fToolbarWindow = NULL;
     fAdviseCookie = 0;
 

Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro…
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp	[iso-8859-1] Thu Jun 19
23:14:39 2014
@@ -1093,12 +1093,17 @@
     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);
 }