Fix some compiler warnings

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index 532a3ac..99c6be2 100644 (file)
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -336,7 +336,7 @@ static BOOL CALLBACK EnumChildProc(HWND hwnd, LPARAM lParam)
        }
        else
        {
-               BOOL bHidden = (BOOL)RemoveProp(hwnd, _T("Hidden"));
+               BOOL bHidden = static_cast<BOOL>(reinterpret_cast<uintptr_t>(RemoveProp(hwnd, _T("Hidden"))));
                if (!bHidden)
                        ::SendMessage(hwnd, WM_SETREDRAW, (WPARAM)lParam, 0);
        }

diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp
index 90c8934..b97b4e0 100644 (file)
--- a/Src/Common/LanguageSelect.cpp
+++ b/Src/Common/LanguageSelect.cpp
@@ -938,7 +938,7 @@ void CLanguageSelect::TranslateMenu(HMENU h) const
                if (mii.hSubMenu)
                {
                        TranslateMenu(mii.hSubMenu);
-                       mii.wID = reinterpret_cast<UINT>(mii.hSubMenu);
+                       mii.wID = static_cast<UINT>(reinterpret_cast<uintptr_t>(mii.hSubMenu));
                }
                if (BCMenuData *pItemData = reinterpret_cast<BCMenuData *>(mii.dwItemData))
                {

diff --git a/Src/Common/PreferencesDlg.cpp b/Src/Common/PreferencesDlg.cpp
index dd01358..4bf737a 100644 (file)
--- a/Src/Common/PreferencesDlg.cpp
+++ b/Src/Common/PreferencesDlg.cpp
@@ -192,7 +192,7 @@ void CPreferencesDlg::AddPage(CPropertyPage* pPage, LPCTSTR szPath)
                m_tcPages.EnsureVisible(hti);
 
                // map both ways
-               m_tcPages.SetItemData(hti, (DWORD)pPage);
+               m_tcPages.SetItemData(hti, static_cast<DWORD>(reinterpret_cast<uintptr_t>(pPage)));
                m_mapPP2HTI[(void*)pPage] = (void*)hti;
        }
 }

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 68905b5..699c852 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -709,7 +709,7 @@ void CDirView::ListContextMenu(CPoint point, int /*i*/)
        theApp.TranslateMenu(menuPluginsHolder.m_hMenu);
        String s = _("Plugin Settings");
        pPopup->AppendMenu(MF_SEPARATOR);
-       pPopup->AppendMenu(MF_POPUP, (int)menuPluginsHolder.m_hMenu, s.c_str());
+       pPopup->AppendMenu(MF_POPUP, static_cast<int>(reinterpret_cast<uintptr_t>(menuPluginsHolder.m_hMenu)), s.c_str());
 
        CFrameWnd *pFrame = GetTopLevelFrame();
        ASSERT(pFrame != NULL);
@@ -1625,10 +1625,10 @@ void CDirView::DoOpen(SIDE_TYPE stype)
        if (sel == -1) return;
        String file = GetSelectedFileName(SelBegin(), stype, GetDiffContext());
        if (file.empty()) return;
-       int rtn = (int)ShellExecute(::GetDesktopWindow(), _T("edit"), file.c_str(), 0, 0, SW_SHOWNORMAL);
-       if (rtn==SE_ERR_NOASSOC)
-               rtn = (int)ShellExecute(::GetDesktopWindow(), _T("open"), file.c_str(), 0, 0, SW_SHOWNORMAL);
-       if (rtn==SE_ERR_NOASSOC)
+       HINSTANCE rtn = ShellExecute(::GetDesktopWindow(), _T("edit"), file.c_str(), 0, 0, SW_SHOWNORMAL);
+       if (reinterpret_cast<uintptr_t>(rtn) == SE_ERR_NOASSOC)
+               rtn = ShellExecute(::GetDesktopWindow(), _T("open"), file.c_str(), 0, 0, SW_SHOWNORMAL);
+       if (reinterpret_cast<uintptr_t>(rtn) == SE_ERR_NOASSOC)
                DoOpenWith(stype);
 }
 

