There is a difference between a C++ bool and a win32 BOOL. bool is 8 bit and aware of things like (bool Foo = FlagsValue & 0x80000000); BOOLEAN BooleanFlag = Foo;" with BOOL this would fail. I don't really know whether a BOOL is really the right thing to use here.
Am 04.11.2014 21:00, schrieb akhaldi@svn.reactos.org:
Author: akhaldi Date: Tue Nov 4 20:00:09 2014 New Revision: 65249
URL: http://svn.reactos.org/svn/reactos?rev=65249&view=rev Log: [SHELL32]
- bool => BOOL.
Modified: branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h branches/shell-experiments/dll/win32/shell32/shellfolder.h
Modified: branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shel... ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -1189,7 +1189,7 @@ return ret; }
-HRESULT WINAPI CDesktopFolder::CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, bool bCopy) +HRESULT WINAPI CDesktopFolder::CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy) { CComPtr<IPersistFolder2> ppf2; WCHAR szSrcPath[MAX_PATH];
Modified: branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shel... ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -88,7 +88,7 @@ virtual HRESULT WINAPI GetUniqueName(LPWSTR pwszName, UINT uLen); virtual HRESULT WINAPI AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut); virtual HRESULT WINAPI DeleteItems(UINT cidl, LPCITEMIDLIST *apidl);
virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, bool bCopy);
virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); DECLARE_REGISTRY_RESOURCEID(IDR_SHELLDESKTOP) DECLARE_NOT_AGGREGATABLE(CDesktopFolder)Modified: branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shel... ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -1030,7 +1030,7 @@
- copies items to this folder
*/ HRESULT WINAPI CFSFolder::CopyItems(IShellFolder * pSFFrom, UINT cidl,
LPCITEMIDLIST * apidl, bool bCopy)
LPCITEMIDLIST * apidl, BOOL bCopy)Modified: branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shel... ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -102,7 +102,7 @@ virtual HRESULT WINAPI GetUniqueName(LPWSTR pwszName, UINT uLen); virtual HRESULT WINAPI AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut); virtual HRESULT WINAPI DeleteItems(UINT cidl, LPCITEMIDLIST *apidl);
virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, bool bCopy);
virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) DECLARE_NOT_AGGREGATABLE(CFSFolder)Modified: branches/shell-experiments/dll/win32/shell32/shellfolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shel... ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellfolder.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellfolder.h [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -42,7 +42,7 @@ STDMETHOD(GetUniqueName)(THIS_ LPWSTR lpName, UINT uLen) PURE; STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCWSTR lpName, LPITEMIDLIST * ppidlOut) PURE; STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE;
- STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, bool bCopy) PURE;
- STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, BOOL bCopy) PURE; }; #undef INTERFACE