[SHELL32]

- Rename few classes
[BOOTDATA]
- Don't register classes from shell32

svn path=/trunk/; revision=54698

diff --git a/reactos/boot/bootdata/hivecls_i386.inf b/reactos/boot/bootdata/hivecls_i386.inf
index 46a77d2..9f169c0 100644 (file)
--- a/reactos/boot/bootdata/hivecls_i386.inf
+++ b/reactos/boot/bootdata/hivecls_i386.inf
@@ -20,11 +20,6 @@ HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}","",0x00000000,"Drive Propert
 HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","",0x00000000,"shell32.dll"
 HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","ThreadingModel",0x00000000,"Apartment"
 
-; New Object Service
-HKCR,"CLSID\{D969A300-E7FF-11d0-A93B-00A0C90F2719}","",0x00000000,"ReactOS New Object Service"
-HKCR,"CLSID\{D969A300-E7FF-11d0-A93B-00A0C90F2719}\InProcServer32","",0x00000000,"shell32.dll"
-HKCR,"CLSID\{D969A300-E7FF-11d0-A93B-00A0C90F2719}\InProcServer32","ThreadingModel",0x00000000,"Apartment"
-
 ; Rich Text Files
 HKCR,".rtf","",0x00000000,"rtffile"
 HKCR,".rtf\shellnew","",0x00000000,""
@@ -312,24 +307,6 @@ HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\InProcServer32","",0x00020000
 HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\InProcServer32","ThreadingModel",0x00000000,"Apartment"
 HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\ShellFolder","Attributes",0x00010001,0x20180000
 
-HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}","",0x00000000,"Shell Drag and Drop helper"
-HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll"
-HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","ThreadingModel",0x00000000,"Apartment"
-
-HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}","",0x00000000,"Shell Start Menu"
-HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll"
-HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}\InProcServer32","ThreadingModel",0x00000000,"Apartment"
-
-; Folder Options CPL
-HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}","",0x00000000,"Folder Options"
-HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-150"
-HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\InProcServer32","",0x00000000,"shell32.dll"
-HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\InProcServer32","ThreadingModel",0x00000000,"Apartment"
-HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-210"
-HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\shell\Open\command","",0x00000000,"rundll32.exe shell32.dll,Options_RunDLL 0"
-HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\shell\RunAs\command","",0x00000000,"rundll32.exe shell32.dll,Options_RunDLL 0"
-HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\ShellFolder","Attributes",0x00010001,0x00000000
-
 ; Open With shell extension
 HKCR,"SystemFileAssociations","",0x00000000,""
 HKCR,"Applications","",0x00000000,""

diff --git a/reactos/dll/win32/shell32/defcontextmenu.cpp b/reactos/dll/win32/shell32/defcontextmenu.cpp
index 9b86fc4..f2f1f0a 100644 (file)
--- a/reactos/dll/win32/shell32/defcontextmenu.cpp
+++ b/reactos/dll/win32/shell32/defcontextmenu.cpp
@@ -1219,7 +1219,7 @@ CDefaultContextMenu::DoCreateLink(
         if (!GetUniqueFileName(szPath, szLnk, szTarget, TRUE))
             return E_FAIL;
 
-        hr = ShellLink::_CreatorClass::CreateInstance(NULL, IID_IShellLinkW, (void**)&nLink);
+        hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_IShellLinkW, (void**)&nLink);
         if (hr != S_OK)
             return hr;
 

diff --git a/reactos/dll/win32/shell32/dragdrophelper.cpp b/reactos/dll/win32/shell32/dragdrophelper.cpp
index bb55441..84728d9 100644 (file)
--- a/reactos/dll/win32/shell32/dragdrophelper.cpp
+++ b/reactos/dll/win32/shell32/dragdrophelper.cpp
@@ -28,39 +28,39 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
 *   IDropTargetHelper implementation
 */
 
-IDropTargetHelperImpl::IDropTargetHelperImpl()
+CDropTargetHelper::CDropTargetHelper()
 {
 }
 
-IDropTargetHelperImpl::~IDropTargetHelperImpl()
+CDropTargetHelper::~CDropTargetHelper()
 {
 }
 
