[ros-diffs] [dquintana] 65822: [RSHELL] * Add a copy of CBandSite to rshell, so we can debug it in windows with our explorer.

[dquintana]

Author: dquintana
Date: Wed Dec 24 17:00:53 2014
New Revision: 65822

URL: http://svn.reactos.org/svn/reactos?rev=65822&view=rev
Log:
[RSHELL]
* Add a copy of CBandSite to rshell, so we can debug it in windows with our 
explorer.

Added:
    trunk/reactos/base/shell/rshell/CBandSite.cpp
      - copied, changed from r65814, 
trunk/reactos/dll/win32/browseui/bandsite.cpp
    trunk/reactos/base/shell/rshell/CBandSite.h
      - copied, changed from r65814, trunk/reactos/dll/win32/browseui/bandsite.h
Modified:
    trunk/reactos/base/shell/rshell/CMakeLists.txt
    trunk/reactos/base/shell/rshell/misc.cpp
    trunk/reactos/base/shell/rshell/precomp.h

Copied: trunk/reactos/base/shell/rshell/CBandSite.cpp (from r65814, 
trunk/reactos/dll/win32/browseui/bandsite.cpp)
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CBandSite.cpp?p2=trunk/reactos/base/shell/rshell/CBandSite.cpp&p1=trunk/reactos/dll/win32/browseui/bandsite.cpp&r1=65814&r2=65822&rev=65822&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/bandsite.cpp       [iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/CBandSite.cpp       [iso-8859-1] Wed Dec 24 
17:00:53 2014
@@ -20,12 +20,23 @@
  */
 
 #include "precomp.h"
+#include <shobjidl.h>
+
+#include "CBandSite.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(CBandSite);
 
 #ifndef ASSERT
 #define ASSERT(cond) \
     if (!(cond)) \
         ERR ("ASSERTION %s AT %s:%d FAILED!\n", #cond, __FILE__, __LINE__)
 #endif
+
+extern "C"
+HRESULT WINAPI CBandSite_Constructor(REFIID riid, LPVOID *ppv)
+{
+    return ShellObjectCreator<CBandSite>(riid, ppv);
+}
 
 CBandSiteBase::CBandSiteBase()
 {

Copied: trunk/reactos/base/shell/rshell/CBandSite.h (from r65814, 
trunk/reactos/dll/win32/browseui/bandsite.h)
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CBandSite.h?p2=trunk/reactos/base/shell/rshell/CBandSite.h&p1=trunk/reactos/dll/win32/browseui/bandsite.h&r1=65814&r2=65822&rev=65822&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/bandsite.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/CBandSite.h [iso-8859-1] Wed Dec 24 
17:00:53 2014
@@ -142,8 +142,6 @@
     public CBandSiteBase
 {
 public:
-
-    DECLARE_REGISTRY_RESOURCEID(IDR_BANDSITE)
     DECLARE_AGGREGATABLE(CBandSite)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()

Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMakeLists.txt?rev=65822&r1=65821&r2=65822&view=diff
==============================================================================
--- trunk/reactos/base/shell/rshell/CMakeLists.txt      [iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/CMakeLists.txt      [iso-8859-1] Wed Dec 24 
17:00:53 2014
@@ -7,6 +7,7 @@
 spec2def(rshell.dll rshell.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
+    CBandSite.cpp
     CDesktopBrowser.cpp
     CMenuBand.cpp
     CMenuDeskBar.cpp

Modified: trunk/reactos/base/shell/rshell/misc.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp?rev=65822&r1=65821&r2=65822&view=diff
==============================================================================
--- trunk/reactos/base/shell/rshell/misc.cpp    [iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/misc.cpp    [iso-8859-1] Wed Dec 24 
17:00:53 2014
@@ -149,6 +149,7 @@
     RegisterComponent(CLSID_MenuBand, L"Shell Menu Band");
     RegisterComponent(CLSID_MenuBandSite, L"Shell Menu Band Site");
     RegisterComponent(CLSID_MergedFolder, L"Merged Shell Folder");
+    RegisterComponent(CLSID_RebarBandSite, L"Shell Rebar Band Site");
     return S_OK;
 }
 
@@ -160,6 +161,7 @@
     UnregisterComponent(CLSID_MenuBand);
     UnregisterComponent(CLSID_MenuBandSite);
     UnregisterComponent(CLSID_MergedFolder);
+    UnregisterComponent(CLSID_RebarBandSite);
     return S_OK;
 }
 
@@ -200,6 +202,9 @@
         if (IsEqualCLSID(m_Clsid, CLSID_MergedFolder))
             return CMergedFolder_Constructor(riid, ppvObject);
 
+        if (IsEqualCLSID(m_Clsid, CLSID_RebarBandSite))
+            return CBandSite_Constructor(riid, ppvObject);
+
         return E_NOINTERFACE;
     }
 

Modified: trunk/reactos/base/shell/rshell/precomp.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/precomp.h?rev=65822&r1=65821&r2=65822&view=diff
==============================================================================
--- trunk/reactos/base/shell/rshell/precomp.h   [iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/precomp.h   [iso-8859-1] Wed Dec 24 
17:00:53 2014
@@ -74,8 +74,5 @@
 extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv);
 extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv);
 extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv);
-extern "C" HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * db, REFIID riid, 
LPVOID *ppv);
-extern "C" HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bs, REFIID riid, 
LPVOID *ppv);
-extern "C" HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * sm, REFIID riid, 
LPVOID *ppv);
+extern "C" HRESULT WINAPI CBandSite_Constructor(REFIID riid, LPVOID *ppv);
 extern "C" HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv);
-extern "C" HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID 
riid, LPVOID *ppv);