diff --git a/Src/DropHandler.cpp b/Src/DropHandler.cpp
index e0139a2..93aeb73 100644 (file)
--- a/Src/DropHandler.cpp
+++ b/Src/DropHandler.cpp
@@ -166,7 +166,7 @@ namespace
        HRESULT GetFileItemsFromIDataObject_ShellIDList(IDataObject *pDataObj, std::vector<String>& root_files)
        {
                String tmpdir;
-               FORMATETC fmtetc_filedescriptor = { RegisterClipboardFormat(CFSTR_SHELLIDLIST), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+               FORMATETC fmtetc_filedescriptor = { static_cast<WORD>(RegisterClipboardFormat(CFSTR_SHELLIDLIST)), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
                STGMEDIUM medium = { 0 };
                HRESULT hr;
                if ((hr = pDataObj->GetData(&fmtetc_filedescriptor, &medium)) == S_OK)
@@ -229,7 +229,7 @@ namespace
 
        HRESULT ExtractFileItemFromIDataObject_FileContents(IDataObject *pDataObj, int lindex, const String& filepath)
        {
-               FORMATETC fmtetc_filecontents = { RegisterClipboardFormat(CFSTR_FILECONTENTS), NULL, DVASPECT_CONTENT, lindex, TYMED_HGLOBAL | TYMED_ISTREAM };
+               FORMATETC fmtetc_filecontents = { static_cast<WORD>(RegisterClipboardFormat(CFSTR_FILECONTENTS)), NULL, DVASPECT_CONTENT, lindex, TYMED_HGLOBAL | TYMED_ISTREAM };
                STGMEDIUM medium = { 0 };
                HRESULT hr;
                if ((hr = pDataObj->GetData(&fmtetc_filecontents, &medium)) == S_OK)
@@ -247,7 +247,7 @@ namespace
        HRESULT GetFileItemsFromIDataObject_FileDescriptor(IDataObject *pDataObj, std::vector<String>& root_files)
        {
                String tmpdir = env_GetTempChildPath();
-               FORMATETC fmtetc_filedescriptor = { RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+               FORMATETC fmtetc_filedescriptor = { static_cast<WORD>(RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR)), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
                STGMEDIUM medium = { 0 };
                HRESULT hr;
                if ((hr = pDataObj->GetData(&fmtetc_filedescriptor, &medium)) == S_OK)
@@ -317,8 +317,8 @@ ULONG STDMETHODCALLTYPE DropHandler::Release(void)
 HRESULT STDMETHODCALLTYPE DropHandler::DragEnter(IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect)
 {
        FORMATETC fmtetc_cf_hdrop = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-       FORMATETC fmtetc_shellidlist = { RegisterClipboardFormat(CFSTR_SHELLIDLIST), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-       FORMATETC fmtetc_filedescriptor = { RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+       FORMATETC fmtetc_shellidlist = { static_cast<WORD>(RegisterClipboardFormat(CFSTR_SHELLIDLIST)), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+       FORMATETC fmtetc_filedescriptor = { static_cast<WORD>(RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR)), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
        if (pDataObj->QueryGetData(&fmtetc_cf_hdrop) == S_OK ||
            pDataObj->QueryGetData(&fmtetc_shellidlist) == S_OK ||
            pDataObj->QueryGetData(&fmtetc_filedescriptor) == S_OK)
@@ -346,8 +346,8 @@ HRESULT DropHandler::Drop(IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, D
        CWaitCursor waitstatus;
        std::vector<String> files;
        FORMATETC fmtetc_cf_hdrop = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-       FORMATETC fmtetc_shellidlist = { RegisterClipboardFormat(CFSTR_SHELLIDLIST), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-       FORMATETC fmtetc_filedescriptor = { RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+       FORMATETC fmtetc_shellidlist = { static_cast<WORD>(RegisterClipboardFormat(CFSTR_SHELLIDLIST)), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+       FORMATETC fmtetc_filedescriptor = { static_cast<WORD>(RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR)), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
        if (pDataObj->QueryGetData(&fmtetc_cf_hdrop) == S_OK &&
                GetFileItemsFromIDataObject_CF_HDROP(pDataObj, files) == S_OK && files.size() > 0)
                ok = true;

diff --git a/Src/FilepathEdit.cpp b/Src/FilepathEdit.cpp
index 357ecb9..9fefdde 100644 (file)
--- a/Src/FilepathEdit.cpp
+++ b/Src/FilepathEdit.cpp
@@ -61,7 +61,7 @@ END_MESSAGE_MAP()
  */
 int FormatFilePathForDisplayWidth(CDC * pDC, int maxWidth, String & sFilepath)
 {
-       int iBegin = 0;
+       size_t iBegin = 0;
        int nLines = 1;
        
        while (1)
@@ -69,11 +69,11 @@ int FormatFilePathForDisplayWidth(CDC * pDC, int maxWidth, String & sFilepath)
                String line;
 
                // find the next truncation point
-               int iEndMin = 0;
-               int iEndMax = sFilepath.length() - iBegin + 1;
+               size_t iEndMin = 0;
+               size_t iEndMax = sFilepath.length() - iBegin + 1;
                while(1)
                {
-                       int iEnd = (iEndMin + iEndMax) / 2;
+                       size_t iEnd = (iEndMin + iEndMax) / 2;
                        if (iEnd == iEndMin)
                                break;
                        line = sFilepath.substr(iBegin, iEnd);
@@ -93,7 +93,7 @@ int FormatFilePathForDisplayWidth(CDC * pDC, int maxWidth, String & sFilepath)
 
                // truncate the text to the previous "\" if possible
                line = sFilepath.substr(iBegin, iEndMin);
-               int lastSlash = line.rfind('\\');
+               size_t lastSlash = line.rfind('\\');
                if (lastSlash != String::npos)
                        iEndMin = lastSlash + 1;
 
@@ -221,9 +221,9 @@ const String& CFilepathEdit::GetUpdatedTipText(CDC * pDC, int maxWidth)
  *
  * @note The standard Copy function works with the (compacted) windowText 
  */
-void CFilepathEdit::CustomCopy(int iBegin, int iEnd /*=-1*/)
+void CFilepathEdit::CustomCopy(size_t iBegin, size_t iEnd /*=-1*/)
 {
-       if (iEnd == -1)
+       if (iEnd == String::npos)
                iEnd = m_sOriginalText.length();
 
        PutToClipboard(m_sOriginalText.substr(iBegin, iEnd - iBegin), m_hWnd);
@@ -267,7 +267,7 @@ void CFilepathEdit::OnContextMenu(CWnd*, CPoint point)
                        TPM_NONOTIFY  | TPM_RETURNCMD, point.x, point.y, AfxGetMainWnd());
 
                // compute the beginning of the text to copy (in OriginalText)
-               int iBegin = 0;
+               size_t iBegin = 0;
                switch (command)
                {
                case ID_EDITOR_COPY:
@@ -301,9 +301,9 @@ void CFilepathEdit::OnContextMenu(CWnd*, CPoint point)
 
 static COLORREF GetDarkenColor(COLORREF a, double r)
 {
-       const int R = GetRValue(a) * r;
-       const int G = GetGValue(a) * r;
-       const int B = GetBValue(a) * r;
+       const int R = static_cast<int>(GetRValue(a) * r);
+       const int G = static_cast<int>(GetGValue(a) * r);
+       const int B = static_cast<int>(GetBValue(a) * r);
        return RGB(R, G, B);
 }
 

diff --git a/Src/FilepathEdit.h b/Src/FilepathEdit.h
index 78052c2..b2a355c 100644 (file)
--- a/Src/FilepathEdit.h
+++ b/Src/FilepathEdit.h
@@ -54,7 +54,7 @@ protected:
        void GetOriginalText( String& rString ) const;
 
 private:
-       void CustomCopy(int iBegin, int iEnd =-1);
+       void CustomCopy(size_t iBegin, size_t iEnd = String::npos);
 
        String m_sToolTipString; /**< buffer for return data from GetUpdatedTipText */
        String m_sOriginalText; /**< Full path that was given to control */

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 3304d54..e9159ef 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -556,10 +556,10 @@ void CMainFrame::OnMeasureItem(int nIDCtl,
        BOOL setflag = FALSE;
        if (lpMeasureItemStruct->CtlType == ODT_MENU)
        {
-               if (IsMenu((HMENU)lpMeasureItemStruct->itemID))
+               if (IsMenu(reinterpret_cast<HMENU>(static_cast<uintptr_t>(lpMeasureItemStruct->itemID))))
                {
                        CMenu* cmenu =
-                               CMenu::FromHandle((HMENU)lpMeasureItemStruct->itemID);
+                               CMenu::FromHandle(reinterpret_cast<HMENU>(static_cast<uintptr_t>(lpMeasureItemStruct->itemID)));
 
                        if (m_pMenus[MENU_DEFAULT]->IsMenu(cmenu))
                        {

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 4852c1c..d6d2d5b 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -3289,12 +3289,12 @@ void CMergeEditView::OnOpenFile()
        String sFileName = pDoc->m_filePaths[m_nThisPane];
        if (sFileName.empty())
                return;
-       int rtn = (int)ShellExecute(::GetDesktopWindow(), _T("edit"), sFileName.c_str(),
+       HINSTANCE rtn = ShellExecute(::GetDesktopWindow(), _T("edit"), sFileName.c_str(),
                        0, 0, SW_SHOWNORMAL);
-       if (rtn==SE_ERR_NOASSOC)
-               rtn = (int)ShellExecute(::GetDesktopWindow(), _T("open"), sFileName.c_str(),
+       if (reinterpret_cast<uintptr_t>(rtn) == SE_ERR_NOASSOC)
+               rtn = ShellExecute(::GetDesktopWindow(), _T("open"), sFileName.c_str(),
                         0, 0, SW_SHOWNORMAL);
-       if (rtn==SE_ERR_NOASSOC)
+       if (reinterpret_cast<uintptr_t>(rtn) == SE_ERR_NOASSOC)
                OnOpenFileWith();
 }