-HRESULT WINAPI IDropTargetHelperImpl::DragEnter (HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect)
+HRESULT WINAPI CDropTargetHelper::DragEnter (HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect)
 {
     FIXME ("(%p)->(%p %p %p 0x%08x)\n", this, hwndTarget, pDataObject, ppt, dwEffect);
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI IDropTargetHelperImpl::DragLeave()
+HRESULT WINAPI CDropTargetHelper::DragLeave()
 {
     FIXME ("(%p)->()\n", this);
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI IDropTargetHelperImpl::DragOver(POINT *ppt, DWORD dwEffect)
+HRESULT WINAPI CDropTargetHelper::DragOver(POINT *ppt, DWORD dwEffect)
 {
     FIXME ("(%p)->(%p 0x%08x)\n", this, ppt, dwEffect);
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI IDropTargetHelperImpl::Drop(IDataObject* pDataObject, POINT* ppt, DWORD dwEffect)
+HRESULT WINAPI CDropTargetHelper::Drop(IDataObject* pDataObject, POINT* ppt, DWORD dwEffect)
 {
     FIXME ("(%p)->(%p %p 0x%08x)\n", this, pDataObject, ppt, dwEffect);
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI IDropTargetHelperImpl::Show(BOOL fShow)
+HRESULT WINAPI CDropTargetHelper::Show(BOOL fShow)
 {
     FIXME ("(%p)->(%u)\n", this, fShow);
     return E_NOTIMPL;

diff --git a/reactos/dll/win32/shell32/dragdrophelper.h b/reactos/dll/win32/shell32/dragdrophelper.h
index c850bf6..52909bd 100644 (file)
--- a/reactos/dll/win32/shell32/dragdrophelper.h
+++ b/reactos/dll/win32/shell32/dragdrophelper.h
@@ -23,15 +23,15 @@
 #ifndef _DRAGDROPHELPER_H_
 #define _DRAGDROPHELPER_H_
 
-class IDropTargetHelperImpl :
-       public CComCoClass<IDropTargetHelperImpl, &CLSID_DragDropHelper>,
+class CDropTargetHelper :
+       public CComCoClass<CDropTargetHelper, &CLSID_DragDropHelper>,
        public CComObjectRootEx<CComMultiThreadModelNoCS>,
        public IDropTargetHelper
 {
 private:
 public:
-       IDropTargetHelperImpl();
-       ~IDropTargetHelperImpl();
+       CDropTargetHelper();
+       ~CDropTargetHelper();
 
        ////////
        virtual HRESULT WINAPI DragEnter (HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect);
@@ -41,11 +41,11 @@ public:
        virtual HRESULT WINAPI Show(BOOL fShow);
 
 DECLARE_REGISTRY_RESOURCEID(IDR_DRAGDROPHELPER)
-DECLARE_NOT_AGGREGATABLE(IDropTargetHelperImpl)
+DECLARE_NOT_AGGREGATABLE(CDropTargetHelper)
 
 DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-BEGIN_COM_MAP(IDropTargetHelperImpl)
+BEGIN_COM_MAP(CDropTargetHelper)
        COM_INTERFACE_ENTRY_IID(IID_IDropTargetHelper, IDropTargetHelper)
 END_COM_MAP()
 };

diff --git a/reactos/dll/win32/shell32/folders/cpanel.cpp b/reactos/dll/win32/shell32/folders/cpanel.cpp
index bd3a956..9ebd03e 100644 (file)
--- a/reactos/dll/win32/shell32/folders/cpanel.cpp
+++ b/reactos/dll/win32/shell32/folders/cpanel.cpp
@@ -1047,7 +1047,7 @@ HRESULT WINAPI CControlPanelFolder::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
             FIXME("Couldn't retrieve pointer to cpl structure\n");
             return E_FAIL;
         }
-        hResult = ShellLink::_CreatorClass::CreateInstance(NULL, IID_IShellLinkA, (void **)&isl);
+        hResult = CShellLink::_CreatorClass::CreateInstance(NULL, IID_IShellLinkA, (void **)&isl);
         if (SUCCEEDED(hResult))
         {
             isl->SetPath(szTarget);

diff --git a/reactos/dll/win32/shell32/shell32_main.cpp b/reactos/dll/win32/shell32/shell32_main.cpp
index 1a848d9..3ccd4f1 100644 (file)
--- a/reactos/dll/win32/shell32/shell32_main.cpp
+++ b/reactos/dll/win32/shell32/shell32_main.cpp
@@ -1274,9 +1274,9 @@ BEGIN_OBJECT_MAP(ObjectMap)
 OBJECT_ENTRY(CLSID_ShellFSFolder, CFSFolder)
 OBJECT_ENTRY(CLSID_MyComputer, CDrivesFolder)
 OBJECT_ENTRY(CLSID_ShellDesktop, CDesktopFolder)
-OBJECT_ENTRY(CLSID_ShellItem, ShellItem)
-OBJECT_ENTRY(CLSID_ShellLink, ShellLink)
-OBJECT_ENTRY(CLSID_DragDropHelper, IDropTargetHelperImpl)
+OBJECT_ENTRY(CLSID_ShellItem, CShellItem)
+OBJECT_ENTRY(CLSID_ShellLink, CShellLink)
+OBJECT_ENTRY(CLSID_DragDropHelper, CDropTargetHelper)
 OBJECT_ENTRY(CLSID_ControlPanel, CControlPanelFolder)
 OBJECT_ENTRY(CLSID_AutoComplete, CAutoComplete)
 OBJECT_ENTRY(CLSID_MyDocuments, CMyDocsFolder)

diff --git a/reactos/dll/win32/shell32/shellitem.cpp b/reactos/dll/win32/shell32/shellitem.cpp
index 995d3b2..28fbc2e 100644 (file)
--- a/reactos/dll/win32/shell32/shellitem.cpp
+++ b/reactos/dll/win32/shell32/shellitem.cpp
@@ -26,17 +26,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
 EXTERN_C HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent,
     IShellFolder *psfParent, LPCITEMIDLIST pidl, IShellItem **ppsi);
 
-ShellItem::ShellItem()
+CShellItem::CShellItem()
 {
     pidl = NULL;
 }
 
-ShellItem::~ShellItem()
+CShellItem::~CShellItem()
 {
     ILFree(pidl);
 }
 
-HRESULT ShellItem::get_parent_pidl(LPITEMIDLIST *parent_pidl)
+HRESULT CShellItem::get_parent_pidl(LPITEMIDLIST *parent_pidl)
 {
     *parent_pidl = ILClone(pidl);
     if (*parent_pidl)
@@ -57,7 +57,7 @@ HRESULT ShellItem::get_parent_pidl(LPITEMIDLIST *parent_pidl)
     }
 }
 
-HRESULT ShellItem::get_parent_shellfolder(IShellFolder **ppsf)
+HRESULT CShellItem::get_parent_shellfolder(IShellFolder **ppsf)
 {
     LPITEMIDLIST parent_pidl;
     CComPtr<IShellFolder>        desktop;
@@ -75,7 +75,7 @@ HRESULT ShellItem::get_parent_shellfolder(IShellFolder **ppsf)
     return ret;
 }
 
-HRESULT WINAPI ShellItem::BindToHandler(IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut)
+HRESULT WINAPI CShellItem::BindToHandler(IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut)
 {
     FIXME("(%p,%p,%s,%p,%p)\n", this, pbc, shdebugstr_guid(&rbhid), riid, ppvOut);
 
@@ -84,7 +84,7 @@ HRESULT WINAPI ShellItem::BindToHandler(IBindCtx *pbc, REFGUID rbhid, REFIID rii
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI ShellItem::GetParent(IShellItem **ppsi)
+HRESULT WINAPI CShellItem::GetParent(IShellItem **ppsi)
 {
     LPITEMIDLIST parent_pidl;
     HRESULT ret;
@@ -101,7 +101,7 @@ HRESULT WINAPI ShellItem::GetParent(IShellItem **ppsi)
     return ret;
 }
 
-HRESULT WINAPI ShellItem::GetDisplayName(SIGDN sigdnName, LPWSTR *ppszName)
+HRESULT WINAPI CShellItem::GetDisplayName(SIGDN sigdnName, LPWSTR *ppszName)
 {
     FIXME("(%p,%x,%p)\n", this, sigdnName, ppszName);
 
@@ -110,7 +110,7 @@ HRESULT WINAPI ShellItem::GetDisplayName(SIGDN sigdnName, LPWSTR *ppszName)
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI ShellItem::GetAttributes(SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs)
+HRESULT WINAPI CShellItem::GetAttributes(SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs)
 {
     CComPtr<IShellFolder>        parent_folder;
     LPITEMIDLIST child_pidl;
@@ -129,14 +129,14 @@ HRESULT WINAPI ShellItem::GetAttributes(SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs)
     return ret;
 }
 
-HRESULT WINAPI ShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder)
+HRESULT WINAPI CShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder)
 {
     FIXME("(%p,%p,%x,%p)\n", this, oth, hint, piOrder);
 
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI ShellItem::GetClassID(CLSID *pClassID)
+HRESULT WINAPI CShellItem::GetClassID(CLSID *pClassID)
 {
     TRACE("(%p,%p)\n", this, pClassID);
 
@@ -145,7 +145,7 @@ HRESULT WINAPI ShellItem::GetClassID(CLSID *pClassID)
 }
 
 
-HRESULT WINAPI ShellItem::SetIDList(LPCITEMIDLIST pidlx)
+HRESULT WINAPI CShellItem::SetIDList(LPCITEMIDLIST pidlx)
 {
     LPITEMIDLIST new_pidl;
 
@@ -163,7 +163,7 @@ HRESULT WINAPI ShellItem::SetIDList(LPCITEMIDLIST pidlx)
         return E_OUTOFMEMORY;
 }
 
-HRESULT WINAPI ShellItem::GetIDList(LPITEMIDLIST *ppidl)
+HRESULT WINAPI CShellItem::GetIDList(LPITEMIDLIST *ppidl)
 {
     TRACE("(%p,%p)\n", this, ppidl);
 
@@ -223,7 +223,7 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent,
             return E_OUTOFMEMORY;
     }
 
-    ret = ShellItem::_CreatorClass::CreateInstance(NULL, IID_IShellItem, (void**)&newShellItem);
+    ret = CShellItem::_CreatorClass::CreateInstance(NULL, IID_IShellItem, (void**)&newShellItem);
     if (FAILED(ret))
     {
         *ppsi = NULL;

diff --git a/reactos/dll/win32/shell32/shellitem.h b/reactos/dll/win32/shell32/shellitem.h
index 546fb74..fe8b49e 100644 (file)
--- a/reactos/dll/win32/shell32/shellitem.h
+++ b/reactos/dll/win32/shell32/shellitem.h
@@ -22,8 +22,8 @@
 #ifndef _SHELLITEM_H_
 #define _SHELLITEM_H_
 
-class ShellItem :
-       public CComCoClass<ShellItem, &CLSID_ShellItem>,
+class CShellItem :
+       public CComCoClass<CShellItem, &CLSID_ShellItem>,
        public CComObjectRootEx<CComMultiThreadModelNoCS>,
        public IShellItem,
        public IPersistIDList
@@ -31,8 +31,8 @@ class ShellItem :
 private:
     LPITEMIDLIST            pidl;
 public:
-       ShellItem();
-       ~ShellItem();
+       CShellItem();
+       ~CShellItem();
        HRESULT get_parent_pidl(LPITEMIDLIST *parent_pidl);
        HRESULT get_parent_shellfolder(IShellFolder **ppsf);
 
@@ -49,11 +49,11 @@ public:
        virtual HRESULT WINAPI GetIDList(LPITEMIDLIST *ppidl);
 
 DECLARE_NO_REGISTRY()
-DECLARE_NOT_AGGREGATABLE(ShellItem)
+DECLARE_NOT_AGGREGATABLE(CShellItem)
 
 DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-BEGIN_COM_MAP(ShellItem)
+BEGIN_COM_MAP(CShellItem)
        COM_INTERFACE_ENTRY_IID(IID_IShellItem, IShellItem)
        COM_INTERFACE_ENTRY_IID(IID_IPersistIDList, IPersistIDList)
 END_COM_MAP()

diff --git a/reactos/dll/win32/shell32/shelllink.cpp b/reactos/dll/win32/shell32/shelllink.cpp
index 544571a..ed2070d 100644 (file)
--- a/reactos/dll/win32/shell32/shelllink.cpp
+++ b/reactos/dll/win32/shell32/shelllink.cpp
@@ -120,7 +120,7 @@ static LPWSTR __inline strdupW( LPCWSTR src )
     return dest;
 }
 
-ShellLink::ShellLink()
+CShellLink::CShellLink()
 {
     pPidl = NULL;
     wHotKey = 0;
@@ -144,7 +144,7 @@ ShellLink::ShellLink()
     iIdOpen = -1;
 }
 
-ShellLink::~ShellLink()
+CShellLink::~CShellLink()
 {
     TRACE("-- destroying IShellLink(%p)\n", this);
 
@@ -159,7 +159,7 @@ ShellLink::~ShellLink()
         ILFree(pPidl);
 }
 
-HRESULT WINAPI ShellLink::GetClassID(CLSID *pclsid )
+HRESULT WINAPI CShellLink::GetClassID(CLSID *pclsid )
 {
     TRACE("%p %p\n", this, pclsid);
 
@@ -169,7 +169,7 @@ HRESULT WINAPI ShellLink::GetClassID(CLSID *pclsid )
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::IsDirty()
+HRESULT WINAPI CShellLink::IsDirty()
 {
     TRACE("(%p)\n",this);
 
@@ -179,7 +179,7 @@ HRESULT WINAPI ShellLink::IsDirty()
     return S_FALSE;
 }
 
-HRESULT WINAPI ShellLink::Load(LPCOLESTR pszFileName, DWORD dwMode)
+HRESULT WINAPI CShellLink::Load(LPCOLESTR pszFileName, DWORD dwMode)
 {
     HRESULT r;
     CComPtr<IStream>        stm;
@@ -237,7 +237,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink )
     return ret;
 }
 
-HRESULT WINAPI ShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember)
+HRESULT WINAPI CShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember)
 {
     HRESULT r;
     CComPtr<IStream>        stm;
@@ -278,13 +278,13 @@ HRESULT WINAPI ShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember)
     return r;
 }
 
-HRESULT WINAPI ShellLink::SaveCompleted(LPCOLESTR pszFileName)
+HRESULT WINAPI CShellLink::SaveCompleted(LPCOLESTR pszFileName)
 {
     FIXME("(%p)->(%s)\n", this, debugstr_w(pszFileName));
     return NOERROR;
 }
 
-HRESULT WINAPI ShellLink::GetCurFile(LPOLESTR *ppszFileName)
+HRESULT WINAPI CShellLink::GetCurFile(LPOLESTR *ppszFileName)
 {
     *ppszFileName = NULL;
 
@@ -403,7 +403,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data )
     return S_OK;
 }
 
-static BOOL Stream_LoadVolume( LOCAL_VOLUME_INFO *vol, ShellLink::volume_info *volume )
+static BOOL Stream_LoadVolume( LOCAL_VOLUME_INFO *vol, CShellLink::volume_info *volume )
 {
     const int label_sz = sizeof volume->label/sizeof volume->label[0];
     LPSTR label;
@@ -442,7 +442,7 @@ static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen )
 }
 
 static HRESULT Stream_LoadLocation( IStream *stm,
-                                   ShellLink::volume_info *volume, LPWSTR *path )
+                                   CShellLink::volume_info *volume, LPWSTR *path )
 {
     char *p = NULL;
     LOCATION_INFO *loc;
@@ -542,7 +542,7 @@ static HRESULT Stream_LoadAdvertiseInfo( IStream* stm, LPWSTR *str )
 /************************************************************************
  * IPersistStream_Load (IPersistStream)
  */
-HRESULT WINAPI ShellLink::Load(IStream *stm)
+HRESULT WINAPI CShellLink::Load(IStream *stm)
 {
     LINK_HEADER hdr;
     ULONG    dwBytesRead;
@@ -739,7 +739,7 @@ static HRESULT Stream_WriteString( IStream* stm, LPCWSTR str )
  *        Figure out how Windows deals with unicode paths here.
  */
 static HRESULT Stream_WriteLocationInfo( IStream* stm, LPCWSTR path,
-                                         ShellLink::volume_info *volume )
+                                         CShellLink::volume_info *volume )
 {
     DWORD total_size, path_size, volume_info_size, label_size, final_path_size;
     LOCAL_VOLUME_INFO *vol;
@@ -824,7 +824,7 @@ static HRESULT Stream_WriteAdvertiseInfo( IStream* stm, LPCWSTR string, DWORD ma
  *
  * FIXME: makes assumptions about byte order
  */
-HRESULT WINAPI ShellLink::Save(IStream *stm, BOOL fClearDirty)
+HRESULT WINAPI CShellLink::Save(IStream *stm, BOOL fClearDirty)
 {
     LINK_HEADER header;
     ULONG   count;
@@ -921,7 +921,7 @@ HRESULT WINAPI ShellLink::Save(IStream *stm, BOOL fClearDirty)
 /************************************************************************
  * IPersistStream_GetSizeMax (IPersistStream)
  */
-HRESULT WINAPI ShellLink::GetSizeMax(ULARGE_INTEGER *pcbSize)
+HRESULT WINAPI CShellLink::GetSizeMax(ULARGE_INTEGER *pcbSize)
 {
     TRACE("(%p)\n", this);
 
@@ -986,7 +986,7 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWor
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags)
+HRESULT WINAPI CShellLink::GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags)
 {
     TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n",
           this, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(sPath));
@@ -1005,7 +1005,7 @@ HRESULT WINAPI ShellLink::GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATA
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetIDList(LPITEMIDLIST * ppidl)
+HRESULT WINAPI CShellLink::GetIDList(LPITEMIDLIST * ppidl)
 {
     TRACE("(%p)->(ppidl=%p)\n",this, ppidl);
 
@@ -1018,7 +1018,7 @@ HRESULT WINAPI ShellLink::GetIDList(LPITEMIDLIST * ppidl)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetIDList(LPCITEMIDLIST pidl)
+HRESULT WINAPI CShellLink::SetIDList(LPCITEMIDLIST pidl)
 {
     TRACE("(%p)->(pidl=%p)\n",this, pidl);
 
@@ -1033,7 +1033,7 @@ HRESULT WINAPI ShellLink::SetIDList(LPCITEMIDLIST pidl)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetDescription(LPSTR pszName,INT cchMaxName)
+HRESULT WINAPI CShellLink::GetDescription(LPSTR pszName,INT cchMaxName)
 {
     TRACE("(%p)->(%p len=%u)\n",this, pszName, cchMaxName);
 
@@ -1046,7 +1046,7 @@ HRESULT WINAPI ShellLink::GetDescription(LPSTR pszName,INT cchMaxName)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetDescription(LPCSTR pszName)
+HRESULT WINAPI CShellLink::SetDescription(LPCSTR pszName)
 {
     TRACE("(%p)->(pName=%s)\n", this, pszName);
 
@@ -1063,7 +1063,7 @@ HRESULT WINAPI ShellLink::SetDescription(LPCSTR pszName)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath)
+HRESULT WINAPI CShellLink::GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath)
 {
     TRACE("(%p)->(%p len=%u)\n", this, pszDir, cchMaxPath);
 
@@ -1076,7 +1076,7 @@ HRESULT WINAPI ShellLink::GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetWorkingDirectory(LPCSTR pszDir)
+HRESULT WINAPI CShellLink::SetWorkingDirectory(LPCSTR pszDir)
 {
     TRACE("(%p)->(dir=%s)\n",this, pszDir);
 
@@ -1093,7 +1093,7 @@ HRESULT WINAPI ShellLink::SetWorkingDirectory(LPCSTR pszDir)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetArguments(LPSTR pszArgs,INT cchMaxPath)
+HRESULT WINAPI CShellLink::GetArguments(LPSTR pszArgs,INT cchMaxPath)
 {
     TRACE("(%p)->(%p len=%u)\n", this, pszArgs, cchMaxPath);
 
@@ -1106,7 +1106,7 @@ HRESULT WINAPI ShellLink::GetArguments(LPSTR pszArgs,INT cchMaxPath)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetArguments(LPCSTR pszArgs)
+HRESULT WINAPI CShellLink::SetArguments(LPCSTR pszArgs)
 {
     TRACE("(%p)->(args=%s)\n",this, pszArgs);
 
@@ -1124,7 +1124,7 @@ HRESULT WINAPI ShellLink::SetArguments(LPCSTR pszArgs)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetHotkey(WORD *pwHotkey)
+HRESULT WINAPI CShellLink::GetHotkey(WORD *pwHotkey)
 {
     TRACE("(%p)->(%p)(0x%08x)\n",this, pwHotkey, wHotKey);
 
@@ -1133,7 +1133,7 @@ HRESULT WINAPI ShellLink::GetHotkey(WORD *pwHotkey)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetHotkey(WORD wHotkey)
+HRESULT WINAPI CShellLink::SetHotkey(WORD wHotkey)
 {
     TRACE("(%p)->(hotkey=%x)\n",this, wHotkey);
 
@@ -1143,14 +1143,14 @@ HRESULT WINAPI ShellLink::SetHotkey(WORD wHotkey)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetShowCmd(INT *piShowCmd)
+HRESULT WINAPI CShellLink::GetShowCmd(INT *piShowCmd)
 {
     TRACE("(%p)->(%p)\n",this, piShowCmd);
     *piShowCmd = iShowCmd;
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetShowCmd(INT iShowCmd)
+HRESULT WINAPI CShellLink::SetShowCmd(INT iShowCmd)
 {
     TRACE("(%p) %d\n",this, iShowCmd);
 
@@ -1182,7 +1182,7 @@ static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl,
     return hr;
 }
 
-HRESULT WINAPI ShellLink::GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT *piIcon)
+HRESULT WINAPI CShellLink::GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT *piIcon)
 {
     TRACE("(%p)->(%p len=%u iicon=%p)\n", this, pszIconPath, cchIconPath, piIcon);
 
@@ -1230,7 +1230,7 @@ HRESULT WINAPI ShellLink::GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetIconLocation(LPCSTR pszIconPath,INT iIcon)
+HRESULT WINAPI CShellLink::SetIconLocation(LPCSTR pszIconPath,INT iIcon)
 {
     TRACE("(%p)->(path=%s iicon=%u)\n",this, pszIconPath, iIcon);
 
@@ -1250,7 +1250,7 @@ HRESULT WINAPI ShellLink::SetIconLocation(LPCSTR pszIconPath,INT iIcon)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved)
+HRESULT WINAPI CShellLink::SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved)
 {
     TRACE("(%p)->(path=%s %x)\n",this, pszPathRel, dwReserved);
 
@@ -1266,7 +1266,7 @@ HRESULT WINAPI ShellLink::SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved)
     return ShellLink_UpdatePath(sPathRel, sPath, sWorkDir, &sPath);
 }
 
-HRESULT WINAPI ShellLink::Resolve(HWND hwnd, DWORD fFlags)
+HRESULT WINAPI CShellLink::Resolve(HWND hwnd, DWORD fFlags)
 {
     HRESULT hr = S_OK;
     BOOL bSuccess;
@@ -1312,7 +1312,7 @@ HRESULT WINAPI ShellLink::Resolve(HWND hwnd, DWORD fFlags)
     return hr;
 }
 
-HRESULT WINAPI ShellLink::SetPath(LPCSTR pszFile)
+HRESULT WINAPI CShellLink::SetPath(LPCSTR pszFile)
 {
     HRESULT r;
     LPWSTR str;
@@ -1331,7 +1331,7 @@ HRESULT WINAPI ShellLink::SetPath(LPCSTR pszFile)
     return r;
 }
 
-HRESULT WINAPI ShellLink::GetPath(LPWSTR pszFile,INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags)
+HRESULT WINAPI CShellLink::GetPath(LPWSTR pszFile,INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags)
 {
     TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n",
           this, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(sPath));
@@ -1350,7 +1350,7 @@ HRESULT WINAPI ShellLink::GetPath(LPWSTR pszFile,INT cchMaxPath, WIN32_FIND_DATA
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetDescription(LPWSTR pszName,INT cchMaxName)
+HRESULT WINAPI CShellLink::GetDescription(LPWSTR pszName,INT cchMaxName)
 {
     TRACE("(%p)->(%p len=%u)\n",this, pszName, cchMaxName);
 
@@ -1361,7 +1361,7 @@ HRESULT WINAPI ShellLink::GetDescription(LPWSTR pszName,INT cchMaxName)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetDescription(LPCWSTR pszName)
+HRESULT WINAPI CShellLink::SetDescription(LPCWSTR pszName)
 {
     TRACE("(%p)->(desc=%s)\n",this, debugstr_w(pszName));
 
@@ -1377,7 +1377,7 @@ HRESULT WINAPI ShellLink::SetDescription(LPCWSTR pszName)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetWorkingDirectory(LPWSTR pszDir,INT cchMaxPath)
+HRESULT WINAPI CShellLink::GetWorkingDirectory(LPWSTR pszDir,INT cchMaxPath)
 {
     TRACE("(%p)->(%p len %u)\n", this, pszDir, cchMaxPath);
 
@@ -1389,7 +1389,7 @@ HRESULT WINAPI ShellLink::GetWorkingDirectory(LPWSTR pszDir,INT cchMaxPath)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetWorkingDirectory(LPCWSTR pszDir)
+HRESULT WINAPI CShellLink::SetWorkingDirectory(LPCWSTR pszDir)
 {
     TRACE("(%p)->(dir=%s)\n",this, debugstr_w(pszDir));
 
@@ -1404,7 +1404,7 @@ HRESULT WINAPI ShellLink::SetWorkingDirectory(LPCWSTR pszDir)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetArguments(LPWSTR pszArgs,INT cchMaxPath)
+HRESULT WINAPI CShellLink::GetArguments(LPWSTR pszArgs,INT cchMaxPath)
 {
     TRACE("(%p)->(%p len=%u)\n", this, pszArgs, cchMaxPath);
 
@@ -1416,7 +1416,7 @@ HRESULT WINAPI ShellLink::GetArguments(LPWSTR pszArgs,INT cchMaxPath)
     return NOERROR;
 }
 
-HRESULT WINAPI ShellLink::SetArguments(LPCWSTR pszArgs)
+HRESULT WINAPI CShellLink::SetArguments(LPCWSTR pszArgs)
 {
     TRACE("(%p)->(args=%s)\n",this, debugstr_w(pszArgs));
 
@@ -1454,7 +1454,7 @@ static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPCITEMIDLIST pidl,
     return hr;
 }
 
-HRESULT WINAPI ShellLink::GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT *piIcon)
+HRESULT WINAPI CShellLink::GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT *piIcon)
 {
     TRACE("(%p)->(%p len=%u iicon=%p)\n", this, pszIconPath, cchIconPath, piIcon);
 
@@ -1501,7 +1501,7 @@ HRESULT WINAPI ShellLink::GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetIconLocation(LPCWSTR pszIconPath,INT iIcon)
+HRESULT WINAPI CShellLink::SetIconLocation(LPCWSTR pszIconPath,INT iIcon)
 {
     TRACE("(%p)->(path=%s iicon=%u)\n",this, debugstr_w(pszIconPath), iIcon);
 
@@ -1518,7 +1518,7 @@ HRESULT WINAPI ShellLink::SetIconLocation(LPCWSTR pszIconPath,INT iIcon)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved)
+HRESULT WINAPI CShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved)
 {
     TRACE("(%p)->(path=%s %x)\n",this, debugstr_w(pszPathRel), dwReserved);
 
@@ -1533,7 +1533,7 @@ HRESULT WINAPI ShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved)
     return ShellLink_UpdatePath(sPathRel, sPath, sWorkDir, &sPath);
 }
 
-LPWSTR ShellLink::ShellLink_GetAdvertisedArg(LPCWSTR str)
+LPWSTR CShellLink::ShellLink_GetAdvertisedArg(LPCWSTR str)
 {
     LPWSTR ret;
     LPCWSTR p;
@@ -1554,7 +1554,7 @@ LPWSTR ShellLink::ShellLink_GetAdvertisedArg(LPCWSTR str)
     return ret;
 }
 
-HRESULT ShellLink::ShellLink_SetAdvertiseInfo(LPCWSTR str)
+HRESULT CShellLink::ShellLink_SetAdvertiseInfo(LPCWSTR str)
 {
     LPCWSTR szComponent = NULL, szProduct = NULL, p;
     WCHAR szGuid[39];
@@ -1616,7 +1616,7 @@ HRESULT ShellLink::ShellLink_SetAdvertiseInfo(LPCWSTR str)
     return S_OK;
 }
 
-static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, ShellLink::volume_info *volume)
+static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, CShellLink::volume_info *volume)
 {
     const int label_sz = sizeof volume->label/sizeof volume->label[0];
     WCHAR drive[4] = { path[0], ':', '\\', 0 };
@@ -1629,7 +1629,7 @@ static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, ShellLink::volume_info *volume
     return r;
 }
 
-HRESULT WINAPI ShellLink::SetPath(LPCWSTR pszFile)
+HRESULT WINAPI CShellLink::SetPath(LPCWSTR pszFile)
 {
     WCHAR buffer[MAX_PATH];
     LPWSTR fname, unquoted = NULL;
@@ -1692,13 +1692,13 @@ HRESULT WINAPI ShellLink::SetPath(LPCWSTR pszFile)
     return hr;
 }
 
-HRESULT WINAPI ShellLink::AddDataBlock(void* pDataBlock )
+HRESULT WINAPI CShellLink::AddDataBlock(void* pDataBlock )
 {
     FIXME("\n");
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI ShellLink::CopyDataBlock(DWORD dwSig, void** ppDataBlock )
+HRESULT WINAPI CShellLink::CopyDataBlock(DWORD dwSig, void** ppDataBlock )
 {
     LPVOID block = NULL;
     HRESULT r = E_FAIL;
@@ -1727,13 +1727,13 @@ HRESULT WINAPI ShellLink::CopyDataBlock(DWORD dwSig, void** ppDataBlock )
     return r;
 }
 
-HRESULT WINAPI ShellLink::RemoveDataBlock(DWORD dwSig )
+HRESULT WINAPI CShellLink::RemoveDataBlock(DWORD dwSig )
 {
     FIXME("\n");
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI ShellLink::GetFlags(DWORD* pdwFlags )
+HRESULT WINAPI CShellLink::GetFlags(DWORD* pdwFlags )
 {
     DWORD flags = 0;
 
@@ -1758,18 +1758,18 @@ HRESULT WINAPI ShellLink::GetFlags(DWORD* pdwFlags )
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::SetFlags(DWORD dwFlags )
+HRESULT WINAPI CShellLink::SetFlags(DWORD dwFlags )
 {
     FIXME("\n");
     return E_NOTIMPL;
 }
 
 /**************************************************************************
- * ShellLink implementation of IShellExtInit::Initialize()
+ * CShellLink implementation of IShellExtInit::Initialize()
  *
  * Loads the shelllink from the dataobject the shell is pointing to.
  */
-HRESULT WINAPI ShellLink::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID )
+HRESULT WINAPI CShellLink::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID )
 {
     FORMATETC format;
     STGMEDIUM stgm;
@@ -1810,7 +1810,7 @@ HRESULT WINAPI ShellLink::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdto
     return r;
 }
 
-HRESULT WINAPI ShellLink::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
+HRESULT WINAPI CShellLink::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
 {
     WCHAR szOpen[20];
     MENUITEMINFOW mii;
@@ -1866,7 +1866,7 @@ shelllink_get_msi_component_path( LPWSTR component )
     return path;
 }
 
-HRESULT WINAPI ShellLink::InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
+HRESULT WINAPI CShellLink::InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
 {
     static const WCHAR szOpen[] = { 'o','p','e','n',0 };
     static const WCHAR szCplOpen[] = { 'c','p','l','o','p','e','n',0 };
@@ -1949,7 +1949,7 @@ HRESULT WINAPI ShellLink::InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
     return r;
 }
 
-HRESULT WINAPI ShellLink::GetCommandString(UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax)
+HRESULT WINAPI CShellLink::GetCommandString(UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax)
 {
     FIXME("%p %lu %u %p %p %u\n", this, idCmd, uType, pwReserved, pszName, cchMax );
 
@@ -2000,18 +2000,18 @@ INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg,
  * dialog proc of the shortcut property dialog
  */
 
-INT_PTR CALLBACK ShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     LPPROPSHEETPAGEW ppsp;
     LPPSHNOTIFY lppsn;
-    ShellLink *pThis;
+    CShellLink *pThis;
     HWND hDlgCtrl;
     WCHAR szBuffer[MAX_PATH];
     WCHAR * ptr;
     int IconIndex;
     INT_PTR result;
 
-    pThis = (ShellLink *)GetWindowLongPtr(hwndDlg, DWLP_USER);
+    pThis = (CShellLink *)GetWindowLongPtr(hwndDlg, DWLP_USER);
 
     switch(uMsg)
     {
@@ -2023,7 +2023,7 @@ INT_PTR CALLBACK ShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM
 
             TRACE("ShellLink_DlgProc (WM_INITDIALOG hwnd %p lParam %p ppsplParam %x)\n",hwndDlg, lParam, ppsp->lParam);
 
-            pThis = (ShellLink *)ppsp->lParam;
+            pThis = (CShellLink *)ppsp->lParam;
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pThis);
 
             TRACE("sArgs: %S sComponent: %S sDescription: %S sIcoPath: %S sPath: %S sPathRel: %S sProduct: %S sWorkDir: %S\n", pThis->sArgs, pThis->sComponent, pThis->sDescription,
@@ -2135,7 +2135,7 @@ INT_PTR CALLBACK ShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM
  * ShellLink_IShellPropSheetExt interface
  */
 
-HRESULT WINAPI ShellLink::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
+HRESULT WINAPI CShellLink::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
 {
     HPROPSHEETPAGE hPage;
     BOOL bRet;
@@ -2154,13 +2154,13 @@ HRESULT WINAPI ShellLink::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lPara
        return E_FAIL;
 }
 
-HRESULT WINAPI ShellLink::ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam)
+HRESULT WINAPI CShellLink::ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam)
 {
     TRACE("(%p) (uPageID %u, pfnReplacePage %p lParam %p\n", this, uPageID, pfnReplacePage, lParam);
     return E_NOTIMPL;
 }
 
-HRESULT WINAPI ShellLink::SetSite(IUnknown *punk)
+HRESULT WINAPI CShellLink::SetSite(IUnknown *punk)
 {
     TRACE("%p %p\n", this, punk);
 
@@ -2169,7 +2169,7 @@ HRESULT WINAPI ShellLink::SetSite(IUnknown *punk)
     return S_OK;
 }
 
-HRESULT WINAPI ShellLink::GetSite(REFIID iid, void ** ppvSite)
+HRESULT WINAPI CShellLink::GetSite(REFIID iid, void ** ppvSite)
 {
     TRACE("%p %s %p\n", this, debugstr_guid(&iid), ppvSite );
 
@@ -2185,7 +2185,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown *pUnkOuter, REFIID riid, LP
 {
     CComPtr<IUnknown>                psl;
 
-    HRESULT hr = ShellLink::_CreatorClass::CreateInstance(NULL, riid, (void**)&psl);
+    HRESULT hr = CShellLink::_CreatorClass::CreateInstance(NULL, riid, (void**)&psl);
 
     if (SUCCEEDED(hr))
     {

diff --git a/reactos/dll/win32/shell32/shelllink.h b/reactos/dll/win32/shell32/shelllink.h
index 2005235..3a65830 100644 (file)
--- a/reactos/dll/win32/shell32/shelllink.h
+++ b/reactos/dll/win32/shell32/shelllink.h
@@ -24,8 +24,8 @@
 #ifndef _SHELLLINK_H_
 #define _SHELLLINK_H_
 
-class ShellLink :
-       public CComCoClass<ShellLink, &CLSID_ShellLink>,
+class CShellLink :
+       public CComCoClass<CShellLink, &CLSID_ShellLink>,
        public CComObjectRootEx<CComMultiThreadModelNoCS>,
        public IShellLinkA,
        public IShellLinkW,
@@ -76,8 +76,8 @@ private:
        INT           iIdOpen;  /* id of the "Open" entry in the context menu */
        CComPtr<IUnknown>               site;
 public:
-       ShellLink();
-       ~ShellLink();
+       CShellLink();
+       ~CShellLink();
        LPWSTR ShellLink_GetAdvertisedArg(LPCWSTR str);
        HRESULT ShellLink_SetAdvertiseInfo(LPCWSTR str);
        static INT_PTR CALLBACK SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -161,11 +161,11 @@ public:
        virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite);
 
 DECLARE_REGISTRY_RESOURCEID(IDR_SHELLLINK)
-DECLARE_NOT_AGGREGATABLE(ShellLink)
+DECLARE_NOT_AGGREGATABLE(CShellLink)
 
 DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-BEGIN_COM_MAP(ShellLink)
+BEGIN_COM_MAP(CShellLink)
        COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistFile)
        COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile)
        COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream)