[SHELL32] Rename CShell to CShellDispatch CORE-6892
authorMark Jansen <mark.jansen@reactos.org>
Tue, 31 May 2016 17:40:44 +0000 (17:40 +0000)
committerMark Jansen <mark.jansen@reactos.org>
Tue, 31 May 2016 17:40:44 +0000 (17:40 +0000)
svn path=/trunk/; revision=71476

reactos/dll/win32/shell32/CDefViewDual.cpp
reactos/dll/win32/shell32/CMakeLists.txt
reactos/dll/win32/shell32/CShellDispatch.cpp [moved from reactos/dll/win32/shell32/CShell.cpp with 59% similarity]
reactos/dll/win32/shell32/CShellDispatch.h [moved from reactos/dll/win32/shell32/CShell.h with 94% similarity]
reactos/dll/win32/shell32/precomp.h
reactos/dll/win32/shell32/shell32.cpp
reactos/dll/win32/shell32/wine/shell32_main.h

index bec7cf1..11f5e02 100644 (file)
@@ -47,7 +47,7 @@ class CDefViewDual :
         {
             if (!app) return E_INVALIDARG;
 
-            return CShell_Constructor(IID_IDispatch, (LPVOID*)app);
+            return CShellDispatch_Constructor(IID_IDispatch, (LPVOID*)app);
         }
 
         virtual HRESULT STDMETHODCALLTYPE get_Parent(IDispatch **parent) override
