Index: src/ch/DirTreeCtrl.cpp =================================================================== diff -u -N -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r6c67d46c243c6a275f2a427c991f82db59c63ef0 --- src/ch/DirTreeCtrl.cpp (.../DirTreeCtrl.cpp) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787) +++ src/ch/DirTreeCtrl.cpp (.../DirTreeCtrl.cpp) (revision 6c67d46c243c6a275f2a427c991f82db59c63ef0) @@ -166,38 +166,6 @@ return bSuccess; } -LPITEMIDLIST GetFullyQualPidl(LPSHELLFOLDER lpsf, LPITEMIDLIST lpi) -{ - TCHAR szBuff[MAX_PATH]; - LPSHELLFOLDER lpsfDeskTop; - LPITEMIDLIST lpifq; - ULONG ulEaten, ulAttribs; - HRESULT hr; - - if (!GetName(lpsf, lpi, SHGDN_FORPARSING, szBuff)) - return NULL; - - hr=SHGetDesktopFolder(&lpsfDeskTop); - - if (FAILED(hr)) - return NULL; - - CT2W ct2w(szBuff); - hr=lpsfDeskTop->ParseDisplayName(NULL, - NULL, - ct2w, - &ulEaten, - &lpifq, - &ulAttribs); - - lpsfDeskTop->Release(); - - if (FAILED(hr)) - return NULL; - - return lpifq; -} - ///////////////////////////////////////////////////////////////////////////// // CDirTreeCtrl Index: src/ch/DirTreeCtrl.h =================================================================== diff -u -N -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r6c67d46c243c6a275f2a427c991f82db59c63ef0 --- src/ch/DirTreeCtrl.h (.../DirTreeCtrl.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787) +++ src/ch/DirTreeCtrl.h (.../DirTreeCtrl.h) (revision 6c67d46c243c6a275f2a427c991f82db59c63ef0) @@ -68,7 +68,6 @@ // Functions that deal with PIDLs LPITEMIDLIST ConcatPidls(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); -LPITEMIDLIST GetFullyQualPidl(LPSHELLFOLDER lpsf, LPITEMIDLIST lpi); LPITEMIDLIST CopyITEMID(LPMALLOC lpMalloc, LPITEMIDLIST lpi); BOOL GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST lpi, DWORD dwFlags, LPTSTR lpFriendlyName); LPITEMIDLIST CreatePidl(UINT cbSize); Index: src/chext/ShellExtControl.cpp =================================================================== diff -u -N -rc33d4855ebf17772c28012a66c829a1f21d080f5 -r6c67d46c243c6a275f2a427c991f82db59c63ef0 --- src/chext/ShellExtControl.cpp (.../ShellExtControl.cpp) (revision c33d4855ebf17772c28012a66c829a1f21d080f5) +++ src/chext/ShellExtControl.cpp (.../ShellExtControl.cpp) (revision 6c67d46c243c6a275f2a427c991f82db59c63ef0) @@ -50,10 +50,8 @@ } // memory mapped file - DWORD dwLastError = ERROR_SUCCESS; - m_hMemory = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(SHELLEXT_DATA), _T("CHShellExtControlData")); // name of map object - dwLastError = GetLastError(); // NOTE: last error is needed also for success case (for already exists status) + DWORD dwLastError = GetLastError(); // NOTE: last error is needed also for success case (for already exists status) if(!m_hMemory) { BOOST_LOG_HRESULT(rLogger, dwLastError) << L"Cannot create file mapping."; Index: src/libchcore/TFileInfoArray.cpp =================================================================== diff -u -N -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r6c67d46c243c6a275f2a427c991f82db59c63ef0 --- src/libchcore/TFileInfoArray.cpp (.../TFileInfoArray.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/libchcore/TFileInfoArray.cpp (.../TFileInfoArray.cpp) (revision 6c67d46c243c6a275f2a427c991f82db59c63ef0) @@ -64,20 +64,6 @@ return m_vFiles.at(boost::numeric_cast(fcIndex)); } - TFileInfo TFileInfoArray::GetCopyAt(file_count_t fcIndex) const - { - boost::shared_lock lock(m_lock); - - if (fcIndex >= m_vFiles.size()) - THROW_CORE_EXCEPTION_MSG(eErr_InvalidArgument, L"fcIndex"); - - const TFileInfoPtr& spInfo = m_vFiles.at(boost::numeric_cast(fcIndex)); - if (!spInfo) - THROW_CORE_EXCEPTION_MSG(eErr_InvalidPointer, L"spInfo"); - - return *spInfo; - } - void TFileInfoArray::Clear() { boost::unique_lock lock(m_lock); Index: src/libchcore/TFileInfoArray.h =================================================================== diff -u -N -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r6c67d46c243c6a275f2a427c991f82db59c63ef0 --- src/libchcore/TFileInfoArray.h (.../TFileInfoArray.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) +++ src/libchcore/TFileInfoArray.h (.../TFileInfoArray.h) (revision 6c67d46c243c6a275f2a427c991f82db59c63ef0) @@ -47,9 +47,6 @@ /// Retrieves an element at the specified index TFileInfoPtr GetAt(file_count_t stIndex) const; - /// Retrieves a copy of the element at a specified index - TFileInfo GetCopyAt(file_count_t stIndex) const; - /// Removes all elements from this object void Clear(); Index: src/libictranslate/ResourceManager.cpp =================================================================== diff -u -N -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r6c67d46c243c6a275f2a427c991f82db59c63ef0 --- src/libictranslate/ResourceManager.cpp (.../ResourceManager.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/libictranslate/ResourceManager.cpp (.../ResourceManager.cpp) (revision 6c67d46c243c6a275f2a427c991f82db59c63ef0) @@ -20,7 +20,6 @@ #include "ResourceManager.h" #include #include -#include "crc32.h" #include "cfg.h" #include @@ -193,14 +192,6 @@ m_uiChecksum = 0; } -void CTranslationItem::CalculateChecksum() -{ - if(m_pszText) - m_uiChecksum = crc32((const char*)m_pszText, m_stTextLength*sizeof(wchar_t)); - else - m_uiChecksum = 0; -} - const wchar_t* CTranslationItem::GetText() const { return m_pszText ? m_pszText : _T(""); @@ -1095,15 +1086,6 @@ return pszData; } -PTSTR CResourceManager::LoadStringCopy(UINT uiID, PTSTR pszStr, UINT uiMax) -{ - EnterCriticalSection(&m_cs); - _tcsncpy(pszStr, m_ld.GetString(0, (WORD)uiID), uiMax-1); - pszStr[uiMax-1]=_T('\0'); - LeaveCriticalSection(&m_cs); - return pszStr; -} - HANDLE CResourceManager::LoadImage(LPCTSTR lpszName, UINT uType, int cxDesired, int cyDesired, UINT fuLoad) { EnterCriticalSection(&m_cs); Index: src/libictranslate/ResourceManager.h =================================================================== diff -u -N -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r6c67d46c243c6a275f2a427c991f82db59c63ef0 --- src/libictranslate/ResourceManager.h (.../ResourceManager.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/libictranslate/ResourceManager.h (.../ResourceManager.h) (revision 6c67d46c243c6a275f2a427c991f82db59c63ef0) @@ -81,7 +81,6 @@ CTranslationItem& operator=(const CTranslationItem& rSrc); void Clear(); - void CalculateChecksum(); const wchar_t* GetText() const; void SetText(const wchar_t* pszText, bool bUnescapeString); @@ -154,10 +153,10 @@ void SetModified() { m_bModified = true; } bool IsValidDescription() const; + protected: void SetFnameData(PTSTR *ppszDst, PCTSTR pszSrc); static void EnumAttributesCallback(bool bGroup, const wchar_t* pszName, const wchar_t* pszValue, void* pData); - static void WriteAttributesCallback(bool bGroup, const wchar_t* pszName, const wchar_t* pszValue, void* pData); static void UnescapeString(wchar_t* pszData); protected: @@ -208,7 +207,6 @@ PCTSTR LoadString(UINT uiID); PCTSTR LoadString(WORD wGroup, WORD wID); - PTSTR LoadStringCopy(UINT uiID, PTSTR pszStr, UINT uiMax); // res updating functions void UpdateMenu(HMENU hMenu, WORD wMenuID);