if (!m_bRecursive)
cnt += m_pDirView->AddSpecialItems();
+ int alldiffs=0;
POSITION diffpos = m_pCtxt->GetFirstDiffPosition();
while (diffpos)
{
POSITION curdiffpos = diffpos;
DIFFITEM di = m_pCtxt->GetNextDiffPosition(diffpos);
+ if (!di.isResultSame())
+ ++alldiffs;
LPCTSTR p=GetItemPathIfShowable(m_pCtxt, di, llen, rlen);
cnt++;
}
}
+ theApp.SetLastCompareResult(alldiffs);
m_pDirView->SortColumnsAppropriately();
m_pDirView->SetRedraw(TRUE);
}
, m_pDiffTemplate(0)
, m_pDirTemplate(0)
, m_lang(IDR_MAINFRAME, IDR_MAINFRAME)
+// FileFilterHelper m_globalFileFilter
+, m_mainThreadScripts(NULL)
+, m_nLastCompareResult(0)
{
// TODO: add construction code here,
// Place all significant initialization in InitInstance
int CMergeApp::ExitInstance()
{
delete m_mainThreadScripts;
- return CWinApp::ExitInstance();
+ CWinApp::ExitInstance();
+ return m_nLastCompareResult;
}
FileFilterHelper m_globalFileFilter;
CMergeApp();
+
+public:
void SetNeedIdleTimer();
+ void SetLastCompareResult(int nResult) { m_nLastCompareResult = nResult; }
// Implementation
protected:
DECLARE_MESSAGE_MAP()
private:
CAssureScriptsForThread * m_mainThreadScripts;
+ int m_nLastCompareResult;
};
extern CMergeApp theApp;
m_bRightEditAfterRescan = FALSE;
}
+ theApp.SetLastCompareResult(bIdentical ? 0 : 1);
+
m_leftRescanFileInfo.Update(m_filePaths.GetLeft());
m_rightRescanFileInfo.Update(m_filePaths.GetRight());
+2005-06-02 Perry
+ PATCH: [ 1213161 ] Set return code based on last diff result
+ Src: DirDoc.cpp Merge.cpp Merge.h MergeDoc.cpp
+
2005-06-01 Perry
Add commenting & array bounds checking to CMergeApp::LoadProjectFile
Src: Merge.cpp