index aef71c1..468cddf 100644 (file)
@@ -65,7 +65,7 @@ list(APPEND SOURCE
     CDefaultContextMenu.cpp
     COpenWithMenu.cpp
     CNewMenu.cpp
-    CShell.cpp
+    CShellDispatch.cpp
     CFolder.cpp
     CFolderItems.cpp
     CFolderItemVerbs.cpp
similarity index 59%
rename from reactos/dll/win32/shell32/CShell.cpp
rename to reactos/dll/win32/shell32/CShellDispatch.cpp
index aa3c120..92725c0 100644 (file)
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 
-CShell::CShell()
+CShellDispatch::CShellDispatch()
 {
 }
 
-CShell::~CShell()
+CShellDispatch::~CShellDispatch()
 {
 }
 
-HRESULT CShell::Initialize()
+HRESULT CShellDispatch::Initialize()
 {
     return S_OK;
 }
 
 // *** IShellDispatch methods ***
-HRESULT STDMETHODCALLTYPE CShell::get_Application(IDispatch **ppid)
+HRESULT STDMETHODCALLTYPE CShellDispatch::get_Application(IDispatch **ppid)
 {
     TRACE("(%p, %p)\n", this, ppid);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::get_Parent(IDispatch **ppid)
+HRESULT STDMETHODCALLTYPE CShellDispatch::get_Parent(IDispatch **ppid)
 {
     TRACE("(%p, %p)\n", this, ppid);
     return E_NOTIMPL;
@@ -63,7 +63,7 @@ HRESULT VariantToIdlist(VARIANT* var, LPITEMIDLIST* idlist)
     return hr;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::NameSpace(VARIANT vDir, Folder **ppsdf)
+HRESULT STDMETHODCALLTYPE CShellDispatch::NameSpace(VARIANT vDir, Folder **ppsdf)
 {
     TRACE("(%p, %s, %p)\n", this, debugstr_variant(&vDir), ppsdf);
     if (!ppsdf)
@@ -80,121 +80,121 @@ HRESULT STDMETHODCALLTYPE CShell::NameSpace(VARIANT vDir, Folder **ppsdf)
     return hr;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::BrowseForFolder(LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf)
+HRESULT STDMETHODCALLTYPE CShellDispatch::BrowseForFolder(LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf)
 {
     TRACE("(%p, %lu, %ls, %lu, %s, %p)\n", this, Hwnd, Title, Options, debugstr_variant(&RootFolder), ppsdf);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::Windows(IDispatch **ppid)
+HRESULT STDMETHODCALLTYPE CShellDispatch::Windows(IDispatch **ppid)
 {
     TRACE("(%p, %p)\n", this, ppid);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::Open(VARIANT vDir)
+HRESULT STDMETHODCALLTYPE CShellDispatch::Open(VARIANT vDir)
 {
     TRACE("(%p, %s)\n", this, debugstr_variant(&vDir));
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::Explore(VARIANT vDir)
+HRESULT STDMETHODCALLTYPE CShellDispatch::Explore(VARIANT vDir)
 {
     TRACE("(%p, %s)\n", this, debugstr_variant(&vDir));
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::MinimizeAll()
+HRESULT STDMETHODCALLTYPE CShellDispatch::MinimizeAll()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::UndoMinimizeALL()
+HRESULT STDMETHODCALLTYPE CShellDispatch::UndoMinimizeALL()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::FileRun()
+HRESULT STDMETHODCALLTYPE CShellDispatch::FileRun()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::CascadeWindows()
+HRESULT STDMETHODCALLTYPE CShellDispatch::CascadeWindows()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::TileVertically()
+HRESULT STDMETHODCALLTYPE CShellDispatch::TileVertically()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::TileHorizontally()
+HRESULT STDMETHODCALLTYPE CShellDispatch::TileHorizontally()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::ShutdownWindows()
+HRESULT STDMETHODCALLTYPE CShellDispatch::ShutdownWindows()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::Suspend()
+HRESULT STDMETHODCALLTYPE CShellDispatch::Suspend()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::EjectPC()
+HRESULT STDMETHODCALLTYPE CShellDispatch::EjectPC()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::SetTime()
+HRESULT STDMETHODCALLTYPE CShellDispatch::SetTime()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::TrayProperties()
+HRESULT STDMETHODCALLTYPE CShellDispatch::TrayProperties()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::Help()
+HRESULT STDMETHODCALLTYPE CShellDispatch::Help()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::FindFiles()
+HRESULT STDMETHODCALLTYPE CShellDispatch::FindFiles()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::FindComputer()
+HRESULT STDMETHODCALLTYPE CShellDispatch::FindComputer()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::RefreshMenu()
+HRESULT STDMETHODCALLTYPE CShellDispatch::RefreshMenu()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::ControlPanelItem(BSTR szDir)
+HRESULT STDMETHODCALLTYPE CShellDispatch::ControlPanelItem(BSTR szDir)
 {
     TRACE("(%p, %ls)\n", this, szDir);
     return E_NOTIMPL;
@@ -202,55 +202,55 @@ HRESULT STDMETHODCALLTYPE CShell::ControlPanelItem(BSTR szDir)
 
 
 // *** IShellDispatch2 methods ***
-HRESULT STDMETHODCALLTYPE CShell::IsRestricted(BSTR group, BSTR restriction, LONG *value)
+HRESULT STDMETHODCALLTYPE CShellDispatch::IsRestricted(BSTR group, BSTR restriction, LONG *value)
 {
     TRACE("(%p, %ls, %ls, %p)\n", this, group, restriction, value);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::ShellExecute(BSTR file, VARIANT args, VARIANT dir, VARIANT op, VARIANT show)
+HRESULT STDMETHODCALLTYPE CShellDispatch::ShellExecute(BSTR file, VARIANT args, VARIANT dir, VARIANT op, VARIANT show)
 {
     TRACE("(%p, %ls, %s, %s, %s, %s)\n", this, file, debugstr_variant(&args), debugstr_variant(&dir), debugstr_variant(&op), debugstr_variant(&show));
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::FindPrinter(BSTR name, BSTR location, BSTR model)
+HRESULT STDMETHODCALLTYPE CShellDispatch::FindPrinter(BSTR name, BSTR location, BSTR model)
 {
     TRACE("(%p, %ls, %ls, %ls)\n", this, name, location, model);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::GetSystemInformation(BSTR name, VARIANT *ret)
+HRESULT STDMETHODCALLTYPE CShellDispatch::GetSystemInformation(BSTR name, VARIANT *ret)
 {
     TRACE("(%p, %ls, %p)\n", this, name, ret);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::ServiceStart(BSTR service, VARIANT persistent, VARIANT *ret)
+HRESULT STDMETHODCALLTYPE CShellDispatch::ServiceStart(BSTR service, VARIANT persistent, VARIANT *ret)
 {
     TRACE("(%p, %ls, %s, %p)\n", this, service, wine_dbgstr_variant(&persistent), ret);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::ServiceStop(BSTR service, VARIANT persistent, VARIANT *ret)
+HRESULT STDMETHODCALLTYPE CShellDispatch::ServiceStop(BSTR service, VARIANT persistent, VARIANT *ret)
 {
     TRACE("(%p, %ls, %s, %p)\n", this, service, wine_dbgstr_variant(&persistent), ret);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::IsServiceRunning(BSTR service, VARIANT *running)
+HRESULT STDMETHODCALLTYPE CShellDispatch::IsServiceRunning(BSTR service, VARIANT *running)
 {
     TRACE("(%p, %ls, %p)\n", this, service, running);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::CanStartStopService(BSTR service, VARIANT *ret)
+HRESULT STDMETHODCALLTYPE CShellDispatch::CanStartStopService(BSTR service, VARIANT *ret)
 {
     TRACE("(%p, %ls, %p)\n", this, service, ret);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::ShowBrowserBar(BSTR clsid, VARIANT show, VARIANT *ret)
+HRESULT STDMETHODCALLTYPE CShellDispatch::ShowBrowserBar(BSTR clsid, VARIANT show, VARIANT *ret)
 {
     TRACE("(%p, %ls, %s, %p)\n", this, clsid, wine_dbgstr_variant(&show), ret);
     return E_NOTIMPL;
@@ -258,7 +258,7 @@ HRESULT STDMETHODCALLTYPE CShell::ShowBrowserBar(BSTR clsid, VARIANT show, VARIA
 
 
 // *** IShellDispatch3 methods ***
-HRESULT STDMETHODCALLTYPE CShell::AddToRecent(VARIANT file, BSTR category)
+HRESULT STDMETHODCALLTYPE CShellDispatch::AddToRecent(VARIANT file, BSTR category)
 {
     TRACE("(%p, %s, %ls)\n", this, wine_dbgstr_variant(&file), category);
     return E_NOTIMPL;
@@ -266,25 +266,25 @@ HRESULT STDMETHODCALLTYPE CShell::AddToRecent(VARIANT file, BSTR category)
 
 
 // *** IShellDispatch4 methods ***
-HRESULT STDMETHODCALLTYPE CShell::WindowsSecurity()
+HRESULT STDMETHODCALLTYPE CShellDispatch::WindowsSecurity()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::ToggleDesktop()
+HRESULT STDMETHODCALLTYPE CShellDispatch::ToggleDesktop()
 {
     TRACE("(%p)\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::ExplorerPolicy(BSTR policy, VARIANT *value)
+HRESULT STDMETHODCALLTYPE CShellDispatch::ExplorerPolicy(BSTR policy, VARIANT *value)
 {
     TRACE("(%p, %ls, %p)\n", this, policy, value);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::GetSetting(LONG setting, VARIANT_BOOL *result)
+HRESULT STDMETHODCALLTYPE CShellDispatch::GetSetting(LONG setting, VARIANT_BOOL *result)
 {
     TRACE("(%p, %lu, %p)\n", this, setting, result);
     return E_NOTIMPL;
@@ -292,13 +292,13 @@ HRESULT STDMETHODCALLTYPE CShell::GetSetting(LONG setting, VARIANT_BOOL *result)
 
 
 // *** IObjectSafety methods ***
-HRESULT STDMETHODCALLTYPE CShell::GetInterfaceSafetyOptions(REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions)
+HRESULT STDMETHODCALLTYPE CShellDispatch::GetInterfaceSafetyOptions(REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions)
 {
     TRACE("(%p, %s, %p, %p)\n", this, wine_dbgstr_guid(&riid), pdwSupportedOptions, pdwEnabledOptions);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::SetInterfaceSafetyOptions(REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions)
+HRESULT STDMETHODCALLTYPE CShellDispatch::SetInterfaceSafetyOptions(REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions)
 {
     TRACE("(%p, %s, %lu, %lu)\n", this, wine_dbgstr_guid(&riid), dwOptionSetMask, dwEnabledOptions);
     return E_NOTIMPL;
@@ -306,20 +306,20 @@ HRESULT STDMETHODCALLTYPE CShell::SetInterfaceSafetyOptions(REFIID riid, DWORD d
 
 
 // *** IObjectWithSite methods ***
-HRESULT STDMETHODCALLTYPE CShell::SetSite(IUnknown *pUnkSite)
+HRESULT STDMETHODCALLTYPE CShellDispatch::SetSite(IUnknown *pUnkSite)
 {
     TRACE("(%p, %p)\n", this, pUnkSite);
     return E_NOTIMPL;
 }
 
-HRESULT STDMETHODCALLTYPE CShell::GetSite(REFIID riid, PVOID *ppvSite)
+HRESULT STDMETHODCALLTYPE CShellDispatch::GetSite(REFIID riid, PVOID *ppvSite)
 {
     TRACE("(%p, %s, %p)\n", this, wine_dbgstr_guid(&riid), ppvSite);
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI CShell_Constructor(REFIID riid, LPVOID * ppvOut)
+HRESULT WINAPI CShellDispatch_Constructor(REFIID riid, LPVOID * ppvOut)
 {
-    return ShellObjectCreatorInit<CShell>(riid, ppvOut);
+    return ShellObjectCreatorInit<CShellDispatch>(riid, ppvOut);
 }
 
similarity index 94%
rename from reactos/dll/win32/shell32/CShell.h
rename to reactos/dll/win32/shell32/CShellDispatch.h
index 6684849..539f3cf 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _SHELL_H_
-#define _SHELL_H_
+#ifndef _SHELLDISPATCH_H_
+#define _SHELLDISPATCH_H_
 
 #undef ShellExecute
 
-class CShell:
-    public CComCoClass<CShell, &CLSID_Shell>,
+class CShellDispatch:
+    public CComCoClass<CShellDispatch, &CLSID_Shell>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IDispatchImpl<IShellDispatch4, &IID_IShellDispatch4>,
     public IObjectSafety,
@@ -33,8 +33,8 @@ class CShell:
 private:
 
 public:
-    CShell();
-    ~CShell();
+    CShellDispatch();
+    ~CShellDispatch();
 
     HRESULT Initialize();
 
@@ -93,11 +93,11 @@ public:
 
 
 DECLARE_REGISTRY_RESOURCEID(IDR_SHELL)
-DECLARE_NOT_AGGREGATABLE(CShell)
+DECLARE_NOT_AGGREGATABLE(CShellDispatch)
 
 DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-BEGIN_COM_MAP(CShell)
+BEGIN_COM_MAP(CShellDispatch)
     COM_INTERFACE_ENTRY_IID(IID_IShellDispatch4, IShellDispatch4)
     COM_INTERFACE_ENTRY_IID(IID_IShellDispatch3, IShellDispatch3)
     COM_INTERFACE_ENTRY_IID(IID_IShellDispatch2, IShellDispatch2)
@@ -108,4 +108,4 @@ BEGIN_COM_MAP(CShell)
 END_COM_MAP()
 };
 
-#endif /* _SHELL_H_ */
+#endif /* _SHELLDISPATCH_H_ */
index b2c22f4..450c3b8 100644 (file)
@@ -53,7 +53,7 @@
 #include "CFolderItemVerbs.h"
 #include "CFolderItems.h"
 #include "CFolder.h"
-#include "CShell.h"
+#include "CShellDispatch.h"
 #include "CDropTargetHelper.h"
 #include "CFolderOptions.h"
 #include "folders/CFSFolder.h"
index f68072a..b1c590b 100644 (file)
@@ -196,7 +196,7 @@ BEGIN_OBJECT_MAP(ObjectMap)
     OBJECT_ENTRY(CLSID_ShellDesktop, CDesktopFolder)
     OBJECT_ENTRY(CLSID_ShellItem, CShellItem)
     OBJECT_ENTRY(CLSID_ShellLink, CShellLink)
-    OBJECT_ENTRY(CLSID_Shell, CShell)
+    OBJECT_ENTRY(CLSID_Shell, CShellDispatch)
     OBJECT_ENTRY(CLSID_DragDropHelper, CDropTargetHelper)
     OBJECT_ENTRY(CLSID_ControlPanel, CControlPanelFolder)
     OBJECT_ENTRY(CLSID_MyDocuments, CMyDocsFolder)
index 3782dbf..49ebd3d 100644 (file)
@@ -72,7 +72,7 @@ IContextMenu2 *       ISvBgCm_Constructor(LPSHELLFOLDER pSFParent, BOOL bDesktop);
 HRESULT WINAPI IShellView_Constructor(IShellFolder *pFolder, IShellView **newView);
 HRESULT WINAPI CDefView_Constructor(IShellFolder *pFolder, REFIID riid, LPVOID * ppvOut);
 HRESULT WINAPI CDefViewDual_Constructor(REFIID riid, LPVOID * ppvOut);
-HRESULT WINAPI CShell_Constructor(REFIID riid, LPVOID * ppvOut);
+HRESULT WINAPI CShellDispatch_Constructor(REFIID riid, LPVOID * ppvOut);
 
 HRESULT WINAPI IShellLink_ConstructFromPath(WCHAR *path, REFIID riid, LPVOID *ppv);
 HRESULT WINAPI IShellLink_ConstructFromFile(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv);