Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 01:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BROWSEUI] CBandSiteMenu: Show Toolbar error on failure

Browse source
This commit is contained in:
Stanislav Motylkov 2017-11-06 19:50:49 +03:00 committed by Giannis Adamopoulos
parent f723d230a0
commit f01e6ed6c5
20 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/browseui/lang/bg-BG.rc
View file

@ -295,4 +295,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/de-DE.rc
View file

@ -314,4 +314,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/en-US.rc
View file

@ -313,4 +313,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/es-ES.rc
View file

@ -297,4 +297,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/fr-FR.rc
View file

@ -313,4 +313,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/he-IL.rc
View file

@ -297,4 +297,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/it-IT.rc
View file

@ -295,4 +295,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/ja-JP.rc
View file

@ -313,4 +313,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/pl-PL.rc
View file

@ -303,4 +303,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/pt-BR.rc
View file

@ -297,4 +297,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/ro-RO.rc
View file

@ -297,4 +297,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/ru-RU.rc
View file

@ -297,4 +297,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/sq-AL.rc
View file

@ -314,4 +314,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/tr-TR.rc
View file

@ -297,4 +297,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/uk-UA.rc
View file

@ -297,4 +297,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/zh-CN.rc
View file

@ -315,4 +315,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/lang/zh-TW.rc
View file

@ -315,4 +315,6 @@ END
STRINGTABLE
BEGIN
IDS_BROWSEFORNEWTOOLAR "Choose a folder"
IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END

2
dll/win32/browseui/resource.h
View file

@ -109,6 +109,8 @@
#define IDS_NOTEXTLABELS 12304
#define IDS_SELECTIVETEXTONRIGHT 12305
#define IDS_BROWSEFORNEWTOOLAR 12387
#define IDS_TOOLBAR_ERR_TITLE 12388
#define IDS_TOOLBAR_ERR_TEXT 12389
#define IDS_GOBUTTONLABEL 12656
#define IDS_GOBUTTONTIPTEMPLATE 12657
#define IDS_SEARCHLABEL 12897

19
dll/win32/browseui/shellbars/CBandSiteMenu.cpp
View file

@ -386,6 +386,21 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::QueryContextMenu(
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(idMax - idCmdFirst +1));
}
HRESULT CBandSiteMenu::_ShowToolbarError(HRESULT hRet)
{
WCHAR szText[260];
WCHAR szTitle[256];
if (!LoadStringW(GetModuleHandleW(L"browseui.dll"), IDS_TOOLBAR_ERR_TEXT, szText, _countof(szText)))
StringCchCopyW(szText, _countof(szText), L"Cannot create toolbar.");
if (!LoadStringW(GetModuleHandleW(L"browseui.dll"), IDS_TOOLBAR_ERR_TITLE, szTitle, _countof(szTitle)))
StringCchCopyW(szTitle, _countof(szTitle), L"Toolbar");
MessageBoxW(NULL, szText, szTitle, MB_OK | MB_ICONSTOP | MB_SETFOREGROUND);
return hRet;
}
HRESULT STDMETHODCALLTYPE CBandSiteMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
{
HRESULT hRet;
@ -429,11 +444,11 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpi
CComPtr<IDeskBand> pDeskBand;
hRet = _CreateBuiltInISFBand(uID, IID_PPV_ARG(IDeskBand, &pDeskBand));
if (FAILED_UNEXPECTEDLY(hRet))
return hRet;
return _ShowToolbarError(hRet);
hRet = m_BandSite->AddBand(pDeskBand);
if (FAILED_UNEXPECTEDLY(hRet))
return hRet;
return _ShowToolbarError(hRet);
}
return S_OK;
}

1
dll/win32/browseui/shellbars/CBandSiteMenu.h
View file

@ -43,6 +43,7 @@ class CBandSiteMenu :
UINT _GetMenuIdFromBand(CLSID *BandCLSID);
UINT _GetBandIdFromClsid(CLSID* pclsid);
UINT _GetBandIdForBuiltinISFBand(UINT uID);
HRESULT _ShowToolbarError(HRESULT hRet);
public:
CBandSiteMenu();