Fixed x64 build of TortoiseProc crashed due to received unexpected messages.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / LogDlg.cpp

diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index 3525e9a..cc09e5e 100644 (file)
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -210,7 +210,7 @@ BOOL CLogDlg::OnInitDialog()
        m_LogList.DeleteAllItems();\r
        m_LogList.InsertGitColumn();\r
 \r
-       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r
+       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ (SVNSLC_POPCOMMIT|SVNSLC_POPREVERT)),false);\r
 \r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
 \r
@@ -341,7 +341,7 @@ BOOL CLogDlg::OnInitDialog()
        return FALSE;\r
 }\r
 \r
-LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam)\r
+LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)\r
 {\r
        int cur=(int)wParam;\r
 \r
@@ -352,14 +352,6 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam)
 \r
                this->m_LogList.ShowText(temp, true);\r
 \r
-               // change the text of the close button to "Cancel" since now the thread\r
-               // is running, and simply closing the dialog doesn't work.\r
-               if (!GetDlgItem(IDOK)->IsWindowVisible())\r
-               {\r
-                       temp.LoadString(IDS_MSGBOX_CANCEL);\r
-                       SetDlgItemText(IDCANCEL, temp);\r
-               }\r
-\r
                // We use a progress bar while getting the logs \r
                m_LogProgress.SetRange32(0, 100);\r
                m_LogProgress.SetPos(0);\r
@@ -601,7 +593,7 @@ void CLogDlg::OnBnClickedRefresh()
        Refresh (true);\r
 }\r
 \r
-void CLogDlg::Refresh (bool autoGoOnline)\r
+void CLogDlg::Refresh (bool /*autoGoOnline*/)\r
 {\r
        m_LogList.Refresh();\r
 }\r
@@ -668,7 +660,7 @@ CString CLogDlg::MakeShortMessage(const CString& message)
        return sShortMessage;\r
 }\r
 \r
-BOOL CLogDlg::Log(git_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths,  int filechanges, BOOL copies, DWORD actions, BOOL haschildren)\r
+BOOL CLogDlg::Log(git_revnum_t /*rev*/, const CString& /*author*/, const CString& /*date*/, const CString& /*message*/, LogChangedPathArray * /*cpaths*/,  int /*filechanges*/, BOOL /*copies*/, DWORD /*actions*/, BOOL /*haschildren*/)\r
 {\r
 #if 0\r
        if (rev == SVN_INVALID_REVNUM)\r
@@ -829,7 +821,7 @@ void CLogDlg::CopyChangedSelectionToClipBoard()
 #endif\r
 }\r
 \r
-BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev)\r
+BOOL CLogDlg::IsDiffPossible(LogChangedPath * /*changedpath*/, git_revnum_t rev)\r
 {\r
 #if 0\r
        CString added, deleted;\r
@@ -1409,7 +1401,7 @@ void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool b
        EnableOKButton();\r
 }\r
 \r
-BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)\r
+BOOL CLogDlg::Open(bool /*bOpenWith*/,CString changedpath, git_revnum_t rev)\r
 {\r
 #if 0\r
        DialogEnableWindow(IDOK, FALSE);\r
@@ -1479,7 +1471,7 @@ BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)
        return TRUE;\r
 }\r
 \r
-void CLogDlg::EditAuthor(const CLogDataVector& logs)\r
+void CLogDlg::EditAuthor(const CLogDataVector& /*logs*/)\r
 {\r
 #if 0\r
        CString url;\r
@@ -1558,7 +1550,7 @@ void CLogDlg::EditAuthor(const CLogDataVector& logs)
 #endif\r
 }\r
 \r
-void CLogDlg::EditLogMessage(int index)\r
+void CLogDlg::EditLogMessage(int /*index*/)\r
 {\r
 #if 0\r
        CString url;\r
@@ -2357,7 +2349,7 @@ void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
 \r
 \r
 \r
-CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)\r
+CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)\r
 {\r
        CTGitPathList pathList;\r
 #if 0\r
@@ -2401,7 +2393,7 @@ CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths
        return pathList;\r
 }\r
 \r
-void CLogDlg::SortByColumn(int nSortColumn, bool bAscending)\r
+void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)\r
 {\r
 #if 0\r
        switch(nSortColumn)\r
@@ -2514,7 +2506,7 @@ void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
                pHeader->SetItem(nColumn, &HeaderItem);\r
        }\r
 }\r
-void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)\r
+void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/)\r
 {\r
 #if 0\r
        if (this->IsThreadRunning())\r
@@ -2536,7 +2528,7 @@ void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
 int CLogDlg::m_nSortColumnPathList = 0;\r
 bool CLogDlg::m_bAscendingPathList = false;\r
 \r
-int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)\r
+int CLogDlg::SortCompare(const void * /*pElem1*/, const void * /*pElem2*/)\r
 {\r
 #if 0\r
        LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);\r