OSDN Git Service

Binary Compare: Fix the problem that the file cannot be saved after creating a new one
[winmerge-jp/winmerge-jp.git] / Src / HexMergeDoc.cpp
index f6363d0..824a81e 100644 (file)
@@ -2,21 +2,7 @@
 //    WinMerge:  an interactive diff/merge utility
 //    Copyright (C) 1997-2000  Thingamahoochie Software
 //    Author: Dean Grimm
-//
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
+//    SPDX-License-Identifier: GPL-2.0-or-later
 /////////////////////////////////////////////////////////////////////////////
 /** 
  * @file  HexMergeDoc.cpp
@@ -73,8 +59,8 @@ static void UpdateDiffItem(int nBuffers, DIFFITEM &di, CDiffContext *pCtxt)
        // Clear flags
        di.diffcode.diffcode &= ~(DIFFCODE::TEXTFLAGS | DIFFCODE::COMPAREFLAGS | DIFFCODE::COMPAREFLAGS3WAY);
        // Really compare
-       FolderCmp folderCmp;
-       di.diffcode.diffcode |= folderCmp.prepAndCompareFiles(pCtxt, di);
+       FolderCmp folderCmp(pCtxt);
+       di.diffcode.diffcode |= folderCmp.prepAndCompareFiles(di);
 }
 
 /**
@@ -112,7 +98,8 @@ BEGIN_MESSAGE_MAP(CHexMergeDoc, CDocument)
        ON_COMMAND(ID_VIEW_ZOOMOUT, OnViewZoomOut)
        ON_COMMAND(ID_VIEW_ZOOMNORMAL, OnViewZoomNormal)
        ON_COMMAND(ID_REFRESH, OnRefresh)
-       ON_COMMAND(ID_MERGE_COMPARE_TEXT, OnFileRecompareAsText)
+       ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_IMAGE, OnFileRecompareAs)
+       ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_IMAGE, OnUpdateFileRecompareAs)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -123,12 +110,12 @@ END_MESSAGE_MAP()
  * @brief Constructor.
  */
 CHexMergeDoc::CHexMergeDoc()
-: m_pDirDoc(NULL)
+: m_pDirDoc(nullptr)
+, m_nBuffers(m_nBuffersTemp)
+, m_pView{}
+, m_nBufferType{BUFFERTYPE::NORMAL, BUFFERTYPE::NORMAL, BUFFERTYPE::NORMAL}
 {
-       m_nBuffers = m_nBuffersTemp;
        m_filePaths.SetSize(m_nBuffers);
-       std::fill_n(m_pView, m_nBuffers, static_cast<CHexMergeView *>(NULL));
-       std::fill_n(m_nBufferType, m_nBuffers, BUFFER_NORMAL);
 }
 
 /**
@@ -138,7 +125,7 @@ CHexMergeDoc::CHexMergeDoc()
  */
 CHexMergeDoc::~CHexMergeDoc()
 {      
-       if (m_pDirDoc)
+       if (m_pDirDoc != nullptr)
                m_pDirDoc->MergeDocClosing(this);
 }
 
@@ -149,7 +136,7 @@ CHexMergeView * CHexMergeDoc::GetActiveMergeView() const
 {
        CView * pActiveView = GetParentFrame()->GetActiveView();
        CHexMergeView * pHexMergeView = dynamic_cast<CHexMergeView *>(pActiveView);
-       if (!pHexMergeView)
+       if (pHexMergeView == nullptr)
                pHexMergeView = m_pView[0]; // default to left view (in case some location or detail view active)
        return pHexMergeView;
 }
@@ -160,23 +147,23 @@ CHexMergeView * CHexMergeDoc::GetActiveMergeView() const
 int CHexMergeDoc::UpdateDiffItem(CDirDoc *pDirDoc)
 {
        // If directory compare has results
-       if (pDirDoc && pDirDoc->HasDiffs())
+       if (pDirDoc != nullptr && pDirDoc->HasDiffs())
        {
                CDiffContext &ctxt = pDirDoc->GetDiffContext();
-               if (UINT_PTR pos = FindItemFromPaths(ctxt, m_filePaths))
+               if (DIFFITEM *pos = FindItemFromPaths(ctxt, m_filePaths))
                {
                        DIFFITEM &di = ctxt.GetDiffRefAt(pos);
                        ::UpdateDiffItem(m_nBuffers, di, &ctxt);
                }
        }
-       BOOL bDiff = FALSE;
+       bool bDiff = false;
        int lengthFirst = m_pView[0]->GetLength();
        void *bufferFirst = m_pView[0]->GetBuffer(lengthFirst);
        for (int nBuffer = 1; nBuffer < m_nBuffers; nBuffer++)
        {
                int length = m_pView[nBuffer]->GetLength();
                if (lengthFirst != length)
-                       bDiff = TRUE;
+                       bDiff = true;
                else
                {
                        void *buffer = m_pView[nBuffer]->GetBuffer(length);
@@ -192,29 +179,29 @@ int CHexMergeDoc::UpdateDiffItem(CDirDoc *pDirDoc)
 /**
  * @brief Asks and then saves modified files
  */
-BOOL CHexMergeDoc::PromptAndSaveIfNeeded(BOOL bAllowCancel)
+bool CHexMergeDoc::PromptAndSaveIfNeeded(bool bAllowCancel)
 {
        bool bLModified = false, bMModified = false, bRModified = false;
 
        if (m_nBuffers == 3)
        {
-               bLModified = !!m_pView[0]->GetModified();
-               bMModified = !!m_pView[1]->GetModified();
-               bRModified = !!m_pView[2]->GetModified();
+               bLModified = m_pView[0]->GetModified();
+               bMModified = m_pView[1]->GetModified();
+               bRModified = m_pView[2]->GetModified();
        }
        else
        {
-               bLModified = !!m_pView[0]->GetModified();
-               bRModified = !!m_pView[1]->GetModified();
+               bLModified = m_pView[0]->GetModified();
+               bRModified = m_pView[1]->GetModified();
        }
        if (!bLModified && !bMModified && !bRModified)
-                return TRUE;
+                return true;
 
        const String &pathLeft = m_filePaths.GetLeft();
        const String &pathMiddle = m_filePaths.GetMiddle();
        const String &pathRight = m_filePaths.GetRight();
 
-       BOOL result = TRUE;
+       bool result = true;
        bool bLSaveSuccess = false, bMSaveSuccess = false, bRSaveSuccess = false;
 
        SaveClosingDlg dlg;
@@ -243,15 +230,9 @@ BOOL CHexMergeDoc::PromptAndSaveIfNeeded(BOOL bAllowCancel)
                {
                        if (dlg.m_leftSave == SaveClosingDlg::SAVECLOSING_SAVE)
                        {
-                               switch (Try(m_pView[0]->SaveFile(pathLeft.c_str())))
-                               {
-                               case 0:
-                                       bLSaveSuccess = TRUE;
-                                       break;
-                               case IDCANCEL:
-                                       result = FALSE;
-                                       break;
-                               }
+                               bLSaveSuccess = DoFileSave(0);
+                               if (!bLSaveSuccess)
+                                       result = false;
                        }
                        else
                        {
@@ -262,15 +243,9 @@ BOOL CHexMergeDoc::PromptAndSaveIfNeeded(BOOL bAllowCancel)
                {
                        if (dlg.m_middleSave == SaveClosingDlg::SAVECLOSING_SAVE)
                        {
-                               switch (Try(m_pView[1]->SaveFile(pathMiddle.c_str())))
-                               {
-                               case 0:
-                                       bMSaveSuccess = TRUE;
-                                       break;
-                               case IDCANCEL:
-                                       result = FALSE;
-                                       break;
-                               }
+                               bMSaveSuccess = DoFileSave(1);
+                               if (!bMSaveSuccess)
+                                       result = false;
                        }
                        else
                        {
@@ -281,15 +256,9 @@ BOOL CHexMergeDoc::PromptAndSaveIfNeeded(BOOL bAllowCancel)
                {
                        if (dlg.m_rightSave == SaveClosingDlg::SAVECLOSING_SAVE)
                        {
-                               switch (Try(m_pView[m_nBuffers - 1]->SaveFile(pathRight.c_str())))
-                               {
-                               case 0:
-                                       bRSaveSuccess = TRUE;
-                                       break;
-                               case IDCANCEL:
-                                       result = FALSE;
-                                       break;
-                               }
+                               bRSaveSuccess = DoFileSave(m_nBuffers - 1);
+                               if (!bRSaveSuccess)
+                                       result = false;
                        }
                        else
                        {
@@ -299,7 +268,7 @@ BOOL CHexMergeDoc::PromptAndSaveIfNeeded(BOOL bAllowCancel)
        }
        else
        {       
-               result = FALSE;
+               result = false;
        }
 
        // If file were modified and saving was successfull,
@@ -317,7 +286,7 @@ BOOL CHexMergeDoc::PromptAndSaveIfNeeded(BOOL bAllowCancel)
  */
 BOOL CHexMergeDoc::SaveModified()
 {
-       return PromptAndSaveIfNeeded(TRUE);
+       return PromptAndSaveIfNeeded(true);
 }
 
 /**
@@ -329,23 +298,30 @@ void CHexMergeDoc::OnFileSave()
                DoFileSave(nBuffer);
 }
 
-void CHexMergeDoc::DoFileSave(int nBuffer)
+bool CHexMergeDoc::DoFileSave(int nBuffer)
 {
+       bool result = false;
        if (m_pView[nBuffer]->GetModified())
        {
-               if (m_nBufferType[nBuffer] == BUFFER_UNNAMED)
-                       DoFileSaveAs(nBuffer);
+               if (m_nBufferType[nBuffer] == BUFFERTYPE::UNNAMED)
+                       result = DoFileSaveAs(nBuffer);
                else
                {
                        const String &path = m_filePaths.GetPath(nBuffer);
-                       if (Try(m_pView[nBuffer]->SaveFile(path.c_str())) == IDCANCEL)
-                               return;
+                       HRESULT hr = m_pView[nBuffer]->SaveFile(path.c_str());
+                       if (Try(hr) == IDCANCEL)
+                               return false;
+                       if (FAILED(hr))
+                               return DoFileSaveAs(nBuffer);
+                       result = true;
+                       if (result)
+                               UpdateDiffItem(m_pDirDoc);
                }
-               UpdateDiffItem(m_pDirDoc);
        }
+       return result;
 }
 
-void CHexMergeDoc::DoFileSaveAs(int nBuffer)
+bool CHexMergeDoc::DoFileSaveAs(int nBuffer, bool packing)
 {
        const String &path = m_filePaths.GetPath(nBuffer);
        String strPath;
@@ -356,21 +332,26 @@ void CHexMergeDoc::DoFileSaveAs(int nBuffer)
                title = _("Save Right File As");
        else
                title = _("Save Middle File As");
-       if (SelectFile(AfxGetMainWnd()->GetSafeHwnd(), strPath, FALSE, path.c_str(), title))
+       if (SelectFile(AfxGetMainWnd()->GetSafeHwnd(), strPath, false, path.c_str(), title))
        {
-               if (Try(m_pView[nBuffer]->SaveFile(strPath.c_str())) == IDCANCEL)
-                       return;
+               HRESULT hr = m_pView[nBuffer]->SaveFile(strPath.c_str());
+               if (Try(hr) == IDCANCEL)
+                       return false;
+               if (FAILED(hr))
+                       return false;
                if (path.empty())
                {
                        // We are saving scratchpad (unnamed file)
-                       m_nBufferType[nBuffer] = BUFFER_UNNAMED_SAVED;
+                       m_nBufferType[nBuffer] = BUFFERTYPE::UNNAMED_SAVED;
                        m_strDesc[nBuffer].erase();
                }
 
                m_filePaths.SetPath(nBuffer, strPath);
                UpdateDiffItem(m_pDirDoc);
                UpdateHeaderPath(nBuffer);
+               return true;
        }
+       return false;
 }
 
 /**
@@ -435,7 +416,7 @@ void CHexMergeDoc::OnUpdateStatusNum(CCmdUI* pCmdUI)
  */
 void CHexMergeDoc::SetDirDoc(CDirDoc * pDirDoc)
 {
-       ASSERT(pDirDoc && !m_pDirDoc);
+       ASSERT(pDirDoc != nullptr && m_pDirDoc == nullptr);
        m_pDirDoc = pDirDoc;
 }
 
@@ -453,7 +434,7 @@ CHexMergeFrame * CHexMergeDoc::GetParentFrame() const
 void CHexMergeDoc::DirDocClosing(CDirDoc * pDirDoc)
 {
        ASSERT(m_pDirDoc == pDirDoc);
-       m_pDirDoc = 0;
+       m_pDirDoc = nullptr;
 }
 
 /**
@@ -462,7 +443,7 @@ void CHexMergeDoc::DirDocClosing(CDirDoc * pDirDoc)
 bool CHexMergeDoc::CloseNow()
 {
        // Allow user to cancel closing
-       if (!PromptAndSaveIfNeeded(TRUE))
+       if (!PromptAndSaveIfNeeded(true))
                return false;
 
        GetParentFrame()->CloseNow();
@@ -472,7 +453,7 @@ bool CHexMergeDoc::CloseNow()
 /**
 * @brief Load one file
 */
-HRESULT CHexMergeDoc::LoadOneFile(int index, LPCTSTR filename, BOOL readOnly, const String& strDesc)
+HRESULT CHexMergeDoc::LoadOneFile(int index, LPCTSTR filename, bool readOnly, const String& strDesc)
 {
        if (filename[0])
        {
@@ -480,16 +461,16 @@ HRESULT CHexMergeDoc::LoadOneFile(int index, LPCTSTR filename, BOOL readOnly, co
                        return E_FAIL;
                m_pView[index]->SetReadOnly(readOnly);
                m_filePaths.SetPath(index, filename);
-               ASSERT(m_nBufferType[index] == BUFFER_NORMAL); // should have been initialized to BUFFER_NORMAL in constructor
+               ASSERT(m_nBufferType[index] == BUFFERTYPE::NORMAL); // should have been initialized to BUFFERTYPE::NORMAL in constructor
                if (!strDesc.empty())
                {
                        m_strDesc[index] = strDesc;
-                       m_nBufferType[index] = BUFFER_NORMAL_NAMED;
+                       m_nBufferType[index] = BUFFERTYPE::NORMAL_NAMED;
                }
        }
        else
        {
-               m_nBufferType[index] = BUFFER_UNNAMED;
+               m_nBufferType[index] = BUFFERTYPE::UNNAMED;
                m_strDesc[index] = strDesc;
        }
        UpdateHeaderPath(index);
@@ -500,11 +481,12 @@ HRESULT CHexMergeDoc::LoadOneFile(int index, LPCTSTR filename, BOOL readOnly, co
 /**
  * @brief Load files and initialize frame's compare result icon
  */
-bool CHexMergeDoc::OpenDocs(int nFiles, const FileLocation fileloc[], const bool bRO[], const String strDesc[], int nPane)
+bool CHexMergeDoc::OpenDocs(int nFiles, const FileLocation fileloc[], const bool bRO[], const String strDesc[])
 {
        CHexMergeFrame *pf = GetParentFrame();
-       ASSERT(pf);
+       ASSERT(pf != nullptr);
        bool bSucceeded = true;
+       int nNormalBuffer = 0;
        int nBuffer;
        for (nBuffer = 0; nBuffer < nFiles; nBuffer++)
        {
@@ -513,6 +495,8 @@ bool CHexMergeDoc::OpenDocs(int nFiles, const FileLocation fileloc[], const bool
                        bSucceeded = false;
                        break;
                }
+               if (m_nBufferType[nBuffer] == BUFFERTYPE::NORMAL || m_nBufferType[nBuffer] == BUFFERTYPE::NORMAL_NAMED)
+                       ++nNormalBuffer;
        }
        if (nBuffer == nFiles)
        {
@@ -520,10 +504,10 @@ bool CHexMergeDoc::OpenDocs(int nFiles, const FileLocation fileloc[], const bool
                // also triggers initial diff coloring by invalidating the client area.
                m_pView[0]->ResizeWindow();
 
-               OnRefresh();
-
-               if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST))
-                       m_pView[0]->SendMessage(WM_COMMAND, ID_FIRSTDIFF);
+               if (nNormalBuffer > 0)
+                       OnRefresh();
+               else
+                       UpdateDiffItem(m_pDirDoc);
        }
        else
        {
@@ -533,11 +517,26 @@ bool CHexMergeDoc::OpenDocs(int nFiles, const FileLocation fileloc[], const bool
        return bSucceeded;
 }
 
+void CHexMergeDoc::MoveOnLoad(int nPane, int)
+{
+       if (nPane < 0)
+       {
+               nPane = GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE);
+               if (nPane < 0 || nPane >= m_nBuffers)
+                       nPane = 0;
+       }
+
+       GetParentFrame()->SetActivePane(nPane);
+
+       if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST))
+               m_pView[0]->SendMessage(WM_COMMAND, ID_FIRSTDIFF);
+}
+
 void CHexMergeDoc::CheckFileChanged(void)
 {
        for (int pane = 0; pane < m_nBuffers; ++pane)
        {
-               if (m_pView[pane]->IsFileChangedOnDisk(m_filePaths[pane].c_str()))
+               if (m_pView[pane]->IsFileChangedOnDisk(m_filePaths[pane].c_str()) == FileChange::Changed)
                {
                        String msg = strutils::format_string1(_("Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"), m_filePaths[pane]);
                        if (AfxMessageBox(msg.c_str(), MB_YESNO | MB_ICONWARNING) == IDYES)
@@ -556,25 +555,25 @@ void CHexMergeDoc::CheckFileChanged(void)
 void CHexMergeDoc::UpdateHeaderPath(int pane)
 {
        CHexMergeFrame *pf = GetParentFrame();
-       ASSERT(pf);
+       ASSERT(pf != nullptr);
        String sText;
 
-       if (m_nBufferType[pane] == BUFFER_UNNAMED ||
-               m_nBufferType[pane] == BUFFER_NORMAL_NAMED)
+       if (m_nBufferType[pane] == BUFFERTYPE::UNNAMED ||
+               m_nBufferType[pane] == BUFFERTYPE::NORMAL_NAMED)
        {
                sText = m_strDesc[pane];
        }
        else
        {
                sText = m_filePaths.GetPath(pane);
-               if (m_pDirDoc)
+               if (m_pDirDoc != nullptr)
                        m_pDirDoc->ApplyDisplayRoot(pane, sText);
        }
        if (m_pView[pane]->GetModified())
                sText.insert(0, _T("* "));
        pf->GetHeaderInterface()->SetText(pane, sText);
 
-       SetTitle(NULL);
+       SetTitle(nullptr);
 }
 
 
@@ -583,8 +582,8 @@ void CHexMergeDoc::UpdateHeaderPath(int pane)
  */
 static void Customize(IHexEditorWindow::Settings *settings)
 {
-       settings->bSaveIni = FALSE;
-       //settings->iAutomaticBPL = FALSE;
+       settings->bSaveIni = false;
+       //settings->iAutomaticBPL = false;
        //settings->iBytesPerLine = 16;
        //settings->iFontSize = 8;
 }
@@ -638,20 +637,7 @@ void CHexMergeDoc::RefreshOptions()
  */
 void CHexMergeDoc::SetTitle(LPCTSTR lpszTitle)
 {
-       String sTitle;
-       String sFileName[3];
-
-       if (lpszTitle)
-               sTitle = lpszTitle;
-       else
-       {
-               for (int nBuffer = 0; nBuffer < m_filePaths.GetSize(); nBuffer++)
-                       sFileName[nBuffer] = !m_strDesc[nBuffer].empty() ? m_strDesc[nBuffer] : paths::FindFileName(m_filePaths[nBuffer]);
-               if (std::count(&sFileName[0], &sFileName[0] + m_nBuffers, sFileName[0]) == m_nBuffers)
-                       sTitle = sFileName[0] + strutils::format(_T(" x %d"), m_nBuffers);
-               else
-                       sTitle = strutils::join(&sFileName[0], &sFileName[0] + m_nBuffers, _T(" - "));
-       }
+       String sTitle = (lpszTitle != nullptr) ? lpszTitle : CMergeFrameCommon::GetTitleString(m_filePaths, m_strDesc);
        CDocument::SetTitle(sTitle.c_str());
 }
 
@@ -663,7 +649,7 @@ void CHexMergeDoc::SetMergeViews(CHexMergeView *pView[])
 {
        for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
        {
-               ASSERT(pView[nBuffer] && !m_pView[nBuffer]);
+               ASSERT(pView[nBuffer] != nullptr && m_pView[nBuffer] == nullptr);
                m_pView[nBuffer] = pView[nBuffer];
                m_pView[nBuffer]->m_nThisPane = nBuffer;
        }
@@ -698,7 +684,7 @@ void CHexMergeDoc::OnUpdateFileSaveRight(CCmdUI* pCmdUI)
  */
 void CHexMergeDoc::OnUpdateFileSave(CCmdUI* pCmdUI)
 {
-       BOOL bModified = FALSE;
+       bool bModified = false;
        for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
                bModified |= m_pView[nBuffer]->GetModified();
        pCmdUI->Enable(bModified);
@@ -717,10 +703,11 @@ void CHexMergeDoc::OnFileReload()
        for (int pane = 0; pane < m_nBuffers; pane++)
        {
                fileloc[pane].setPath(m_filePaths[pane]);
-               bRO[pane] = !!m_pView[pane]->GetReadOnly();
+               bRO[pane] = m_pView[pane]->GetReadOnly();
        }
-       int nActivePane = GetActiveMergeView()->m_nThisPane;
-       OpenDocs(m_nBuffers, fileloc, bRO, m_strDesc, nActivePane);
+       if (!OpenDocs(m_nBuffers, fileloc, bRO, m_strDesc))
+               return;
+       MoveOnLoad(GetActiveMergeView()->m_nThisPane);
 }
 
 /**
@@ -813,10 +800,13 @@ void CHexMergeDoc::OnViewZoomNormal()
 void CHexMergeDoc::OnRefresh()
 {
        if (UpdateDiffItem(m_pDirDoc) == 0)
-               LangMessageBox(IDS_FILESSAME, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN);
+       {
+               CMergeFrameCommon::ShowIdenticalMessage(m_filePaths, true,
+                       [](LPCTSTR msg, UINT flags, UINT id) -> int { return AfxMessageBox(msg, flags, id); });
+       }
 }
 
-void CHexMergeDoc::OnFileRecompareAsText()
+void CHexMergeDoc::OnFileRecompareAs(UINT nID)
 {
        FileLocation fileloc[3];
        DWORD dwFlags[3];
@@ -831,5 +821,11 @@ void CHexMergeDoc::OnFileRecompareAsText()
                strDesc[nBuffer] = m_strDesc[nBuffer];
        }
        CloseNow();
-       GetMainFrame()->ShowMergeDoc(pDirDoc, nBuffers, fileloc, dwFlags, strDesc);
+       GetMainFrame()->ShowMergeDoc(nID, pDirDoc, nBuffers, fileloc, dwFlags, strDesc);
+}
+
+void CHexMergeDoc::OnUpdateFileRecompareAs(CCmdUI* pCmdUI)
+{
+       pCmdUI->Enable(pCmdUI->m_nID != ID_MERGE_COMPARE_XML);
 }
+