From 9ebe8b2e4ed3165353dd6da9ba67ebb6f193bec2 Mon Sep 17 00:00:00 2001 From: David Quintana Date: Wed, 25 Jun 2014 15:56:04 +0000 Subject: [PATCH] [BROWSEUI] * Make use of shell command ID macros for toolbar button IDs. svn path=/branches/shell-experiments/; revision=63644 --- dll/win32/browseui/internettoolbar.cpp | 2 +- dll/win32/browseui/internettoolbar.h | 18 +++++++++--------- include/psdk/shlobj.h | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index cb45d995806..c0cc82f5128 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -1624,7 +1624,7 @@ LRESULT CInternetToolbar::OnMenuDropDown(UINT idControl, NMHDR *pNMHDR, BOOL &bH V_INTREF(&inValue) = reinterpret_cast(&bounds); if (fCommandTarget.p != NULL) - hResult = fCommandTarget->Exec(&fCommandCategory, 0x7031, 1, &inValue, &outValue); + hResult = fCommandTarget->Exec(&fCommandCategory, FCIDM_SHVIEW_AUTOARRANGE, 1, &inValue, &outValue); // pvaOut is VT_I4 with value 0x403 break; } diff --git a/dll/win32/browseui/internettoolbar.h b/dll/win32/browseui/internettoolbar.h index d2c8a144014..f2ec69f8743 100644 --- a/dll/win32/browseui/internettoolbar.h +++ b/dll/win32/browseui/internettoolbar.h @@ -22,20 +22,20 @@ static const int gSearchCommandID = 1003; static const int gFoldersCommandID = 1004; -static const int gMoveToCommandID = 0x701f; -static const int gCopyToCommandID = 0x701e; -static const int gDeleteCommandID = 0x7011; -static const int gUndoCommandID = 0x701b; -static const int gViewsCommandID = 0x7031; +static const int gMoveToCommandID = FCIDM_SHVIEW_MOVETO; +static const int gCopyToCommandID = FCIDM_SHVIEW_COPYTO; +static const int gDeleteCommandID = FCIDM_SHVIEW_DELETE; +static const int gUndoCommandID = FCIDM_SHVIEW_UNDO; +static const int gViewsCommandID = FCIDM_SHVIEW_AUTOARRANGE; static const int gStopCommandID = 1010; static const int gHomeCommandID = 1012; static const int gFavoritesCommandID = 1015; static const int gHistoryCommandID = 1016; static const int gFullScreenCommandID = 1017; -static const int gPropertiesCommandID = 0x7013; -static const int gCutCommandID = 0x7018; -static const int gCopyCommandID = 0x7019; -static const int gPasteCommandID = 0x701a; +static const int gPropertiesCommandID = FCIDM_SHVIEW_PROPERTIES; +static const int gCutCommandID = FCIDM_SHVIEW_CUT; +static const int gCopyCommandID = FCIDM_SHVIEW_COPY; +static const int gPasteCommandID = FCIDM_SHVIEW_INSERT; class CMenuCallback : public CComObjectRootEx, diff --git a/include/psdk/shlobj.h b/include/psdk/shlobj.h index 4c84afc72ce..b5451688d3f 100644 --- a/include/psdk/shlobj.h +++ b/include/psdk/shlobj.h @@ -466,6 +466,8 @@ typedef struct #define FCIDM_SHVIEW_INSERT 0x701A #define FCIDM_SHVIEW_UNDO 0x701B #define FCIDM_SHVIEW_INSERTLINK 0x701C +#define FCIDM_SHVIEW_COPYTO 0x701E +#define FCIDM_SHVIEW_MOVETO 0x701F #define FCIDM_SHVIEW_SELECTALL 0x7021 #define FCIDM_SHVIEW_INVERTSELECTION 0x7022