[ros-diffs] [tfaber] 59468: [BROWSEUI] - Export CCommonBrowser, CRegTreeOptions, CGlobalFolderSettings - Fix IBrowserService3 method signatures in CCommonBrowser - Add IContextMenu3 to CBandSiteMenu

Author: tfaber
Date: Sat Jul 13 09:23:33 2013
New Revision: 59468

URL: http://svn.reactos.org/svn/reactos?rev=59468&view=rev
Log:
[BROWSEUI]
- Export CCommonBrowser, CRegTreeOptions, CGlobalFolderSettings
- Fix IBrowserService3 method signatures in CCommonBrowser
- Add IContextMenu3 to CBandSiteMenu

Modified:
    trunk/reactos/dll/win32/browseui/bandsitemenu.cpp
    trunk/reactos/dll/win32/browseui/bandsitemenu.h
    trunk/reactos/dll/win32/browseui/browseui.cpp
    trunk/reactos/dll/win32/browseui/commonbrowser.cpp
    trunk/reactos/dll/win32/browseui/commonbrowser.h
    trunk/reactos/dll/win32/browseui/globalfoldersettings.h
    trunk/reactos/dll/win32/browseui/regtreeoptions.h

Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit…
==============================================================================
--- trunk/reactos/dll/win32/browseui/bandsitemenu.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/bandsitemenu.cpp	[iso-8859-1] Sat Jul 13 09:23:33
2013
@@ -59,6 +59,12 @@
 
 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;
+}

Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit…
==============================================================================
--- trunk/reactos/dll/win32/browseui/bandsitemenu.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/bandsitemenu.h	[iso-8859-1] Sat Jul 13 09:23:33 2013
@@ -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 @@
     // *** 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)
 

Modified: trunk/reactos/dll/win32/browseui/browseui.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu…
==============================================================================
--- trunk/reactos/dll/win32/browseui/browseui.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/browseui.cpp	[iso-8859-1] Sat Jul 13 09:23:33 2013
@@ -36,7 +36,10 @@
 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;

Modified: trunk/reactos/dll/win32/browseui/commonbrowser.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb…
==============================================================================
--- trunk/reactos/dll/win32/browseui/commonbrowser.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/commonbrowser.cpp	[iso-8859-1] Sat Jul 13 09:23:33
2013
@@ -509,13 +509,13 @@
     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;
 }

Modified: trunk/reactos/dll/win32/browseui/commonbrowser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb…
==============================================================================
--- trunk/reactos/dll/win32/browseui/commonbrowser.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/commonbrowser.h	[iso-8859-1] Sat Jul 13 09:23:33
2013
@@ -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 @@
     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 @@
     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()
 

Modified: trunk/reactos/dll/win32/browseui/globalfoldersettings.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/globalf…
==============================================================================
--- trunk/reactos/dll/win32/browseui/globalfoldersettings.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/globalfoldersettings.h	[iso-8859-1] Sat Jul 13
09:23:33 2013
@@ -21,7 +21,7 @@
 #pragma once
 
 class CGlobalFolderSettings :
-    public CComCoClass<CGlobalFolderSettings, &CLSID_ACLMulti>,
+    public CComCoClass<CGlobalFolderSettings, &CLSID_GlobalFolderSettings>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IGlobalFolderSettings
 {

Modified: trunk/reactos/dll/win32/browseui/regtreeoptions.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/regtree…
==============================================================================
--- trunk/reactos/dll/win32/browseui/regtreeoptions.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/regtreeoptions.h	[iso-8859-1] Sat Jul 13 09:23:33
2013
@@ -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