Author: gadamopoulos
Date: Tue Nov 4 12:49:36 2014
New Revision: 65245
URL: http://svn.reactos.org/svn/reactos?rev=65245&view=rev
Log:
[SHELL32]
- Rename IFileSystemBindDataImpl to CFileSysBindData
- Rename IconExtraction to CExtractIcon
- Rename IEnumIDListImpl to CEnumIDListBase
- Rename IDataObjectImpl to CIDLDataObj
Modified:
branches/shell-experiments/dll/win32/shell32/dataobject.cpp
branches/shell-experiments/dll/win32/shell32/enumidlist.cpp
branches/shell-experiments/dll/win32/shell32/enumidlist.h
branches/shell-experiments/dll/win32/shell32/extracticon.cpp
branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp
branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp
branches/shell-experiments/dll/win32/shell32/folders/fs.cpp
branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp
branches/shell-experiments/dll/win32/shell32/folders/printers.cpp
branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp
branches/shell-experiments/dll/win32/shell32/shlfsbind.cpp
Modified: branches/shell-experiments/dll/win32/shell32/dataobject.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/dataobject.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/dataobject.cpp [iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/shell32/dataobject.cpp [iso-8859-1]
Tue Nov 4 12:49:36 2014
@@ -140,7 +140,7 @@
/* number of supported formats */
#define MAX_FORMATS 5
-class IDataObjectImpl :
+class CIDLDataObj :
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IDataObject,
public IAsyncOperation
@@ -158,8 +158,8 @@
UINT cfPreferredDropEffect;
BOOL doasync;
public:
- IDataObjectImpl();
- ~IDataObjectImpl();
+ CIDLDataObj();
+ ~CIDLDataObj();
HRESULT WINAPI Initialize(HWND hwndOwner, LPCITEMIDLIST pMyPidl,
LPCITEMIDLIST * apidlx, UINT cidlx);
///////////
@@ -178,13 +178,13 @@
virtual HRESULT WINAPI StartOperation(IBindCtx *pbcReserved);
virtual HRESULT WINAPI EndOperation(HRESULT hResult, IBindCtx
*pbcReserved, DWORD dwEffects);
-BEGIN_COM_MAP(IDataObjectImpl)
+BEGIN_COM_MAP(CIDLDataObj)
COM_INTERFACE_ENTRY_IID(IID_IDataObject, IDataObject)
COM_INTERFACE_ENTRY_IID(IID_IAsyncOperation, IAsyncOperation)
END_COM_MAP()
};
-IDataObjectImpl::IDataObjectImpl()
+CIDLDataObj::CIDLDataObj()
{
pidl = NULL;
apidl = NULL;
@@ -197,14 +197,14 @@
doasync = FALSE;
}
-IDataObjectImpl::~IDataObjectImpl()
+CIDLDataObj::~CIDLDataObj()
{
TRACE(" destroying IDataObject(%p)\n",this);
_ILFreeaPidl(apidl, cidl);
ILFree(pidl);
}
-HRESULT WINAPI IDataObjectImpl::Initialize(HWND hwndOwner, LPCITEMIDLIST
pMyPidl, LPCITEMIDLIST * apidlx, UINT cidlx)
+HRESULT WINAPI CIDLDataObj::Initialize(HWND hwndOwner, LPCITEMIDLIST pMyPidl,
LPCITEMIDLIST * apidlx, UINT cidlx)
{
pidl = ILClone(pMyPidl);
apidl = _ILCopyaPidl(apidlx, cidlx);
@@ -228,7 +228,7 @@
/**************************************************************************
* IDataObject_fnGetData
*/
-HRESULT WINAPI IDataObjectImpl::GetData(LPFORMATETC pformatetcIn, STGMEDIUM
*pmedium)
+HRESULT WINAPI CIDLDataObj::GetData(LPFORMATETC pformatetcIn, STGMEDIUM
*pmedium)
{
char szTemp[256];
@@ -274,13 +274,13 @@
return E_OUTOFMEMORY;
}
-HRESULT WINAPI IDataObjectImpl::GetDataHere(LPFORMATETC pformatetc, STGMEDIUM
*pmedium)
-{
- FIXME("(%p)->()\n", this);
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI IDataObjectImpl::QueryGetData(LPFORMATETC pformatetc)
+HRESULT WINAPI CIDLDataObj::GetDataHere(LPFORMATETC pformatetc, STGMEDIUM
*pmedium)
+{
+ FIXME("(%p)->()\n", this);
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI CIDLDataObj::QueryGetData(LPFORMATETC pformatetc)
{
UINT i;
@@ -302,13 +302,13 @@
return DV_E_TYMED;
}
-HRESULT WINAPI IDataObjectImpl::GetCanonicalFormatEtc(LPFORMATETC
pformatectIn, LPFORMATETC pformatetcOut)
-{
- FIXME("(%p)->()\n", this);
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI IDataObjectImpl::SetData(LPFORMATETC pformatetc, STGMEDIUM
*pmedium, BOOL fRelease)
+HRESULT WINAPI CIDLDataObj::GetCanonicalFormatEtc(LPFORMATETC pformatectIn,
LPFORMATETC pformatetcOut)
+{
+ FIXME("(%p)->()\n", this);
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI CIDLDataObj::SetData(LPFORMATETC pformatetc, STGMEDIUM
*pmedium, BOOL fRelease)
{
if (pformatetc->cfFormat == cfPreferredDropEffect)
{
@@ -327,7 +327,7 @@
return E_NOTIMPL;
}
-HRESULT WINAPI IDataObjectImpl::EnumFormatEtc(DWORD dwDirection,
IEnumFORMATETC **ppenumFormatEtc)
+HRESULT WINAPI CIDLDataObj::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC
**ppenumFormatEtc)
{
TRACE("(%p)->()\n", this);
*ppenumFormatEtc = NULL;
@@ -341,48 +341,48 @@
return E_NOTIMPL;
}
-HRESULT WINAPI IDataObjectImpl::DAdvise(FORMATETC *pformatetc, DWORD advf,
IAdviseSink *pAdvSink, DWORD *pdwConnection)
-{
- FIXME("(%p)->()\n", this);
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI IDataObjectImpl::DUnadvise(DWORD dwConnection)
-{
- FIXME("(%p)->()\n", this);
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI IDataObjectImpl::EnumDAdvise(IEnumSTATDATA **ppenumAdvise)
-{
- FIXME("(%p)->()\n", this);
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI IDataObjectImpl::GetAsyncMode(BOOL *pfIsOpAsync)
+HRESULT WINAPI CIDLDataObj::DAdvise(FORMATETC *pformatetc, DWORD advf,
IAdviseSink *pAdvSink, DWORD *pdwConnection)
+{
+ FIXME("(%p)->()\n", this);
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI CIDLDataObj::DUnadvise(DWORD dwConnection)
+{
+ FIXME("(%p)->()\n", this);
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI CIDLDataObj::EnumDAdvise(IEnumSTATDATA **ppenumAdvise)
+{
+ FIXME("(%p)->()\n", this);
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI CIDLDataObj::GetAsyncMode(BOOL *pfIsOpAsync)
{
TRACE("(%p)->()\n", this);
*pfIsOpAsync = doasync;
return S_OK;
}
-HRESULT WINAPI IDataObjectImpl::InOperation(BOOL *pfInAsyncOp)
-{
- FIXME("(%p)->()\n", this);
- return E_NOTIMPL;
-}
-HRESULT WINAPI IDataObjectImpl::SetAsyncMode(BOOL fDoOpAsync)
+HRESULT WINAPI CIDLDataObj::InOperation(BOOL *pfInAsyncOp)
+{
+ FIXME("(%p)->()\n", this);
+ return E_NOTIMPL;
+}
+HRESULT WINAPI CIDLDataObj::SetAsyncMode(BOOL fDoOpAsync)
{
TRACE("(%p)->()\n", this);
doasync = fDoOpAsync;
return S_OK;
}
-HRESULT WINAPI IDataObjectImpl::StartOperation(IBindCtx *pbcReserved)
-{
- FIXME("(%p)->()\n", this);
- return E_NOTIMPL;
-}
-HRESULT WINAPI IDataObjectImpl::EndOperation(HRESULT hResult, IBindCtx
*pbcReserved, DWORD dwEffects)
+HRESULT WINAPI CIDLDataObj::StartOperation(IBindCtx *pbcReserved)
+{
+ FIXME("(%p)->()\n", this);
+ return E_NOTIMPL;
+}
+HRESULT WINAPI CIDLDataObj::EndOperation(HRESULT hResult, IBindCtx
*pbcReserved, DWORD dwEffects)
{
FIXME("(%p)->()\n", this);
return E_NOTIMPL;
@@ -395,7 +395,7 @@
*/
HRESULT IDataObject_Constructor(HWND hwndOwner, LPCITEMIDLIST pMyPidl,
LPCITEMIDLIST * apidl, UINT cidl, IDataObject **dataObject)
{
- return ShellObjectCreatorInit<IDataObjectImpl>(hwndOwner, pMyPidl, apidl,
cidl, IID_IDataObject, dataObject);
+ return ShellObjectCreatorInit<CIDLDataObj>(hwndOwner, pMyPidl, apidl,
cidl, IID_IDataObject, dataObject);
}
/*************************************************************************
Modified: branches/shell-experiments/dll/win32/shell32/enumidlist.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/enumidlist.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/enumidlist.cpp [iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/shell32/enumidlist.cpp [iso-8859-1]
Tue Nov 4 12:49:36 2014
@@ -22,21 +22,21 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
-IEnumIDListImpl::IEnumIDListImpl()
+CEnumIDListBase::CEnumIDListBase()
{
mpFirst = NULL;
mpLast = NULL;
mpCurrent = NULL;
}
-IEnumIDListImpl::~IEnumIDListImpl()
+CEnumIDListBase::~CEnumIDListBase()
{
}
/**************************************************************************
* AddToEnumList()
*/
-BOOL IEnumIDListImpl::AddToEnumList(LPITEMIDLIST pidl)
+BOOL CEnumIDListBase::AddToEnumList(LPITEMIDLIST pidl)
{
ENUMLIST *pNew;
@@ -76,7 +76,7 @@
/**************************************************************************
* DeleteList()
*/
-BOOL IEnumIDListImpl::DeleteList()
+BOOL CEnumIDListBase::DeleteList()
{
ENUMLIST *pDelete;
@@ -98,7 +98,7 @@
/**************************************************************************
* HasItemWithCLSID()
*/
-BOOL IEnumIDListImpl::HasItemWithCLSID(LPITEMIDLIST pidl)
+BOOL CEnumIDListBase::HasItemWithCLSID(LPITEMIDLIST pidl)
{
ENUMLIST *pCur;
IID *ptr = _ILGetGUIDPointer(pidl);
@@ -126,7 +126,7 @@
/**************************************************************************
* CreateFolderEnumList()
*/
-BOOL IEnumIDListImpl::CreateFolderEnumList(
+BOOL CEnumIDListBase::CreateFolderEnumList(
LPCWSTR lpszPath,
DWORD dwFlags)
{
@@ -193,7 +193,7 @@
* IEnumIDList_fnNext
*/
-HRESULT WINAPI IEnumIDListImpl::Next(
+HRESULT WINAPI CEnumIDListBase::Next(
ULONG celt,
LPITEMIDLIST * rgelt,
ULONG *pceltFetched)
@@ -238,7 +238,7 @@
/**************************************************************************
* IEnumIDList_fnSkip
*/
-HRESULT WINAPI IEnumIDListImpl::Skip(
+HRESULT WINAPI CEnumIDListBase::Skip(
ULONG celt)
{
DWORD dwIndex;
@@ -259,7 +259,7 @@
/**************************************************************************
* IEnumIDList_fnReset
*/
-HRESULT WINAPI IEnumIDListImpl::Reset()
+HRESULT WINAPI CEnumIDListBase::Reset()
{
TRACE("(%p)\n", this);
mpCurrent = mpFirst;
@@ -269,7 +269,7 @@
/**************************************************************************
* IEnumIDList_fnClone
*/
-HRESULT WINAPI IEnumIDListImpl::Clone(LPENUMIDLIST *ppenum)
+HRESULT WINAPI CEnumIDListBase::Clone(LPENUMIDLIST *ppenum)
{
TRACE("(%p)->() to (%p)->() E_NOTIMPL\n", this, ppenum);
return E_NOTIMPL;
@@ -281,5 +281,5 @@
*/
HRESULT IEnumIDList_Constructor(IEnumIDList **enumerator)
{
- return ShellObjectCreator<IEnumIDListImpl>(IID_IEnumIDList, enumerator);
-}
+ return ShellObjectCreator<CEnumIDListBase>(IID_IEnumIDList, enumerator);
+}
Modified: branches/shell-experiments/dll/win32/shell32/enumidlist.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/enumidlist.h?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/enumidlist.h [iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/shell32/enumidlist.h [iso-8859-1]
Tue Nov 4 12:49:36 2014
@@ -23,7 +23,7 @@
LPITEMIDLIST pidl;
};
-class IEnumIDListImpl :
+class CEnumIDListBase :
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IEnumIDList
{
@@ -32,8 +32,8 @@
ENUMLIST *mpLast;
ENUMLIST *mpCurrent;
public:
- IEnumIDListImpl();
- ~IEnumIDListImpl();
+ CEnumIDListBase();
+ ~CEnumIDListBase();
BOOL AddToEnumList(LPITEMIDLIST pidl);
BOOL DeleteList();
BOOL HasItemWithCLSID(LPITEMIDLIST pidl);
@@ -45,7 +45,7 @@
virtual HRESULT STDMETHODCALLTYPE Reset();
virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum);
-BEGIN_COM_MAP(IEnumIDListImpl)
+BEGIN_COM_MAP(CEnumIDListBase)
COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList)
END_COM_MAP()
};
Modified: branches/shell-experiments/dll/win32/shell32/extracticon.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/extracticon.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/extracticon.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/extracticon.cpp
[iso-8859-1] Tue Nov 4 12:49:36 2014
@@ -17,7 +17,7 @@
UINT index;
};
-class IconExtraction :
+class CExtractIcon :
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IDefaultExtractIconInit,
public IExtractIconW,
@@ -31,8 +31,8 @@
struct IconLocation openIcon;
struct IconLocation shortcutIcon;
public:
- IconExtraction();
- ~IconExtraction();
+ CExtractIcon();
+ ~CExtractIcon();
// IDefaultExtractIconInit
virtual HRESULT STDMETHODCALLTYPE SetDefaultIcon(LPCWSTR pszFile, int
iIcon);
@@ -60,7 +60,7 @@
virtual HRESULT STDMETHODCALLTYPE SaveCompleted(LPCOLESTR pszFileName);
virtual HRESULT STDMETHODCALLTYPE GetCurFile(LPOLESTR *ppszFileName);
-BEGIN_COM_MAP(IconExtraction)
+BEGIN_COM_MAP(CExtractIcon)
COM_INTERFACE_ENTRY_IID(IID_IDefaultExtractIconInit,
IDefaultExtractIconInit)
COM_INTERFACE_ENTRY_IID(IID_IExtractIconW, IExtractIconW)
COM_INTERFACE_ENTRY_IID(IID_IExtractIconA, IExtractIconA)
@@ -85,7 +85,7 @@
CopyMemory(*Destination, Source, cb);
}
-IconExtraction::IconExtraction()
+CExtractIcon::CExtractIcon()
{
flags = 0;
memset(&defaultIcon, 0, sizeof(defaultIcon));
@@ -94,7 +94,7 @@
memset(&shortcutIcon, 0, sizeof(shortcutIcon));
}
-IconExtraction::~IconExtraction()
+CExtractIcon::~CExtractIcon()
{
if (defaultIcon.file) CoTaskMemFree(defaultIcon.file);
if (normalIcon.file) CoTaskMemFree(normalIcon.file);
@@ -102,7 +102,7 @@
if (shortcutIcon.file) CoTaskMemFree(shortcutIcon.file);
}
-HRESULT STDMETHODCALLTYPE IconExtraction::SetDefaultIcon(
+HRESULT STDMETHODCALLTYPE CExtractIcon::SetDefaultIcon(
LPCWSTR pszFile,
int iIcon)
{
@@ -115,7 +115,7 @@
return S_OK;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::SetFlags(
+HRESULT STDMETHODCALLTYPE CExtractIcon::SetFlags(
UINT uFlags)
{
TRACE("(%p, 0x%x)\n", this, uFlags);
@@ -124,7 +124,7 @@
return S_OK;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::SetKey(
+HRESULT STDMETHODCALLTYPE CExtractIcon::SetKey(
HKEY hkey)
{
FIXME("(%p, %p)\n", this, hkey);
@@ -132,7 +132,7 @@
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::SetNormalIcon(
+HRESULT STDMETHODCALLTYPE CExtractIcon::SetNormalIcon(
LPCWSTR pszFile,
int iIcon)
{
@@ -145,7 +145,7 @@
return S_OK;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::SetOpenIcon(
+HRESULT STDMETHODCALLTYPE CExtractIcon::SetOpenIcon(
LPCWSTR pszFile,
int iIcon)
{
@@ -158,7 +158,7 @@
return S_OK;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::SetShortcutIcon(
+HRESULT STDMETHODCALLTYPE CExtractIcon::SetShortcutIcon(
LPCWSTR pszFile,
int iIcon)
{
@@ -171,7 +171,7 @@
return S_OK;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::GetIconLocation(
+HRESULT STDMETHODCALLTYPE CExtractIcon::GetIconLocation(
UINT uFlags,
LPWSTR szIconFile,
UINT cchMax,
@@ -207,7 +207,7 @@
return S_OK;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::Extract(
+HRESULT STDMETHODCALLTYPE CExtractIcon::Extract(
LPCWSTR pszFile,
UINT nIconIndex,
HICON *phiconLarge,
@@ -220,7 +220,7 @@
return S_FALSE;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::GetIconLocation(
+HRESULT STDMETHODCALLTYPE CExtractIcon::GetIconLocation(
UINT uFlags,
LPSTR szIconFile,
UINT cchMax,
@@ -248,7 +248,7 @@
return hr;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::Extract(
+HRESULT STDMETHODCALLTYPE CExtractIcon::Extract(
LPCSTR pszFile,
UINT nIconIndex,
HICON *phiconLarge,
@@ -282,7 +282,7 @@
return hr;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::GetClassID(
+HRESULT STDMETHODCALLTYPE CExtractIcon::GetClassID(
CLSID *pClassID)
{
TRACE("(%p, %p)\n", this, pClassID);
@@ -294,14 +294,14 @@
return S_OK;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::IsDirty()
+HRESULT STDMETHODCALLTYPE CExtractIcon::IsDirty()
{
FIXME("(%p)\n", this);
UNIMPLEMENTED;
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::Load(
+HRESULT STDMETHODCALLTYPE CExtractIcon::Load(
LPCOLESTR pszFileName,
DWORD dwMode)
{
@@ -310,7 +310,7 @@
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::Save(
+HRESULT STDMETHODCALLTYPE CExtractIcon::Save(
LPCOLESTR pszFileName,
BOOL fRemember)
{
@@ -319,7 +319,7 @@
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::SaveCompleted(
+HRESULT STDMETHODCALLTYPE CExtractIcon::SaveCompleted(
LPCOLESTR pszFileName)
{
FIXME("(%p, %s)\n", this, debugstr_w(pszFileName));
@@ -327,7 +327,7 @@
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE IconExtraction::GetCurFile(
+HRESULT STDMETHODCALLTYPE CExtractIcon::GetCurFile(
LPOLESTR *ppszFileName)
{
FIXME("(%p, %p)\n", this, ppszFileName);
@@ -337,5 +337,5 @@
HRESULT WINAPI SHCreateDefaultExtractIcon(REFIID riid, void **ppv)
{
- return ShellObjectCreator<IconExtraction>(riid, ppv);
-}
+ return ShellObjectCreator<CExtractIcon>(riid, ppv);
+}
Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp
[iso-8859-1] Tue Nov 4 12:49:36 2014
@@ -34,7 +34,7 @@
*/
class CControlPanelEnum :
- public IEnumIDListImpl
+ public CEnumIDListBase
{
public:
CControlPanelEnum();
Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp
[iso-8859-1] Tue Nov 4 12:49:36 2014
@@ -51,7 +51,7 @@
class CDesktopFolder;
class CDesktopFolderEnum :
- public IEnumIDListImpl
+ public CEnumIDListBase
{
private:
// CComPtr fDesktopEnumerator;
Modified: branches/shell-experiments/dll/win32/shell32/folders/fs.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/folders/fs.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/folders/fs.cpp [iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/shell32/folders/fs.cpp [iso-8859-1]
Tue Nov 4 12:49:36 2014
@@ -36,7 +36,7 @@
*/
class CFileSysEnum :
- public IEnumIDListImpl
+ public CEnumIDListBase
{
private:
public:
Modified: branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp
[iso-8859-1] Tue Nov 4 12:49:36 2014
@@ -40,7 +40,7 @@
*/
class CDrivesFolderEnum :
- public IEnumIDListImpl
+ public CEnumIDListBase
{
public:
CDrivesFolderEnum();
Modified: branches/shell-experiments/dll/win32/shell32/folders/printers.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/folders/printers.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/folders/printers.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/folders/printers.cpp
[iso-8859-1] Tue Nov 4 12:49:36 2014
@@ -195,7 +195,7 @@
* Printers folder implementation
*/
-class CPrintersEnum: public IEnumIDListImpl
+class CPrintersEnum: public CEnumIDListBase
{
public:
CPrintersEnum();
Modified: branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp
[iso-8859-1] Tue Nov 4 12:49:36 2014
@@ -63,7 +63,7 @@
*/
class CRecycleBinEnum :
- public IEnumIDListImpl
+ public CEnumIDListBase
{
private:
public:
Modified: branches/shell-experiments/dll/win32/shell32/shlfsbind.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/shlfsbind.cpp?rev=65245&r1=65244&r2=65245&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/shlfsbind.cpp [iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/shell32/shlfsbind.cpp [iso-8859-1]
Tue Nov 4 12:49:36 2014
@@ -27,24 +27,24 @@
/***********************************************************************
* IFileSystemBindData implementation
*/
-class IFileSystemBindDataImpl :
+class CFileSysBindData :
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IFileSystemBindData
{
private:
WIN32_FIND_DATAW findFile;
public:
- IFileSystemBindDataImpl();
- ~IFileSystemBindDataImpl();
+ CFileSysBindData();
+ ~CFileSysBindData();
// *** IFileSystemBindData methods ***
virtual HRESULT STDMETHODCALLTYPE SetFindData(const WIN32_FIND_DATAW *pfd);
virtual HRESULT STDMETHODCALLTYPE GetFindData(WIN32_FIND_DATAW *pfd);
-DECLARE_NOT_AGGREGATABLE(IFileSystemBindDataImpl)
+DECLARE_NOT_AGGREGATABLE(CFileSysBindData)
DECLARE_PROTECT_FINAL_CONSTRUCT()
-BEGIN_COM_MAP(IFileSystemBindDataImpl)
+BEGIN_COM_MAP(CFileSysBindData)
COM_INTERFACE_ENTRY_IID(IID_IFileSystemBindData, IFileSystemBindData)
END_COM_MAP()
};
@@ -63,7 +63,7 @@
*ppV = NULL;
- hResult = IFileSystemBindDataImpl::_CreatorClass::CreateInstance(NULL,
IID_PPV_ARG(IFileSystemBindData, &fileSystemBindData));
+ hResult = CFileSysBindData::_CreatorClass::CreateInstance(NULL,
IID_PPV_ARG(IFileSystemBindData, &fileSystemBindData));
if (FAILED(hResult))
return hResult;
hResult = fileSystemBindData->SetFindData(pfd);
@@ -128,17 +128,17 @@
return ret;
}
-IFileSystemBindDataImpl::IFileSystemBindDataImpl()
+CFileSysBindData::CFileSysBindData()
{
memset(&findFile, 0, sizeof(WIN32_FIND_DATAW));
}
-IFileSystemBindDataImpl::~IFileSystemBindDataImpl()
+CFileSysBindData::~CFileSysBindData()
{
TRACE(" destroying ISFBindPidl(%p)\n", this);
}
-HRESULT WINAPI IFileSystemBindDataImpl::GetFindData(WIN32_FIND_DATAW *pfd)
+HRESULT WINAPI CFileSysBindData::GetFindData(WIN32_FIND_DATAW *pfd)
{
TRACE("(%p), %p\n", this, pfd);
@@ -149,7 +149,7 @@
return S_OK;
}
-HRESULT WINAPI IFileSystemBindDataImpl::SetFindData(const WIN32_FIND_DATAW
*pfd)
+HRESULT WINAPI CFileSysBindData::SetFindData(const WIN32_FIND_DATAW *pfd)
{
TRACE("(%p), %p\n", this, pfd);
