From ecf9d0b0468a6fb0f1a6cda4e7ce2ff61988a286 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sat, 13 Jul 2013 09:23:33 +0000
Subject: [PATCH] [BROWSEUI] - Export CCommonBrowser, CRegTreeOptions,
 CGlobalFolderSettings - Fix IBrowserService3 method signatures in
 CCommonBrowser - Add IContextMenu3 to CBandSiteMenu

svn path=/trunk/; revision=59468
---
 reactos/dll/win32/browseui/bandsitemenu.cpp       | 8 +++++++-
 reactos/dll/win32/browseui/bandsitemenu.h         | 5 ++++-
 reactos/dll/win32/browseui/browseui.cpp           | 3 +++
 reactos/dll/win32/browseui/commonbrowser.cpp      | 4 ++--
 reactos/dll/win32/browseui/commonbrowser.h        | 7 ++++---
 reactos/dll/win32/browseui/globalfoldersettings.h | 2 +-
 reactos/dll/win32/browseui/regtreeoptions.h       | 2 +-
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/reactos/dll/win32/browseui/bandsitemenu.cpp b/reactos/dll/win32/browseui/bandsitemenu.cpp
index 8a5b353334e..2bab41f705e 100644
--- a/reactos/dll/win32/browseui/bandsitemenu.cpp
+++ b/reactos/dll/win32/browseui/bandsitemenu.cpp
@@ -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;
 }
diff --git a/reactos/dll/win32/browseui/bandsitemenu.h b/reactos/dll/win32/browseui/bandsitemenu.h
index 51e0b561b7c..9388c79fe7a 100644
--- a/reactos/dll/win32/browseui/bandsitemenu.h
+++ b/reactos/dll/win32/browseui/bandsitemenu.h
@@ -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)
 
diff --git a/reactos/dll/win32/browseui/browseui.cpp b/reactos/dll/win32/browseui/browseui.cpp
index 438f505a0b6..bbc7570ed88 100644
--- a/reactos/dll/win32/browseui/browseui.cpp
+++ b/reactos/dll/win32/browseui/browseui.cpp
@@ -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;
diff --git a/reactos/dll/win32/browseui/commonbrowser.cpp b/reactos/dll/win32/browseui/commonbrowser.cpp
index 7294b7ce408..f409d778296 100644
--- a/reactos/dll/win32/browseui/commonbrowser.cpp
+++ b/reactos/dll/win32/browseui/commonbrowser.cpp
@@ -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;
 }
diff --git a/reactos/dll/win32/browseui/commonbrowser.h b/reactos/dll/win32/browseui/commonbrowser.h
index 6bb5c9bd58c..8cd6f9f4530 100644
--- a/reactos/dll/win32/browseui/commonbrowser.h
+++ b/reactos/dll/win32/browseui/commonbrowser.h
@@ -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()
 
diff --git a/reactos/dll/win32/browseui/globalfoldersettings.h b/reactos/dll/win32/browseui/globalfoldersettings.h
index e6e5493f2ce..abe476a9024 100644
--- a/reactos/dll/win32/browseui/globalfoldersettings.h
+++ b/reactos/dll/win32/browseui/globalfoldersettings.h
@@ -21,7 +21,7 @@
 #pragma once
 
 class CGlobalFolderSettings :
-    public CComCoClass<CGlobalFolderSettings, &CLSID_ACLMulti>,
+    public CComCoClass<CGlobalFolderSettings, &CLSID_GlobalFolderSettings>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IGlobalFolderSettings
 {
diff --git a/reactos/dll/win32/browseui/regtreeoptions.h b/reactos/dll/win32/browseui/regtreeoptions.h
index 634e5da1df9..eafdd322863 100644
--- a/reactos/dll/win32/browseui/regtreeoptions.h
+++ b/reactos/dll/win32/browseui/regtreeoptions.h
@@ -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