[BROWSEUI]

- Export CCommonBrowser, CRegTreeOptions, CGlobalFolderSettings
- Fix IBrowserService3 method signatures in CCommonBrowser
- Add IContextMenu3 to CBandSiteMenu

svn path=/trunk/; revision=59468
This commit is contained in:
Thomas Faber 2013-07-13 09:23:33 +00:00
parent 57fef2297a
commit ecf9d0b046
7 changed files with 22 additions and 9 deletions

View file

@ -59,6 +59,12 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::GetCommandString(UINT_PTR idCmd, UINT u
HRESULT STDMETHODCALLTYPE CBandSiteMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam)
{
FIXME("(%p, %p)\n", this, uMsg, wParam, lParam);
FIXME("(%p, %u, %p, %p)\n", this, uMsg, wParam, lParam);
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CBandSiteMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult)
{
FIXME("(%p, %u, %p, %p, %p)\n", this, uMsg, wParam, lParam);
return E_NOTIMPL;
}

View file

@ -25,7 +25,7 @@
class CBandSiteMenu :
public CComCoClass<CBandSiteMenu, &CLSID_BandSiteMenu>,
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IContextMenu2,
public IContextMenu3,
public IShellService
{
public:
@ -43,6 +43,9 @@ public:
// *** IContextMenu2 methods ***
virtual HRESULT STDMETHODCALLTYPE HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam);
// *** IContextMenu3 methods ***
virtual HRESULT STDMETHODCALLTYPE HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult);
DECLARE_REGISTRY_RESOURCEID(IDR_BANDSITEMENU)
DECLARE_NOT_AGGREGATABLE(CBandSiteMenu)

View file

@ -36,7 +36,10 @@ OBJECT_ENTRY(CLSID_BandProxy, CBandProxy)
OBJECT_ENTRY(CLSID_RebarBandSite, CBandSite)
OBJECT_ENTRY(CLSID_BandSiteMenu, CBandSiteMenu)
OBJECT_ENTRY(CLSID_BrandBand, CBrandBand)
OBJECT_ENTRY(CLSID_CCommonBrowser, CCommonBrowser)
OBJECT_ENTRY(CLSID_GlobalFolderSettings, CGlobalFolderSettings)
OBJECT_ENTRY(CLSID_InternetToolbar, CInternetToolbar)
OBJECT_ENTRY(CLSID_CRegTreeOptions, CRegTreeOptions)
END_OBJECT_MAP()
CBrowseUIModule gModule;

View file

@ -509,13 +509,13 @@ HRESULT STDMETHODCALLTYPE CCommonBrowser::v_CheckZoneCrossing(LPCITEMIDLIST pidl
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CCommonBrowser::_PositionViewWindow(HWND *, RECT *)
HRESULT STDMETHODCALLTYPE CCommonBrowser::_PositionViewWindow(HWND, RECT *)
{
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CCommonBrowser::IEParseDisplayNameEx(
unsigned int, const unsigned short *, DWORD, LPITEMIDLIST *)
UINT, PCWSTR, DWORD, LPITEMIDLIST *)
{
return E_NOTIMPL;
}

View file

@ -21,7 +21,7 @@
#pragma once
class CCommonBrowser :
public CComCoClass<CCommonBrowser, &CLSID_ACLMulti>,
public CComCoClass<CCommonBrowser, &CLSID_CCommonBrowser>,
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IShellBrowser,
public IBrowserService3,
@ -142,8 +142,8 @@ public:
virtual HRESULT STDMETHODCALLTYPE v_CheckZoneCrossing(LPCITEMIDLIST pidl);
// *** IBrowserService3 methods ***
virtual HRESULT STDMETHODCALLTYPE _PositionViewWindow(HWND *, RECT *);
virtual HRESULT STDMETHODCALLTYPE IEParseDisplayNameEx(unsigned int, const unsigned short *, DWORD, LPITEMIDLIST *);
virtual HRESULT STDMETHODCALLTYPE _PositionViewWindow(HWND, RECT *);
virtual HRESULT STDMETHODCALLTYPE IEParseDisplayNameEx(UINT, PCWSTR, DWORD, LPITEMIDLIST *);
// *** IShellBrowser methods ***
virtual HRESULT STDMETHODCALLTYPE InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths);
@ -187,6 +187,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect);
DECLARE_REGISTRY_RESOURCEID(IDR_COMMONBROWSER)
DECLARE_NOT_AGGREGATABLE(CCommonBrowser)
DECLARE_PROTECT_FINAL_CONSTRUCT()

View file

@ -21,7 +21,7 @@
#pragma once
class CGlobalFolderSettings :
public CComCoClass<CGlobalFolderSettings, &CLSID_ACLMulti>,
public CComCoClass<CGlobalFolderSettings, &CLSID_GlobalFolderSettings>,
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IGlobalFolderSettings
{

View file

@ -21,7 +21,7 @@
#pragma once
class CRegTreeOptions :
public CComCoClass<CRegTreeOptions, &CLSID_ACLMulti>,
public CComCoClass<CRegTreeOptions, &CLSID_CRegTreeOptions>,
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IRegTreeOptions,
public IObjectWithSite