Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 11:21:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* 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
This commit is contained in:
David Quintana 2014-06-19 23:14:39 +00:00
parent fb22c97c91
commit e33dc4351a
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
base/shell/rshell/CMakeLists.txt
View file

@ -28,6 +28,7 @@ target_link_libraries(rshell
wine) wine)
add_importlibs(rshell add_importlibs(rshell
uxtheme
shlwapi shlwapi
shell32 shell32
gdi32 gdi32

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

@ -44,7 +44,7 @@ HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
#else #else
*ppv = NULL; *ppv = NULL;
CMenuBand * site = new CComDebugObject<CMenuBand>(); CMenuBand * site = new CComObject<CMenuBand>();
if (!site) if (!site)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;

5
base/shell/rshell/CMenuToolbars.cpp
View file

@ -21,6 +21,7 @@
#include <windowsx.h> #include <windowsx.h>
#include <commoncontrols.h> #include <commoncontrols.h>
#include <shlwapi_undoc.h> #include <shlwapi_undoc.h>
#include <uxtheme.h>
#include "CMenuBand.h" #include "CMenuBand.h"
#include "CMenuToolbars.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; isHot = m_hotBar == this && (int) cdraw->nmcd.dwItemSpec == m_hotItem;
isPopup = m_popupBar == this && (int) cdraw->nmcd.dwItemSpec == m_popupItem; 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) // Remove HOT and CHECKED flags (will restore HOT if necessary)
cdraw->nmcd.uItemState &= ~(CDIS_HOT | CDIS_CHECKED); 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; INT index;
DWORD_PTR data; DWORD_PTR data;

2
dll/win32/browseui/internettoolbar.cpp
View file

@ -547,7 +547,7 @@ CInternetToolbar::CInternetToolbar()
fLocked = false; fLocked = false;
fMenuBandWindow = NULL; fMenuBandWindow = NULL;
fNavigationWindow = NULL; fNavigationWindow = NULL;
fMenuCallback = new CComDebugObject<CMenuCallback>(); fMenuCallback = new CComObject<CMenuCallback>();
fToolbarWindow = NULL; fToolbarWindow = NULL;
fAdviseCookie = 0; fAdviseCookie = 0;

5
dll/win32/browseui/shellbrowser.cpp
View file

@ -1093,12 +1093,17 @@ HRESULT CShellBrowser::GetMenuBand(REFIID riid, void **shellMenu)
CComPtr<IDeskBand> deskBand; CComPtr<IDeskBand> deskBand;
HRESULT hResult; HRESULT hResult;
if (!fClientBars[BIInternetToolbar].clientBar)
return E_FAIL;
hResult = IUnknown_QueryService(fClientBars[BIInternetToolbar].clientBar, SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite)); hResult = IUnknown_QueryService(fClientBars[BIInternetToolbar].clientBar, SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite));
if (FAILED_UNEXPECTEDLY(hResult)) if (FAILED_UNEXPECTEDLY(hResult))
return hResult; return hResult;
hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0); hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0);
if (FAILED_UNEXPECTEDLY(hResult)) if (FAILED_UNEXPECTEDLY(hResult))
return hResult; return hResult;
return deskBand->QueryInterface(riid, shellMenu); return deskBand->QueryInterface(riid, shellMenu);
} }