[BROWSEUI]

- Fix the order of some COM interfaces. This should have no functional effect, but makes testing easier.

svn path=/trunk/; revision=59467

diff --git a/reactos/dll/win32/browseui/aclmulti.h b/reactos/dll/win32/browseui/aclmulti.h
index b9a408b..66c740b 100644 (file)
--- a/reactos/dll/win32/browseui/aclmulti.h
+++ b/reactos/dll/win32/browseui/aclmulti.h
@@ -25,8 +25,8 @@ class CACLMulti :
     public CComCoClass<CACLMulti, &CLSID_ACLMulti>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IEnumString,
-    public IACList,
-    public IObjMgr
+    public IObjMgr,
+    public IACList
 {
 private:
     struct ACLMultiSublist

diff --git a/reactos/dll/win32/browseui/addressband.h b/reactos/dll/win32/browseui/addressband.h
index c5b4406..5e387b7 100644 (file)
--- a/reactos/dll/win32/browseui/addressband.h
+++ b/reactos/dll/win32/browseui/addressband.h
@@ -25,14 +25,14 @@ class CAddressBand :
     public CComCoClass<CAddressBand, &CLSID_SH_AddressBand>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IDeskBand,
-    public IOleCommandTarget,
     public IObjectWithSite,
     public IInputObject,
+    public IPersistStream,
+    public IOleCommandTarget,
+    public IServiceProvider,
     public IWinEventHandler,
     public IAddressBand,
-    public IServiceProvider,
-    public IInputObjectSite,
-    public IPersistStream
+    public IInputObjectSite
 {
 private:
     CComPtr<IDockingWindowSite>             fSite;

diff --git a/reactos/dll/win32/browseui/addresseditbox.h b/reactos/dll/win32/browseui/addresseditbox.h
index c720807..e85d040 100644 (file)
--- a/reactos/dll/win32/browseui/addresseditbox.h
+++ b/reactos/dll/win32/browseui/addresseditbox.h
@@ -24,13 +24,13 @@ class CAddressEditBox :
     public CWindowImpl<CAddressEditBox, CWindow, CControlWinTraits>,
     public CComCoClass<CAddressEditBox, &CLSID_AddressEditBox>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
-    public IShellService,
+    public IWinEventHandler,
+    public IDispatch,
     public IAddressBand,
     public IAddressEditBox,
-    public IWinEventHandler,
     public IOleCommandTarget,
-    public IDispatch,
-    public IPersistStream
+    public IPersistStream,
+    public IShellService
 {
 private:
     CContainedWindow                        fEditWindow;

diff --git a/reactos/dll/win32/browseui/bandsite.h b/reactos/dll/win32/browseui/bandsite.h
index cb68f3b..c4b7009 100644 (file)
--- a/reactos/dll/win32/browseui/bandsite.h
+++ b/reactos/dll/win32/browseui/bandsite.h
@@ -24,15 +24,15 @@
 class CBandSiteBase :
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IBandSite,
-    public IWinEventHandler,
-    public IDeskBarClient,
-    public IOleCommandTarget,
-    public IInputObject,
     public IInputObjectSite,
-    public IServiceProvider,
+    public IInputObject,
+    public IDeskBarClient,
+    public IWinEventHandler,
     public IPersistStream,
     public IDropTarget,
-    public IBandSiteHelper
+    public IServiceProvider,
+    public IBandSiteHelper,
+    public IOleCommandTarget
 {
 private:
     struct BandObject

diff --git a/reactos/dll/win32/browseui/bandsitemenu.h b/reactos/dll/win32/browseui/bandsitemenu.h
index f82b167..51e0b56 100644 (file)
--- a/reactos/dll/win32/browseui/bandsitemenu.h
+++ b/reactos/dll/win32/browseui/bandsitemenu.h
@@ -25,8 +25,8 @@
 class CBandSiteMenu :
     public CComCoClass<CBandSiteMenu, &CLSID_BandSiteMenu>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
-    public IShellService,
-    public IContextMenu2
+    public IContextMenu2,
+    public IShellService
 {
 public:
     CBandSiteMenu();

diff --git a/reactos/dll/win32/browseui/brandband.h b/reactos/dll/win32/browseui/brandband.h
index 483601a..d7999c4 100644 (file)
--- a/reactos/dll/win32/browseui/brandband.h
+++ b/reactos/dll/win32/browseui/brandband.h
@@ -28,9 +28,9 @@ class CBrandBand :
     public IObjectWithSite,
     public IInputObject,
     public IPersistStream,
-    public IWinEventHandler,
     public IOleCommandTarget,
     public IServiceProvider,
+    public IWinEventHandler,
     public IDispatch
 {
 private:

diff --git a/reactos/dll/win32/browseui/commonbrowser.h b/reactos/dll/win32/browseui/commonbrowser.h
index b60c870..6bb5c9b 100644 (file)
--- a/reactos/dll/win32/browseui/commonbrowser.h
+++ b/reactos/dll/win32/browseui/commonbrowser.h
@@ -23,15 +23,15 @@
 class CCommonBrowser :
     public CComCoClass<CCommonBrowser, &CLSID_ACLMulti>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IShellBrowser,
+    public IBrowserService3,
     public IServiceProvider,
     public IOleCommandTarget,
-    public IBrowserService3,
-    public IShellBrowser,
-    public IShellBrowserService,
     public IDockingWindowSite,
     public IDockingWindowFrame,
     public IInputObjectSite,
-    public IDropTarget
+    public IDropTarget,
+    public IShellBrowserService
 {
 private:
 public: