|
From: <ki...@us...> - 2006-11-07 17:14:00
|
Revision: 3785
http://svn.sourceforge.net/winmerge/?rev=3785&view=rev
Author: kimmov
Date: 2006-11-07 09:13:32 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileFilterMgr.cpp
trunk/Src/FileFilterMgr.h
trunk/Src/Merge.dsp
trunk/Src/Plugins.cpp
Added Paths:
-----------
trunk/Src/Ucs2Utf8.cpp
trunk/Src/Ucs2Utf8.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/Changes.txt 2006-11-07 17:13:32 UTC (rev 3785)
@@ -5,6 +5,9 @@
2006-11-07 Kimmo
Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
New folder: /Externals/pcre
+ PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
+ Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
+ Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
2006-11-06 Takashi
PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/FileFilterMgr.cpp 2006-11-07 17:13:32 UTC (rev 3785)
@@ -3,9 +3,17 @@
// see FileFilterMgr.h for description
/////////////////////////////////////////////////////////////////////////////
// License (GPLv2+):
-// 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.
+// 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.
/////////////////////////////////////////////////////////////////////////////
/**
* @file FileFilterMgr.cpp
@@ -16,10 +24,12 @@
// $Id$
#include "stdafx.h"
+#include <string.h>
+#include "pcre.h"
#include "FileFilterMgr.h"
-#include "RegExp.h"
#include "UniFile.h"
#include "coretools.h"
+#include "Ucs2Utf8.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -37,7 +47,8 @@
while (!filterList.IsEmpty())
{
FileFilterElement &elem = filterList.GetHead();
- delete elem.pRegExp;
+ pcre_free(elem.pRegExp);
+ pcre_free(elem.pRegExpExtra);
filterList.RemoveHead();
}
}
@@ -177,18 +188,37 @@
if (str.IsEmpty())
return;
- CRegExp * regexp = new CRegExp;
+ const char * errormsg = NULL;
+ int erroroffset = 0;
+ char regexString[200] = {0};
+ int regexLen = 0;
+ int pcre_opts = 0;
+
+#ifdef UNICODE
+ // For unicode builds, use UTF-8.
+ // Convert pattern to UTF-8 and set option for PCRE to specify UTF-8.
+ regexLen = TransformUcs2ToUtf8((LPCTSTR)str, _tcslen(str),
+ regexString, sizeof(regexString));
+ pcre_opts |= PCRE_UTF8;
+#else
+ strcpy(regexString, (LPCTSTR)str);
+ regexLen = strlen(regexString);
+#endif
+
+ pcre *regexp = pcre_compile(regexString, pcre_opts, &errormsg,
+ &erroroffset, NULL);
if (regexp)
{
- if (regexp->RegComp(str))
- {
- FileFilterElement elem;
- elem.pRegExp = regexp;
+ FileFilterElement elem;
+ errormsg = NULL;
+
+ pcre_extra *pe = pcre_study(regexp, 0, &errormsg);
+ elem.pRegExp = regexp;
- filterList.AddTail(elem);
- }
- else
- delete regexp;
+ if (pe != NULL && errormsg != NULL)
+ elem.pRegExpExtra = pe;
+
+ filterList.AddTail(elem);
}
}
@@ -296,13 +326,31 @@
*/
BOOL TestAgainstRegList(const FileFilterList & filterList, LPCTSTR szTest)
{
- CString str = szTest;
- str.MakeUpper();
for (POSITION pos = filterList.GetHeadPosition(); pos; )
{
const FileFilterElement & elem = filterList.GetNext(pos);
- CRegExp * regexp = elem.pRegExp;
- if (regexp->RegFind(str) != -1)
+ int ovector[30];
+ char compString[200] = {0};
+ int stringLen = 0;
+ TCHAR * tempName = _tcsdup(szTest); // Create temp copy for conversions
+ TCHAR * cmpStr = _tcsupr(tempName);
+
+#ifdef UNICODE
+ stringLen = TransformUcs2ToUtf8(cmpStr, _tcslen(cmpStr),
+ compString, sizeof(compString));
+#else
+ strcpy(compString, cmpStr);
+ stringLen = strlen(compString);
+#endif
+
+ pcre * regexp = elem.pRegExp;
+ pcre_extra * extra = elem.pRegExpExtra;
+ int result = pcre_exec(regexp, extra, compString, stringLen,
+ 0, 0, ovector, 30);
+
+ free(tempName);
+
+ if (result >= 0)
return TRUE;
}
return FALSE;
Modified: trunk/Src/FileFilterMgr.h
===================================================================
--- trunk/Src/FileFilterMgr.h 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/FileFilterMgr.h 2006-11-07 17:13:32 UTC (rev 3785)
@@ -1,14 +1,16 @@
/////////////////////////////////////////////////////////////////////////////
-// FileFilterMgr.h : declaration file
-//
-// The FileFilterMgr loads a collection of named file filters from disk,
-// and provides lookup access by name, or array access by index, to these
-// named filters. It also provides test functions for actually using the filters.
-/////////////////////////////////////////////////////////////////////////////
// License (GPLv2+):
-// 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.
+// 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.
/////////////////////////////////////////////////////////////////////////////
/**
* @file FileFilterMgr.h
@@ -25,8 +27,8 @@
#ifndef __AFXTEMPL_H__
#include <afxtempl.h>
#endif
+#include "pcre.h"
-class CRegExp;
struct FileFilterElement;
/**
* @brief List of file filtering rules.
@@ -52,12 +54,16 @@
* regular expression there is boolean value for defining if rule
* is inclusive or exclusive. File filters have global inclusive/exclusive
* selection but this per-rule setting overwrites it.
+ *
+ * We are using PCRE for regular expressions and pRegExp points to compiled
+ * regular expression. pRegExpExtra contains additional information about
+ * the expression used to optimize matching.
*/
struct FileFilterElement
{
- CRegExp *pRegExp; /**< Pointer to regexp */
- CString sRule; /**< Uncompiled rule text */
- FileFilterElement() : pRegExp(NULL) { };
+ pcre *pRegExp; /**< Compiled regular expression */
+ pcre_extra *pRegExpExtra; /**< Additional information got from regex study */
+ FileFilterElement() : pRegExp(NULL), pRegExpExtra(NULL) { };
};
struct FileFilter;
@@ -67,7 +73,12 @@
*
* The FileFilterMgr loads a collection of named file filters from disk,
* and provides lookup access by name, or array access by index, to these
- * named filters. It also provides test functions for actually using the filters.
+ * named filters. It also provides test functions for actually using the
+ * filters.
+ *
+ * We are using PCRE for regular expressions. Nice thing in PCRE is it supports
+ * UTF-8 unicode, unlike many other libs. For ANSI builds we use just ansi
+ * strings, and for unicode we must first convert strings to UTF-8.
*/
class FileFilterMgr
{
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/Merge.dsp 2006-11-07 17:13:32 UTC (rev 3785)
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /I "..\Externals\pcre\pcre-6.7" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept /libpath:"..\Build\expat"
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept /libpath:"..\Build\expat" /libpath:"..\Build\pcre"
!ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
@@ -72,7 +72,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "..\common" /I ".\editlib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FR /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /I "..\Externals\pcre\pcre-6.7" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FR /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMerge.exe" /pdbtype:sept
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept /libpath:"..\Build\expat"
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib pcre.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept /libpath:"..\Build\expat" /libpath:"..\Build\pcre"
!ELSEIF "$(CFG)" == "Merge - Win32 Release"
@@ -99,7 +99,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /I "..\Externals\pcre\pcre-6.7" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -110,7 +110,7 @@
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /libpath:"..\Build\expat" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /libpath:"..\Build\expat" /libpath:"..\Build\pcre" /verbose:lib
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -128,7 +128,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /I "..\Externals\pcre\pcre-6.7" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -139,7 +139,7 @@
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /verbose:lib
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /libpath:"..\Build\expat" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib pcre.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /libpath:"..\Build\expat" /libpath:"..\Build\pcre" /verbose:lib
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -872,6 +872,10 @@
# End Source File
# Begin Source File
+SOURCE=.\Ucs2Utf8.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\unicoder.cpp
# End Source File
# Begin Source File
@@ -1465,6 +1469,10 @@
# End Source File
# Begin Source File
+SOURCE=.\Ucs2Utf8.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\unicoder.h
# End Source File
# Begin Source File
Modified: trunk/Src/Plugins.cpp
===================================================================
--- trunk/Src/Plugins.cpp 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/Plugins.cpp 2006-11-07 17:13:32 UTC (rev 3785)
@@ -31,12 +31,14 @@
#include <afxmt.h>
#endif
+#include "pcre.h"
+#include "Ucs2Utf8.h"
#include "FileTransform.h"
#include "FileFilterMgr.h"
#include "Plugins.h"
#include "lwdisp.h"
#include "coretools.h"
-#include "RegExp.h"
+//#include "RegExp.h"
#include "resource.h"
#include "Exceptions.h"
#include "RegKey.h"
@@ -280,16 +282,38 @@
sPiece.TrimLeft();
sPiece.MakeUpper();
- CRegExp * regexp = new CRegExp;
+// CRegExp * regexp = new CRegExp;
FileFilterElement element;
- if (regexp->RegComp(sPiece))
+/* if (regexp->RegComp(sPiece))
{
element.pRegExp = regexp;
filters->AddTail(element);
}
else
delete regexp;
+*/
+ const char * errormsg = NULL;
+ //char errormsg[200] = {0};
+ int erroroffset = 0;
+ char regexString[200] = {0};
+ int regexLen = 0;
+#ifdef UNICODE
+ regexLen = TransformUcs2ToUtf8((LPCTSTR)sPiece, _tcslen(sPiece),
+ regexString, sizeof(regexString));
+#else
+ strcpy(regexString, (LPCTSTR)sPiece);
+ regexLen = strlen(regexString);
+#endif
+
+ pcre *regexp = pcre_compile(regexString, 0, &errormsg, &erroroffset, NULL);
+ if (regexp)
+ {
+ FileFilterElement elem;
+ elem.pRegExp = regexp;
+ filters->AddTail(elem);
+ }
+
};
}
Added: trunk/Src/Ucs2Utf8.cpp
===================================================================
--- trunk/Src/Ucs2Utf8.cpp (rev 0)
+++ trunk/Src/Ucs2Utf8.cpp 2006-11-07 17:13:32 UTC (rev 3785)
@@ -0,0 +1,93 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// 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.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file Ucs2Utf8.cpp
+ *
+ * @brief UCS-2 <--> UTF-8 conversion routines implementation.
+ */
+
+#include "stdafx.h"
+#include "unicoder.h"
+#include "Ucs2Utf8.h"
+
+/**
+ * @brief Copy UCS-2LE string to UTF-8 string
+ *
+ * @param nUcs is the size in wide characters of the source string
+ * @param nUtf is the size in bytes of the resulting string
+ *
+ * @return if nUtf = 0, return the size required for the translation buffer
+ */
+UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf)
+{
+ if (nUtf == 0)
+ // just tell required length
+ return ucr::Utf8len_of_string(psUcs, nUcs);
+
+ // the buffer is allocated, output in it directly
+ unsigned char * pc = (unsigned char *) pcsUtf;
+ int nremains = nUtf;
+
+ // quick way
+ UINT i=0;
+ for (i = 0 ; i < nUcs && nremains > 10; ++i)
+ nremains -= ucr::to_utf8_advance(psUcs[i], pc);
+
+ // be careful for the end of the buffer, risk of overflow because
+ // of the variable length of the UTF-8 character
+ unsigned char smallTempBuffer[20];
+ int nremainsend = nremains;
+ unsigned char * pcTemp = (unsigned char *) smallTempBuffer;
+ for ( ; i < nUcs && nremainsend > 0; ++i)
+ nremainsend -= ucr::to_utf8_advance(psUcs[i], pcTemp);
+
+ int ncomplement = min(nremains, pcTemp-smallTempBuffer);
+ CopyMemory(pc, smallTempBuffer, ncomplement);
+ nremains -= ncomplement;
+
+ // return number of written bytes
+ return (nUtf - nremains);
+}
+
+/**
+ * @brief Copy UTF-8 string to UCS-2LE string
+ *
+ * @return if nUcs = 0, return the size required for the translation buffer
+ */
+UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs)
+{
+ if (nUcs == 0)
+ // just tell required length
+ return ucr::stringlen_of_utf8(pcsUtf, nUtf);
+
+ // the buffer is allocated, output in it directly
+ unsigned char * pUtf = (unsigned char * ) pcsUtf;
+ LPWSTR pwc = psUcs;
+ int nremains = nUcs;
+
+ for (UINT i = 0 ; i < nUtf && nremains > 0; )
+ {
+ *pwc++ = ucr::GetUtf8Char(pUtf+i);
+ nremains --;
+ int chlen = ucr::Utf8len_fromLeadByte(pUtf[i]);
+ if (chlen < 1) chlen = 1;
+ i += chlen;
+ }
+
+ // return number of written wchars
+ return (nUtf - nremains);
+}
Added: trunk/Src/Ucs2Utf8.h
===================================================================
--- trunk/Src/Ucs2Utf8.h (rev 0)
+++ trunk/Src/Ucs2Utf8.h 2006-11-07 17:13:32 UTC (rev 3785)
@@ -0,0 +1,30 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// 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.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file Ucs2Utf8.h
+ *
+ * @brief Declaration for UCS-2 <--> UTF-8 conversions functions.
+ *
+ */
+
+#ifndef _UCS2UTF8_H_
+#define _UCS2UTF8_H_
+
+UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf);
+UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs);
+
+#endif // _UCS2UTF8_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-09 15:30:36
|
Revision: 3796
http://svn.sourceforge.net/winmerge/?rev=3796&view=rev
Author: kimmov
Date: 2006-11-09 07:30:24 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1591532 ] Remove unused XmlDoc class
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
Removed Paths:
-------------
trunk/Src/XmlDoc.cpp
trunk/Src/XmlDoc.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-09 15:21:12 UTC (rev 3795)
+++ trunk/Src/Changes.txt 2006-11-09 15:30:24 UTC (rev 3796)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-09 Kimmo
+ PATCH: [ 1591532 ] Remove unused XmlDoc class
+ Src: Merge.dsp
+ Src removed files: XmlDoc.cpp XmlDoc.h
+
2006-11-07 Kimmo
Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
New folder: /Externals/pcre
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-11-09 15:21:12 UTC (rev 3795)
+++ trunk/Src/Merge.dsp 2006-11-09 15:30:24 UTC (rev 3796)
@@ -935,10 +935,6 @@
SOURCE=.\WMGotoDlg.cpp
# End Source File
-# Begin Source File
-
-SOURCE=.\XmlDoc.cpp
-# End Source File
# End Group
# Begin Group "Header Files"
@@ -1519,10 +1515,6 @@
SOURCE=.\WMGotoDlg.h
# End Source File
-# Begin Source File
-
-SOURCE=.\XmlDoc.h
-# End Source File
# End Group
# Begin Group "Resource Files"
Deleted: trunk/Src/XmlDoc.cpp
===================================================================
--- trunk/Src/XmlDoc.cpp 2006-11-09 15:21:12 UTC (rev 3795)
+++ trunk/Src/XmlDoc.cpp 2006-11-09 15:30:24 UTC (rev 3796)
@@ -1,312 +0,0 @@
-/**
- * @file XmlDoc.cpp
- *
- * @brief Implementation of the XmlDoc and XmlElement classes.
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#include "stdafx.h"
-#include "XmlDoc.h"
-#include "markdown.h"
-
-// Private types
-
-/**
- * @brief Stuff you need to load an XML file
- */
-struct XmlLoadDocData
-{
- CMarkdown::File xmlfile;
- CMarkdown::EntityMap entities;
- UINT codepage;
- XmlLoadDocData(LPCTSTR path) : xmlfile(path), codepage(-1) { }
-};
-
-/**
- * @brief element-specific stuff used in loading an XML file
- */
-struct XmlLoadElementData
-{
- CMarkdown markdown;
-
- // Have to be able to construct either from markdown of parent
- // or from markdown file (if element with no parent, ie, root)
- XmlLoadElementData(CMarkdown &md) : markdown(md) { }
- XmlLoadElementData(CMarkdown::File & file) : markdown(file) { }
-};
-
-// Private functions
-
-/**
- * @brief Convert a string into correct encoding & markdown string object
- */
-static LPCSTR
-MakeMarkdownString(const CString & str, int codepage)
-{
- return CMarkdown::String(CMarkdown::HSTR(str.AllocSysString())->Entities()->Octets(codepage)).A;
-}
-
-// Body of module
-
-XmlDoc::XmlDoc(LPCTSTR path, XML_LOADSAVE loadSave, LPCTSTR encoding)
-: m_path(path)
-, m_loadSave(loadSave)
-, m_live(0)
-// CString m_xml;
-// XmlElementList m_openElements;
-, m_load(NULL)
-, m_codepage(65001)
-{
- if (m_loadSave == XML_SAVE)
- {
- m_xml.Format(_T("<?xml version='1.0' encoding='%s'?>"), encoding);
- }
- // Loading is all done in the Begin method (2 stage construction)
-
-}
-
-/**
- * @brief Destructor, delete dynamically created load-object.
- */
-XmlDoc::~XmlDoc()
-{
- if (m_load)
- delete m_load;
-}
-
-/**
- * @brief 2nd stage construction of XmlDoc object (so can throw exception)
- */
-void
-XmlDoc::Begin()
-{
- // Saving did its (simple) initialization in the constructor
- if (m_loadSave == XML_LOAD)
- {
- ASSERT(!m_load);
- m_load = new XmlLoadDocData(m_path);
- if (m_load->xmlfile.pImage == NULL)
- {
- CFileException::ThrowOsError(GetLastError(), m_path);
- }
- m_load->entities.Load();
- // If encoding is other than UTF-8, assume CP_ACP
- CMarkdown::String encoding = CMarkdown(m_load->xmlfile).Move("?xml").GetAttribute("encoding");
- m_codepage = lstrcmpiA(encoding.A, "UTF-8") == 0 ? CP_UTF8 : CP_ACP;
- }
-}
-
-/**
- * @brief Finish xml document (needed to write out all XML, if saving)
- */
-void
-XmlDoc::End()
-{
- if (m_loadSave == XML_SAVE)
- {
- // Open file in exclusive mode to make sure there are no other readers
- // or writers to same file
- CStdioFile file;
- BOOL bSuccess = file.Open(m_path, CFile::modeCreate | CFile::modeWrite |
- CFile::shareExclusive, NULL);
- if (bSuccess)
- {
- CString xml = GetXml();
- file.SeekToEnd();
- file.WriteString(xml);
- file.Close();
- }
- else
- {
- CFileException::ThrowOsError(GetLastError(), m_path);
- }
- }
-}
-
-/**
- * @brief Add some content text to XML document
- */
-void
-XmlDoc::Append(LPCTSTR str)
-{
- m_xml += MakeMarkdownString(str, m_codepage); // UTF-8 encoding
-}
-
-/**
- * @brief Get all accumulated XML
- */
-CString
-XmlDoc::GetXml() const
-{
- // Return accumulated XML, but ensure it has trailing \n
- CString xml = m_xml;
- if (xml[xml.GetLength()-1] != '\n')
- xml += '\n';
- return xml;
-}
-
-void
-XmlDoc::StartTag(XmlElement * xel)
-{
- LPCSTR tag = MakeMarkdownString(xel->m_tag, GetCodepage()); // UTF-8 encoding
- xel->m_normalizedTag = tag;
-
- if (m_loadSave == XML_SAVE)
- {
- // Add tabs & open tag to XML string
- m_xml += (CString)_T("\n") + GetLeader() + _T("<") + tag + _T(">");
- // Mark any currently open tags as multiline (for pretty printing)
- // (as they are complex b/c they contain this tag)
- for (POSITION pos=m_openElements.GetHeadPosition(); pos; )
- {
- XmlElement * xmem = m_openElements.GetNext(pos);
- xmem->SetMultiline();
- }
- }
- else // XML_LOAD)
- {
- ASSERT(!xel->m_load);
- if (m_openElements.IsEmpty())
- {
- // Create root CMarkdown from CMarkdown::File
- CMarkdown::File & parentFile = (m_load->xmlfile);
- CMarkdown childmd = CMarkdown(parentFile).Move(tag).Pop();
- xel->m_load = new XmlLoadElementData(childmd);
- }
- else
- {
- // Create child CMarkdown from parent CMarkdown
- XmlElement * parel = m_openElements.GetTail();
- CMarkdown & parentMd = (parel->m_load->markdown);
- CMarkdown childMd = CMarkdown(parentMd).Move(tag);
- xel->m_load = new XmlLoadElementData(childMd);
- }
- }
- // Add this tag to list of open tags
- m_openElements.AddTail(xel);
-}
-
-/**
- * @brief Non-content elements call this, for CMarkdown::Pop (whatever it does)
- */
-void
-XmlDoc::PopMe(XmlElement * xel)
-{
- if (m_loadSave == XML_LOAD)
- {
- CMarkdown & myMd = xel->m_load->markdown;
- myMd.Pop();
- }
-}
-
-/**
- * @brief When saving, write out end tag (at XmlElement destructor time)
- */
-void
-XmlDoc::EndTag(XmlElement * xel)
-{
- CString tag = xel->m_normalizedTag;
- XmlElement * tail = m_openElements.RemoveTail();
- ASSERT(tail == xel);
- if (xel->isMultiline())
- {
- m_xml += _T("\n");
- m_xml += GetLeader();
- }
- m_xml += (CString)_T("</") + tag + _T(">");
-}
-
-/**
- * @brief (When saving) Get correct number of tabs to print before element
- */
-CString
-XmlDoc::GetLeader() const
-{
- CString leader;
- for (int i=0; i<m_openElements.GetCount(); ++i)
- leader += _T("\t");
- return leader;
-}
-
-/**
- * @brief Read or write some textual content at current location
- */
-void
-XmlDoc::Content(XmlElement * xel, CString & str)
-{
- if (m_loadSave == XML_SAVE)
- {
- Append(str);
- }
- else
- {
- CMarkdown::EntityMap & entities = m_load->entities;
- CMarkdown & myMd = xel->m_load->markdown;
- str = CMarkdown::String(myMd.GetInnerText()->Unicode(m_codepage)->Resolve(entities)).W;
- }
-}
-
-/**
- * @brief Read or write an int value at current location
- */
-void
-XmlDoc::Content(XmlElement * xel, int & val)
-{
- if (m_loadSave == XML_SAVE)
- {
- AppendN(val);
- }
- else
- {
- CMarkdown & myMd = xel->m_load->markdown;
- sscanf(CMarkdown::String(myMd.GetInnerText()).A, "%d", &val);
- }
-}
-
-/**
- * @brief Create simple container element
- */
-XmlElement::XmlElement(XmlDoc & doc, LPCTSTR tag)
-: m_doc(doc)
-, m_tag(tag)
-, m_multiline(false)
-, m_load(NULL)
-{
- m_doc.StartTag(this);
- m_doc.PopMe(this);
-}
-
-/**
- * @brief Create simple string leaf node element
- */
-XmlElement::XmlElement(XmlDoc & doc, LPCTSTR tag, CString & val)
-: m_doc(doc)
-, m_tag(tag)
-, m_multiline(false)
-, m_load(NULL)
-{
- m_doc.StartTag(this);
- m_doc.Content(this, val);
-}
-
-/**
- * @brief Create integer string leaf node element
- */
-XmlElement::XmlElement(XmlDoc & doc, LPCTSTR tag, int & val)
-: m_doc(doc)
-, m_tag(tag)
-, m_multiline(false)
-, m_load(NULL)
-{
- m_doc.StartTag(this);
- m_doc.Content(this, val);
-}
-/**
- * brief Cleanup or memory
- */
-XmlElement::~XmlElement()
-{
- m_doc.EndTag(this);
- delete m_load;
-}
Deleted: trunk/Src/XmlDoc.h
===================================================================
--- trunk/Src/XmlDoc.h 2006-11-09 15:21:12 UTC (rev 3795)
+++ trunk/Src/XmlDoc.h 2006-11-09 15:30:24 UTC (rev 3796)
@@ -1,118 +0,0 @@
-/**
- * @file XmlDoc.h
- *
- * @brief Declaration file for XmlDoc and XmlElement classes.
- *
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef XmlDoc_h_included
-#define XmlDoc_h_included
-
-class XmlElement;
-typedef CTypedPtrList<CPtrList, XmlElement*> XmlElementList;
-
-struct XmlLoadDocData;
-struct XmlLoadElementData;
-
-/**
- * @brief Simple XML document class to ease doing XML output
- *
- * Sample use:
- *
- * XmlDoc doc(_T("C:\\somewhere\\goodstuff.xml"), XmlDoc::XML_SAVE, _T("UTF-8"));
- * doc.Begin();
- * {
- * XmlElement(doc, _T("automobile"));
- * {
- * XmlElement(doc, _T("seats"));
- * {
- * XmlElement(doc, _T("front")).Append(_T("bucket"));
- * XmlElement(doc, _T("rear")).Append(_T("bench"));
- * }
- * }
- * }
- * doc.End();
- *
- * Sample output:
- *
- * <?xml version='1.0' encoding='UTF-8'>
- * <automobile>
- * <seats>
- * <front>bucket</bucket>
- * <rear>bench</rear>
- * </seats>
- * </automobile>
- */
-class XmlDoc
-{
-public:
- typedef enum { XML_LOAD, XML_SAVE } XML_LOADSAVE;
-
- XmlDoc(LPCTSTR path, XML_LOADSAVE loadSave, LPCTSTR encoding);
- ~XmlDoc();
- void Begin();
- void End();
-
-// Implementation methods
-private:
- CString GetXml() const;
- int GetCodepage() const { return m_codepage; }
-
- void Append(LPCTSTR str);
- void AppendN(int n) { TCHAR buff[33]; m_xml += _itot(n, buff, 10); }
-
- void Content(XmlElement * xel, CString & str);
- void Content(XmlElement * xel, int & val);
-
- void StartTag(XmlElement * xel);
- void PopMe(XmlElement * xel);
- void EndTag(XmlElement * xel);
- CString GetLeader() const;
-
-// Implementation data
-private:
- CString m_path;
- XML_LOADSAVE m_loadSave;
- int m_live;
- CString m_xml;
- XmlElementList m_openElements;
- XmlLoadDocData * m_load; // hide loading implementation data inside this pointer
- int m_codepage;
-
-friend class XmlElement;
-};
-
-/**
- * @brief Simple XML element class to ease doing XML output
- */
-class XmlElement
-{
-public:
- // container
- XmlElement(XmlDoc & doc, LPCTSTR tag);
-
- // value
- XmlElement(XmlDoc & doc, LPCTSTR tag, CString & val);
- XmlElement(XmlDoc & doc, LPCTSTR tag, int & val);
-
- ~XmlElement();
-
-// Implementation methods
-private:
- bool isMultiline() const { return m_multiline; }
- void SetMultiline(bool isMultiline=true) { m_multiline = isMultiline; }
-
-// Implementation data
-private:
- XmlDoc & m_doc;
- CString m_tag;
- CString m_normalizedTag;
- bool m_multiline;
- XmlLoadElementData * m_load;
-friend XmlDoc;
-};
-
-
-#endif // XmlDoc_h_included
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-11-11 10:45:14
|
Revision: 3803
http://svn.sourceforge.net/winmerge/?rev=3803&view=rev
Author: sdottaka
Date: 2006-11-11 02:44:58 -0800 (Sat, 11 Nov 2006)
Log Message:
-----------
PATCH: [ 1586689 ] True color bookmark icon
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaltextview.cpp
trunk/Src/res/mg_icons.bmp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-10 14:24:40 UTC (rev 3802)
+++ trunk/Src/Changes.txt 2006-11-11 10:44:58 UTC (rev 3803)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-11 Takashi
+ PATCH: [ 1586689 ] True color bookmark icon
+ Src/editlib: ccrystaltextview.cpp
+ Src/res: mg_icons.bmp
+
2006-11-09 Gal
PATCH: [ 1590737 ] BCMenu update to v3.036
Src: BCMenu.cpp BCMenu.h
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2006-11-10 14:24:40 UTC (rev 3802)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2006-11-11 10:44:58 UTC (rev 3803)
@@ -1753,7 +1753,10 @@
if (m_pIcons == NULL)
{
m_pIcons = new CImageList;
- VERIFY (m_pIcons->Create (IDR_MARGIN_ICONS, 12, 12, RGB (255, 255, 255)));
+ VERIFY (m_pIcons->Create(12, 12, ILC_COLOR32 | ILC_MASK, 0, 1));
+ CBitmap bmp;
+ bmp.LoadBitmap(IDR_MARGIN_ICONS);
+ m_pIcons->Add(&bmp, RGB(255, 255, 255));
}
if (nImageIndex >= 0)
{
Modified: trunk/Src/res/mg_icons.bmp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-13 17:57:03
|
Revision: 3797
http://svn.sourceforge.net/winmerge/?rev=3797&view=rev
Author: galh
Date: 2006-11-09 07:45:26 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1590737 ] BCMenu update to v3.036
Modified Paths:
--------------
trunk/Src/BCMenu.cpp
trunk/Src/BCMenu.h
trunk/Src/Changes.txt
Modified: trunk/Src/BCMenu.cpp
===================================================================
--- trunk/Src/BCMenu.cpp 2006-11-09 15:30:24 UTC (rev 3796)
+++ trunk/Src/BCMenu.cpp 2006-11-09 15:45:26 UTC (rev 3797)
@@ -1,7 +1,7 @@
//*************************************************************************
// BCMenu.cpp : implementation file
-// Version : 3.034
-// Date : May 2002
+// Version : 3.036
+// Date : June 2005
// Author : Brent Corkum
// Email : co...@ro...
// Latest Version : http://www.rocscience.com/~corkum/BCMenu.html
@@ -1029,7 +1029,7 @@
}
-BOOL BCMenu::AppendODMenuW(wchar_t *lpstrText,UINT nFlags,UINT nID,
+BOOL BCMenu::AppendODMenuW(const wchar_t *lpstrText,UINT nFlags,UINT nID,
int nIconNormal)
{
// Add the MF_OWNERDRAW flag if not specified:
@@ -1080,7 +1080,7 @@
return AppendODMenuW(A2W(lpstrText),nFlags,nID,il,xoffset);
}
-BOOL BCMenu::AppendODMenuW(wchar_t *lpstrText,UINT nFlags,UINT nID,
+BOOL BCMenu::AppendODMenuW(const wchar_t *lpstrText,UINT nFlags,UINT nID,
CImageList *il,int xoffset)
{
// Add the MF_OWNERDRAW flag if not specified:
@@ -1387,7 +1387,6 @@
BCMenuData *mdata;
// Find the old BCMenuData structure:
- CString junk=OptionText;
mdata=FindMenuOption(OptionText);
if(mdata){
if(lpstrText)
@@ -1412,6 +1411,60 @@
return(FALSE);
}
+BOOL BCMenu::SetImageForPopupFromToolbarA (const char *strPopUpText, UINT toolbarID, UINT command_id_to_extract_icon_from)
+{
+ USES_CONVERSION;
+ return SetImageForPopupFromToolbarW(A2W(strPopUpText),toolbarID,command_id_to_extract_icon_from);
+}
+BOOL BCMenu::SetImageForPopupFromToolbarW (wchar_t *strPopUpText, UINT toolbarID, UINT command_id_to_extract_icon_from)
+{
+ CWnd* pWnd = AfxGetMainWnd();
+ if (pWnd == NULL)pWnd = CWnd::GetDesktopWindow();
+
+ CToolBar bar;
+ bar.Create(pWnd);
+
+ if(bar.LoadToolBar(toolbarID)){
+ BCMenuData *mdata = FindMenuOption(strPopUpText);
+ if (mdata != NULL)
+ {
+ if (mdata->bitmap != NULL){
+ mdata->bitmap->DeleteImageList();
+ delete mdata->bitmap;
+ mdata->bitmap=NULL;
+ }
+ CImageList imglist;
+ imglist.Create(m_iconX,m_iconY,ILC_COLORDDB|ILC_MASK,1,1);
+
+ if(AddBitmapToImageList (&imglist, toolbarID)){
+ int ind = bar.CommandToIndex (command_id_to_extract_icon_from);
+ if (ind < 0) { return FALSE; }
+
+ UINT dummyID, dummyStyle;
+ int image_index;
+ bar.GetButtonInfo (ind, dummyID, dummyStyle, image_index);
+ ASSERT (dummyID == command_id_to_extract_icon_from);
+
+ mdata->bitmap = new CImageList;
+ mdata->bitmap->Create(m_iconX,m_iconY,ILC_COLORDDB|ILC_MASK,0,1);
+ mdata->bitmap->Add (imglist.ExtractIcon (image_index));
+
+ mdata->menuIconNormal = toolbarID;
+ mdata->xoffset = 0;
+
+ return TRUE;
+ }
+ else{
+ mdata->menuIconNormal = -1;
+ mdata->xoffset = -1;
+ }
+ }
+ }
+
+ return FALSE;
+}
+
+
BCMenuData *BCMenu::NewODMenu(UINT pos,UINT nFlags,UINT nID,CString string)
{
BCMenuData *mdata;
@@ -2449,7 +2502,7 @@
brushin.DeleteObject();
dc->Draw3dRect (rc,colorout,colorout);
- if (!hbmCheck)DrawCheckMark(dc,rc.left+dx,rc.top+dy,GetSysColor(COLOR_MENUTEXT),TRUE);
+ if (!hbmCheck)DrawCheckMark(dc,rc.left+dx,rc.top+dy,GetSysColor(COLOR_MENUTEXT));
else DrawRadioDot(dc,rc.left+dx,rc.top+dy,GetSysColor(COLOR_MENUTEXT));
return TRUE;
}
@@ -2535,20 +2588,28 @@
WORD BCMenu::NumBitmapColors(LPBITMAPINFOHEADER lpBitmap)
{
- if ( lpBitmap->biClrUsed != 0)
- return (WORD)lpBitmap->biClrUsed;
-
- switch (lpBitmap->biBitCount){
- case 1:
- return 2;
- case 4:
- return 16;
- case 8:
- return 256;
- default:
- return 0;
+ WORD returnval = 0;
+
+ if ( lpBitmap->biClrUsed != 0){
+ returnval=(WORD)lpBitmap->biClrUsed;
}
- return 0;
+ else{
+ switch (lpBitmap->biBitCount){
+ case 1:
+ returnval=2;
+ break;
+ case 4:
+ returnval=16;
+ break;
+ case 8:
+ returnval=256;
+ break;
+ default:
+ returnval=0;
+ break;
+ }
+ }
+ return returnval;
}
HBITMAP BCMenu::LoadSysColorBitmap(int nResourceId)
@@ -2702,7 +2763,7 @@
return AppendMenuW(nFlags,nIDNewItem,A2W(lpszNewItem),nIconNormal);
}
-BOOL BCMenu::AppendMenuW(UINT nFlags,UINT nIDNewItem,wchar_t *lpszNewItem,int nIconNormal)
+BOOL BCMenu::AppendMenuW(UINT nFlags,UINT nIDNewItem,const wchar_t *lpszNewItem,int nIconNormal)
{
return AppendODMenuW(lpszNewItem,nFlags,nIDNewItem,nIconNormal);
}
@@ -2713,7 +2774,7 @@
return AppendMenuW(nFlags,nIDNewItem,A2W(lpszNewItem),il,xoffset);
}
-BOOL BCMenu::AppendMenuW(UINT nFlags,UINT nIDNewItem,wchar_t *lpszNewItem,CImageList *il,int xoffset)
+BOOL BCMenu::AppendMenuW(UINT nFlags,UINT nIDNewItem,const wchar_t *lpszNewItem,CImageList *il,int xoffset)
{
return AppendODMenuW(lpszNewItem,nFlags,nIDNewItem,il,xoffset);
}
@@ -2724,7 +2785,7 @@
return AppendMenuW(nFlags,nIDNewItem,A2W(lpszNewItem),bmp);
}
-BOOL BCMenu::AppendMenuW(UINT nFlags,UINT nIDNewItem,wchar_t *lpszNewItem,CBitmap *bmp)
+BOOL BCMenu::AppendMenuW(UINT nFlags,UINT nIDNewItem,const wchar_t *lpszNewItem,CBitmap *bmp)
{
if(bmp){
CImageList temp;
@@ -2778,7 +2839,7 @@
//--------------------------------------------------------------------------
//[21.06.99 rj]
-BCMenu* BCMenu::AppendODPopupMenuW(wchar_t *lpstrText)
+BCMenu* BCMenu::AppendODPopupMenuW(const wchar_t *lpstrText)
{
BCMenu* pSubMenu = new BCMenu;
pSubMenu->m_unselectcheck=m_unselectcheck;
@@ -3165,3 +3226,103 @@
}
return(loc);
}
+
+bool BCMenu::AppendMenu (BCMenu* pMenuToAdd, bool add_separator /*= true*/, int num_items_to_remove_at_end /*= 0*/)
+{
+ // Appends a new menu to the end of existing menu.
+ //
+ // If 'add_separator' is true, adds separator before appending another menu.
+ // separator will not be added if the original menu is empty or if the last
+ // item already is a separator.
+ //
+ // If 'num_items_to_remove_at_end' is greater than 0, removes a specified
+ // number of menu option from the end of original menu before appending
+ // new menu. Removal of items is done before adding a separator (add_separator flag)
+
+ // Original code from http://www.codeproject.com/menu/mergemenu.asp
+ // Posted by Oskar Wieland on Nov 16, 2001
+ //
+ // Modified and added to BCMenu by Damir Valiulin on 2004-12-10:
+ // * Modified to account for BCMenu's owner-drawn stuff.
+ // * Made adding a separator optional
+ // * Added an option to remove a few items from original menu before appending
+ // * Removed bTopLevel stuff because I didn't test it.
+
+ // Sanity checks
+ if (pMenuToAdd == NULL || !pMenuToAdd->IsKindOf (RUNTIME_CLASS(BCMenu))){
+ ASSERT(FALSE);
+ return false;
+ }
+
+ // Anything to add?
+ int iMenuAddItemCount = pMenuToAdd->GetMenuItemCount();
+ if( iMenuAddItemCount == 0 )
+ return true;
+
+ // Delete last few items from the menu if specified
+ if (num_items_to_remove_at_end > 0){
+ int original_num_menu_items = GetMenuItemCount();
+ if (original_num_menu_items >= num_items_to_remove_at_end)
+ {
+ int first_delete_item = original_num_menu_items - 1;
+ int last_delete_item = original_num_menu_items - num_items_to_remove_at_end;
+ for (int i=first_delete_item; i>=last_delete_item; i--){
+ if (!DeleteMenu (i, MF_BYPOSITION)){
+ ASSERT(FALSE); // Something went wrong, but not so critical to abort everything. Just stop deleting items.
+ break;
+ }
+ }
+ }else{
+ ASSERT(FALSE); // Number of items to delete is greater than existing number of menu items!
+ }
+ }
+
+ // Append a separator if existing menu has any items already and last item is not separator
+ if (add_separator && GetMenuItemCount() > 0){
+ if (MF_SEPARATOR != (MF_SEPARATOR & GetMenuState (GetMenuItemCount()-1, MF_BYPOSITION))){
+ AppendMenu(MF_SEPARATOR);
+ }
+ }
+
+ // Iterate through the top level of menu to add
+ for (int iLoop = 0; iLoop < iMenuAddItemCount; iLoop++ )
+ {
+ // Get the menu string from the add menu
+ CString sMenuAddString;
+ pMenuToAdd->GetMenuText( iLoop, sMenuAddString, MF_BYPOSITION );
+
+ // Try to get the sub-menu of the current menu item
+ BCMenu* pSubMenu = (BCMenu*)pMenuToAdd->GetSubMenu(iLoop);
+
+ // Check if we have a sub menu
+ if (!pSubMenu)
+ {
+ // Normal menu item
+
+ // Read the source and append at the destination
+ UINT nState = pMenuToAdd->GetMenuState( iLoop, MF_BYPOSITION );
+ UINT nItemID = pMenuToAdd->GetMenuItemID( iLoop );
+
+ if (!AppendMenu( nState, nItemID, sMenuAddString )){
+ ASSERT(FALSE); //TRACE( "MergeMenu: AppendMenu failed!\n" );
+ return false;
+ }
+ }
+ else
+ {
+ // Create a new pop-up menu and insert sub-menu's items into it
+ BCMenu* pNewPopupMenu = AppendODPopupMenu (sMenuAddString);
+ if (pNewPopupMenu == NULL){
+ ASSERT(FALSE); //TRACE( "MergeMenu: CreatePopupMenu failed!\n" );
+ return false;
+ }
+
+ // Add items to new pop-up recursively
+ if (! pNewPopupMenu->AppendMenu (pSubMenu, false, 0)){
+ return false;
+ }
+ }
+ }
+
+ return true;
+}
\ No newline at end of file
Modified: trunk/Src/BCMenu.h
===================================================================
--- trunk/Src/BCMenu.h 2006-11-09 15:30:24 UTC (rev 3796)
+++ trunk/Src/BCMenu.h 2006-11-09 15:45:26 UTC (rev 3797)
@@ -1,7 +1,7 @@
//*************************************************************************
// BCMenu.h : header file
-// Version : 3.034
-// Date : May 2002
+// Version : 3.036
+// Date : June 2005
// Author : Brent Corkum
// Email : co...@ro...
// Latest Version : http://www.rocscience.com/~corkum/BCMenu.html
@@ -77,6 +77,7 @@
#define AppendODMenu AppendODMenuA
#define AppendODPopupMenu AppendODPopupMenuA
#define ModifyODMenu ModifyODMenuA
+#define SetImageForPopupFromToolbar SetImageForPopupFromToolbarA
#else
#define AppendMenu AppendMenuW
#define InsertMenu InsertMenuW
@@ -84,6 +85,7 @@
#define AppendODMenu AppendODMenuW
#define ModifyODMenu ModifyODMenuW
#define AppendODPopupMenu AppendODPopupMenuW
+#define SetImageForPopupFromToolbar SetImageForPopupFromToolbarW
#endif
@@ -109,17 +111,18 @@
BOOL AppendMenuA(UINT nFlags,UINT nIDNewItem=0,const char *lpszNewItem=NULL,int nIconNormal=-1);
BOOL AppendMenuA(UINT nFlags,UINT nIDNewItem,const char *lpszNewItem,CImageList *il,int xoffset);
BOOL AppendMenuA(UINT nFlags,UINT nIDNewItem,const char *lpszNewItem,CBitmap *bmp);
- BOOL AppendMenuW(UINT nFlags,UINT nIDNewItem=0,wchar_t *lpszNewItem=NULL,int nIconNormal=-1);
- BOOL AppendMenuW(UINT nFlags,UINT nIDNewItem,wchar_t *lpszNewItem,CImageList *il,int xoffset);
- BOOL AppendMenuW(UINT nFlags,UINT nIDNewItem,wchar_t *lpszNewItem,CBitmap *bmp);
+ BOOL AppendMenuW(UINT nFlags,UINT nIDNewItem=0,const wchar_t *lpszNewItem=NULL,int nIconNormal=-1);
+ BOOL AppendMenuW(UINT nFlags,UINT nIDNewItem,const wchar_t *lpszNewItem,CImageList *il,int xoffset);
+ BOOL AppendMenuW(UINT nFlags,UINT nIDNewItem,const wchar_t *lpszNewItem,CBitmap *bmp);
BOOL AppendODMenuA(LPCSTR lpstrText,UINT nFlags = MF_OWNERDRAW,UINT nID = 0,int nIconNormal = -1);
- BOOL AppendODMenuW(wchar_t *lpstrText,UINT nFlags = MF_OWNERDRAW,UINT nID = 0,int nIconNormal = -1);
+ BOOL AppendODMenuW(const wchar_t *lpstrText,UINT nFlags = MF_OWNERDRAW,UINT nID = 0,int nIconNormal = -1);
BOOL AppendODMenuA(LPCSTR lpstrText,UINT nFlags,UINT nID,CImageList *il,int xoffset);
- BOOL AppendODMenuW(wchar_t *lpstrText,UINT nFlags,UINT nID,CImageList *il,int xoffset);
+ BOOL AppendODMenuW(const wchar_t *lpstrText,UINT nFlags,UINT nID,CImageList *il,int xoffset);
+ bool AppendMenu (BCMenu* pMenuToAdd, bool add_separator = true, int num_items_to_remove_at_end = 0);
// for appending a popup menu (see example application)
BCMenu* AppendODPopupMenuA(LPCSTR lpstrText);
- BCMenu* AppendODPopupMenuW(wchar_t *lpstrText);
+ BCMenu* AppendODPopupMenuW(const wchar_t *lpstrText);
// functions for inserting a menu option, use the InsertMenu call (see above define)
BOOL InsertMenuA(UINT nPosition,UINT nFlags,UINT nIDNewItem=0,const char *lpszNewItem=NULL,int nIconNormal=-1);
@@ -142,6 +145,10 @@
BOOL ModifyODMenuW(wchar_t *lpstrText,UINT nID,CImageList *il,int xoffset);
BOOL ModifyODMenuW(wchar_t *lpstrText,UINT nID,CBitmap *bmp);
BOOL ModifyODMenuW(wchar_t *lpstrText,wchar_t *OptionText,int nIconNormal);
+
+ BOOL SetImageForPopupFromToolbarA (const char *strPopUpText, UINT toolbarID, UINT command_id_to_extract_icon_from);
+ BOOL SetImageForPopupFromToolbarW (wchar_t *strPopUpText, UINT toolbarID, UINT command_id_to_extract_icon_from);
+
// use this method for adding a solid/hatched colored square beside a menu option
// courtesy of Warren Stevens
BOOL ModifyODMenuA(const char *lpstrText,UINT nID,COLORREF fill,COLORREF border,int hatchstyle=-1,CSize *pSize=NULL);
@@ -221,9 +228,10 @@
static COLORREF LightenColor(COLORREF col,double factor);
static COLORREF DarkenColor(COLORREF col,double factor);
-// Miscellaneous Protected Member functions
+public:
+ static BOOL IsNewShell(void);
+ // Miscellaneous Protected Member functions
protected:
- static BOOL IsNewShell(void);
static BOOL IsWinXPLuna(void);
static BOOL IsLunaMenuStyle(void);
static BOOL IsWindowsClassicTheme(void);
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-09 15:30:24 UTC (rev 3796)
+++ trunk/Src/Changes.txt 2006-11-09 15:45:26 UTC (rev 3797)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-09 Gal
+ PATCH: [ 1590737 ] BCMenu update to v3.036
+ Src: BCMenu.cpp BCMenu.h
+
2006-11-09 Kimmo
PATCH: [ 1591532 ] Remove unused XmlDoc class
Src: Merge.dsp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-13 18:05:51
|
Revision: 3805
http://svn.sourceforge.net/winmerge/?rev=3805&view=rev
Author: galh
Date: 2006-11-13 03:35:51 -0800 (Mon, 13 Nov 2006)
Log Message:
-----------
BUG: [ 1594188 ] /x option does not work
Fixed a 64-bit warning.
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-13 11:34:04 UTC (rev 3804)
+++ trunk/Src/Changes.txt 2006-11-13 11:35:51 UTC (rev 3805)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-13 Gal
+ BUG: [ 1594188 ] /x option does not work
+ Src: MergeDoc.cpp
+
2006-11-11 Takashi
PATCH: [ 1586689 ] True color bookmark icon
Src/editlib: ccrystaltextview.cpp
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-11-13 11:34:04 UTC (rev 3804)
+++ trunk/Src/MergeDoc.cpp 2006-11-13 11:35:51 UTC (rev 3805)
@@ -2371,13 +2371,13 @@
dfi.Update(szPath);
- int timeDiff = dfi.mtime - fileInfo->mtime;
- timeDiff = abs(timeDiff);
- if (timeDiff > tolerance ||
- dfi.size != fileInfo->size)
+ __int64 timeDiff = dfi.mtime - fileInfo->mtime;
+ timeDiff = _abs64(timeDiff);
+ if ((timeDiff > tolerance) || (dfi.size != fileInfo->size))
{
bFileChanged = TRUE;
}
+
return bFileChanged;
}
@@ -2868,8 +2868,11 @@
// Inform user that files are identical
// Don't show message if new buffers created
- if (bIdentical && (m_nBufferType[0] == BUFFER_NORMAL ||
- m_nBufferType[1] == BUFFER_NORMAL))
+ if ((TRUE == bIdentical) &&
+ ((m_nBufferType[0] == BUFFER_NORMAL) ||
+ (m_nBufferType[0] == BUFFER_NORMAL_NAMED) ||
+ (m_nBufferType[1] == BUFFER_NORMAL) ||
+ (m_nBufferType[1] == BUFFER_NORMAL_NAMED)))
{
ShowRescanError(nRescanResult, bBinary, bIdentical);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-14 15:51:41
|
Revision: 3806
http://svn.sourceforge.net/winmerge/?rev=3806&view=rev
Author: galh
Date: 2006-11-14 07:35:26 -0800 (Tue, 14 Nov 2006)
Log Message:
-----------
BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/StdAfx.cpp
trunk/Src/StdAfx.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-13 11:35:51 UTC (rev 3805)
+++ trunk/Src/Changes.txt 2006-11-14 15:35:26 UTC (rev 3806)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-14 Gal
+ BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
+ Src: StdAfx.cpp StdAfx.h
+
2006-11-13 Gal
BUG: [ 1594188 ] /x option does not work
Src: MergeDoc.cpp
Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp 2006-11-13 11:35:51 UTC (rev 3805)
+++ trunk/Src/StdAfx.cpp 2006-11-14 15:35:26 UTC (rev 3806)
@@ -182,3 +182,13 @@
return false;
#endif
}
+
+#if _MSC_VER == 1310
+/**
+* @brief Calculates a number absolute value.
+*/
+__int64 _abs64_patch(__int64 n)
+{
+ return ((n >= 0) ? n : -n);
+}
+#endif
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2006-11-13 11:35:51 UTC (rev 3805)
+++ trunk/Src/StdAfx.h 2006-11-14 15:35:26 UTC (rev 3806)
@@ -16,6 +16,12 @@
#define WINVER 0x400
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+// A patch to solve a VC 7.1 bug. It seems that it doesn't export _abs64
+// function.
+#if _MSC_VER == 1310
+#define _abs64 _abs64_patch
+#endif
+
//Make VS2005 build less noisy by disabling warnings for deprecated string functions.
#if _MSC_VER >= 1400
#define _CRT_SECURE_NO_DEPRECATE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-15 22:35:14
|
Revision: 3808
http://svn.sourceforge.net/winmerge/?rev=3808&view=rev
Author: kimmov
Date: 2006-11-15 14:35:09 -0800 (Wed, 15 Nov 2006)
Log Message:
-----------
PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/MergeDiffDetailView.cpp
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-14 21:00:30 UTC (rev 3807)
+++ trunk/Src/Changes.txt 2006-11-15 22:35:09 UTC (rev 3808)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-15 Kimmo
+ PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
+ Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
+
2006-11-14 Gal
BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
Src: StdAfx.cpp StdAfx.h
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-11-14 21:00:30 UTC (rev 3807)
+++ trunk/Src/MainFrm.cpp 2006-11-15 22:35:09 UTC (rev 3808)
@@ -252,8 +252,6 @@
{
gLog.EnableLogging(FALSE);
- // destroy the reg expression list
- FreeRegExpList();
// Delete all temporary folders belonging to this process
GetClearTempPath(NULL, NULL);
@@ -286,8 +284,6 @@
if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1)
return -1;
- // build the initial reg expression list
- RebuildRegExpList(FALSE);
GetFontProperties();
if (!CreateToobar())
@@ -1615,30 +1611,6 @@
void CMainFrame::OnClose()
{
- // save any dirty edit views
- MergeDocList mergedocs;
- GetAllMergeDocs(&mergedocs);
- for (POSITION pos = mergedocs.GetHeadPosition(); pos; mergedocs.GetNext(pos))
- {
- CMergeDoc * pMergeDoc = mergedocs.GetAt(pos);
- CMergeEditView * pLeft = pMergeDoc->GetLeftView();
- CMergeEditView * pRight = pMergeDoc->GetRightView();
- if ((pLeft && pLeft->IsModified())
- || (pRight && pRight->IsModified()))
- {
- // Allow user to cancel closing
- if (!pMergeDoc->PromptAndSaveIfNeeded(TRUE))
- return;
- else
- {
- // Set modified status to false so that we are not asking
- // about saving again.
- pMergeDoc->m_ptBuf[0]->SetModified(FALSE);
- pMergeDoc->m_ptBuf[1]->SetModified(FALSE);
- }
- }
- }
-
// Save last selected filter
CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
m_options.SaveOption(OPT_FILEFILTER_CURRENT, filter);
@@ -2005,7 +1977,7 @@
{
CMergeDoc * pMergeDoc = (CMergeDoc *) pFrame->GetActiveDocument();
// If there are changes in files, tell user to save them first
- if (pMergeDoc->m_ptBuf[0]->IsModified() || pMergeDoc->m_ptBuf[0]->IsModified())
+ if (pMergeDoc->m_ptBuf[0]->IsModified() || pMergeDoc->m_ptBuf[1]->IsModified())
{
bOpenDialog = FALSE;
AfxMessageBox(IDS_SAVEFILES_FORPATCH, MB_ICONSTOP);
@@ -2579,7 +2551,7 @@
{
if (m_bEscShutdown)
{
- AfxGetMainWnd()->SendMessage(WM_COMMAND, ID_APP_EXIT);
+ AfxGetMainWnd()->PostMessage(WM_COMMAND, ID_APP_EXIT);
return TRUE;
}
else
@@ -2844,22 +2816,9 @@
for (POSITION pos = mergedocs.GetHeadPosition(); pos; mergedocs.GetNext(pos))
{
CMergeDoc * pMergeDoc = mergedocs.GetAt(pos);
- CMergeEditView * pLeft = pMergeDoc->GetLeftView();
- CMergeEditView * pRight = pMergeDoc->GetRightView();
- if ((pLeft && pLeft->IsModified())
- || (pRight && pRight->IsModified()))
- {
- // Allow user to cancel closing
- if (!pMergeDoc->PromptAndSaveIfNeeded(TRUE))
- return;
- else
- {
- // Set modified status to false so that we are not asking
- // about saving again.
- pMergeDoc->m_ptBuf[0]->SetModified(FALSE);
- pMergeDoc->m_ptBuf[1]->SetModified(FALSE);
- }
- }
+ // Allow user to cancel closing
+ if (!pMergeDoc->PromptAndSaveIfNeeded(TRUE))
+ return;
}
DirDocList dirdocs;
Modified: trunk/Src/MergeDiffDetailView.cpp
===================================================================
--- trunk/Src/MergeDiffDetailView.cpp 2006-11-14 21:00:30 UTC (rev 3807)
+++ trunk/Src/MergeDiffDetailView.cpp 2006-11-15 22:35:09 UTC (rev 3808)
@@ -573,10 +573,6 @@
CMergeDoc *pd = GetDocument();
if (pd->PromptAndSaveIfNeeded(TRUE))
{
- // Set modified status to false so that we are not asking
- // about saving again
- pd->m_ptBuf[0]->SetModified(FALSE);
- pd->m_ptBuf[1]->SetModified(FALSE);
AfxGetMainWnd()->PostMessage(WM_COMMAND, ID_FILE_CLOSE);
return FALSE;
}
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-11-14 21:00:30 UTC (rev 3807)
+++ trunk/Src/MergeDoc.cpp 2006-11-15 22:35:09 UTC (rev 3808)
@@ -1150,6 +1150,7 @@
// Saving succeeded with given/selected filename
if (nSaveErrorCode == SAVE_DONE)
{
+ m_ptBuf[nBuffer]->SetModified(FALSE);
m_pSaveFileInfo[nBuffer]->Update(strSavePath);
m_pRescanFileInfo[nBuffer]->Update(m_filePaths.GetPath(nBuffer));
m_filePaths.SetPath(nBuffer, strSavePath);
@@ -1254,31 +1255,41 @@
return -1;
}
-BOOL CMergeDoc::CanCloseFrame(CFrameWnd* /*pFrame*/)
+/**
+ * @brief Save modified documents.
+ * This function asks if user wants to save modified documents. We also
+ * allow user to cancel the closing.
+ *
+ * There is a special trick avoiding showing two save-dialogs, as MFC framework
+ * sometimes calls this function twice. We use static counter for these calls
+ * and if we already have saving in progress (counter == 1) we skip the new
+ * saving dialog.
+ *
+ * @return TRUE if docs are closed, FALSE if closing is cancelled.
+ */
+BOOL CMergeDoc::SaveModified()
{
- // Allow user to cancel closing
+ static int counter;
+ ++counter;
+ if (counter > 1)
+ return FALSE;
+
if (PromptAndSaveIfNeeded(TRUE))
{
- // Set modified status to false so that we are not asking
- // about saving again in OnCloseDocument()
- m_ptBuf[0]->SetModified(FALSE);
- m_ptBuf[1]->SetModified(FALSE);
+ counter = 0;
return TRUE;
}
else
{
+ counter = 0;
return FALSE;
}
}
-// If WinMerge is closed, CMainFrame::OnClose already takes
-// care of saving so this function just returns TRUE
-// to prevent further questions
-BOOL CMergeDoc::SaveModified()
-{
- return TRUE;
-}
-
+/**
+ * @brief Sets the current difference.
+ * @param [in] nDiff Difference to set as current difference.
+ */
void CMergeDoc::SetCurrentDiff(int nDiff)
{
if (nDiff >= 0 && nDiff <= m_diffList.LastSignificantDiff())
@@ -1287,6 +1298,12 @@
m_nCurDiff = -1;
}
+/**
+ * @brief Checks if a flag is set for line.
+ * @param [in] line Index (0-based) for line.
+ * @param [in] flag Flag to check.
+ * @return TRUE if flag is set, FALSE otherwise.
+ */
BOOL CMergeDoc::CDiffTextBuffer::FlagIsSet(UINT line, DWORD flag)
{
return ((m_aLines[line].m_dwFlags & flag) == flag);
@@ -2395,6 +2412,7 @@
* so instead of filename, description is shown.
* @todo If we have filename and description for file, what should
* we do after saving to different filename? Empty description?
+ * @todo Parameter @p bAllowCancel is always true in callers - can be removed.
*/
BOOL CMergeDoc::PromptAndSaveIfNeeded(BOOL bAllowCancel)
{
@@ -2403,11 +2421,11 @@
BOOL result = TRUE;
BOOL bLSaveSuccess = FALSE;
BOOL bRSaveSuccess = FALSE;
- SaveClosingDlg dlg;
if (!bLModified && !bRModified) //Both files unmodified
return TRUE;
+ SaveClosingDlg dlg;
dlg.DoAskFor(bLModified, bRModified);
if (!bAllowCancel)
dlg.m_bDisableCancel = TRUE;
@@ -2435,7 +2453,9 @@
}
}
else
+ {
result = FALSE;
+ }
// If file were modified and saving was successfull,
// update status on dir view
@@ -2453,6 +2473,7 @@
m_nTrivialDiffs, bIdentical);
}
}
+
return result;
}
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2006-11-14 21:00:30 UTC (rev 3807)
+++ trunk/Src/MergeDoc.h 2006-11-15 22:35:09 UTC (rev 3808)
@@ -269,7 +269,6 @@
public:
virtual BOOL OnNewDocument();
virtual void Serialize(CArchive& ar);
- virtual BOOL CanCloseFrame(CFrameWnd* pFrame);
virtual BOOL SaveModified();
virtual void DeleteContents ();
virtual void SetTitle(LPCTSTR lpszTitle);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-17 14:33:54
|
Revision: 3812
http://svn.sourceforge.net/winmerge/?rev=3812&view=rev
Author: galh
Date: 2006-11-17 06:27:57 -0800 (Fri, 17 Nov 2006)
Log Message:
-----------
PATCH: [ 1598194 ] New command line parser
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/Merge.dsp
trunk/Src/Merge.h
Added Paths:
-----------
trunk/Src/ClearCaseCmdLineParser.cpp
trunk/Src/ClearCaseCmdLineParser.h
trunk/Src/CmdLineParser.h
trunk/Src/MergeCmdLineInfo.cpp
trunk/Src/MergeCmdLineInfo.h
trunk/Src/WinMergeCmdLineParser.cpp
trunk/Src/WinMergeCmdLineParser.h
Removed Paths:
-------------
trunk/Src/Common/CmdArgs.cpp
trunk/Src/Common/CmdArgs.h
trunk/Src/MergeArgs.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-17 14:23:07 UTC (rev 3811)
+++ trunk/Src/Changes.txt 2006-11-17 14:27:57 UTC (rev 3812)
@@ -3,6 +3,14 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2006-11-17 Gal
+ PATCH: [ 1598194 ] New command line parser
+ Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
+ Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
+ CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
+ WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
+ Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp
+
+2006-11-17 Gal
PATCH: Moved white-space trimming to FileFilterHelper class
Src: FileFilterHelper.cpp
Added: trunk/Src/ClearCaseCmdLineParser.cpp
===================================================================
--- trunk/Src/ClearCaseCmdLineParser.cpp (rev 0)
+++ trunk/Src/ClearCaseCmdLineParser.cpp 2006-11-17 14:27:57 UTC (rev 3812)
@@ -0,0 +1,122 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file ClearCaseCmdLineParser.cpp
+ *
+ * @brief ClearCaseCmdLineParser class implemantation.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id: CmdLineParser.cpp $
+
+#include "StdAfx.h"
+
+#include "ClearCaseCmdLineParser.h"
+#include "MainFrm.h"
+#include "MergeCmdLineInfo.h"
+#include "Paths.h"
+
+ClearCaseCmdLineParser::ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szFileName) :
+ CmdLineParser(CmdLineInfo),
+ m_bDesc(false),
+ m_bBaseFile(false),
+ m_bOutFile(false)
+{
+ m_CmdLineInfo.m_bEscShutdown = true;
+
+ m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY | FFILEOPEN_NOMRU;
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+
+ // szFileName is either "xmerge" or "xcompare".
+ if (lstrcmpi(szFileName, _T("xmerge")))
+ {
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
+
+ // Compare tool doesn't have a common ancestor file description. We
+ // put a phony description so the command line parser will skip it.
+ m_sBaseDesc = _T("<No Base>");
+ }
+}
+
+void ClearCaseCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
+{
+ if (TRUE == bFlag)
+ {
+ if (!lstrcmpi(pszParam, _T("base")))
+ {
+ // -base is followed by common ancestor file description.
+ m_bBaseFile = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("out")))
+ {
+ // -out is followed by merge's output file name.
+ m_bOutFile = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("fname")))
+ {
+ // -fname is followed by file description.
+ m_bDesc = true;
+ }
+ }
+ else
+ {
+ if ((m_bBaseFile == true) && m_sBaseFile.IsEmpty())
+ {
+ m_sBaseFile = pszParam;
+ }
+ else if ((m_bOutFile == true) && m_sOutFile.IsEmpty())
+ {
+ m_sOutFile = pszParam;
+ }
+ else if ((m_bDesc == true) && m_sBaseDesc.IsEmpty())
+ {
+ m_sBaseDesc = pszParam;
+ m_bDesc = false;
+ }
+ else if ((m_bDesc == true) && m_CmdLineInfo.m_sLeftDesc.IsEmpty())
+ {
+ m_CmdLineInfo.m_sLeftDesc = pszParam;
+ m_bDesc = false;
+ }
+ else if ((m_bDesc == true) && m_CmdLineInfo.m_sRightDesc.IsEmpty())
+ {
+ m_CmdLineInfo.m_sRightDesc = pszParam;
+ }
+ else
+ {
+ CString sFile = paths_GetLongPath(pszParam);
+ m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
+ m_CmdLineInfo.m_nFiles += 1;
+ }
+ }
+
+ if (TRUE == bLast)
+ {
+ if (FALSE == m_sOutFile.IsEmpty())
+ {
+ CString sFile = paths_GetLongPath(m_sOutFile);
+ m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
+ m_CmdLineInfo.m_nFiles += 1;
+ }
+ }
+}
Added: trunk/Src/ClearCaseCmdLineParser.h
===================================================================
--- trunk/Src/ClearCaseCmdLineParser.h (rev 0)
+++ trunk/Src/ClearCaseCmdLineParser.h 2006-11-17 14:27:57 UTC (rev 3812)
@@ -0,0 +1,71 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
+#define _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
+
+/**
+ * @file ClearCaseCmdLineParser.h
+ *
+ * @brief ClearCaseCmdLineParser class decleration.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id: CmdLineParser.h $
+
+#include "CmdLineParser.h"
+
+/**
+ * @brief Rational ClearCase's command line parser.
+ *
+ * This parser is able to parse ClearCase external tools' command line, both
+ * compare and merge.
+ *
+ */
+class ClearCaseCmdLineParser : public CmdLineParser
+{
+public:
+
+ /** @brief ClearCaseCmdLineParser's constructor.
+ *
+ * @param [in] szFileName Executable file name. Required in order to
+ * know which external tool was executed.
+ *
+ */
+ ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szFileName);
+
+ virtual ~ClearCaseCmdLineParser() { }
+
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
+
+private:
+
+ bool m_bDesc;
+ bool m_bBaseFile; /**< Files' common ancestor. Used till we'll have a 3-ways merge. */
+ bool m_bOutFile;
+
+ CString m_sBaseFile;
+ CString m_sBaseDesc;
+ CString m_sOutFile;
+};
+
+#endif // _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
Added: trunk/Src/CmdLineParser.h
===================================================================
--- trunk/Src/CmdLineParser.h (rev 0)
+++ trunk/Src/CmdLineParser.h 2006-11-17 14:27:57 UTC (rev 3812)
@@ -0,0 +1,84 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _CMD_LINE_PARSER_INCLUDED_
+#define _CMD_LINE_PARSER_INCLUDED_
+
+/**
+ * @file CmdLineParser.h
+ *
+ * @brief CmdLineParser class declaration.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id: CmdLineParser.h $
+
+class MergeCmdLineInfo;
+
+/**
+ * @brief Base command line parser interface.
+ *
+ * WinMerge is able to parse command line arguments other than its own. In
+ * order to add this capability, a developer should inherit this class and
+ * implement the ParseParam method.
+ *
+ */
+class CmdLineParser
+{
+public:
+
+ /** @brief CmdLineParser's constructor.
+ *
+ * @param [in] CmdLineInfo A class which hold the information obtained
+ * from the command line arguments.
+ *
+ */
+ CmdLineParser(MergeCmdLineInfo& CmdLineInfo) :
+ m_CmdLineInfo(CmdLineInfo)
+ {
+
+ }
+
+ /** @brief CmdLineParser's destructor. */
+ virtual ~CmdLineParser() { }
+
+
+ /** @brief The command line argument parser.
+ *
+ * This method should be implemented by the derived class and do the
+ * actual parsing.
+ *
+ * @param [in] pszParam The parameter or flag.
+ * @bFlag [in] bFlag Indicates whether pszParam is a parameter or a
+ * flag.
+ * @bLast [in] bLast Indicates if this is the last parameter or flag
+ * on the command line.
+ *
+ */
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast) = 0;
+
+protected:
+
+ MergeCmdLineInfo& m_CmdLineInfo;
+};
+
+#endif // _CMD_LINE_PARSER_INCLUDED_
Deleted: trunk/Src/Common/CmdArgs.cpp
===================================================================
--- trunk/Src/Common/CmdArgs.cpp 2006-11-17 14:23:07 UTC (rev 3811)
+++ trunk/Src/Common/CmdArgs.cpp 2006-11-17 14:27:57 UTC (rev 3812)
@@ -1,148 +0,0 @@
-/* The X License
-Copyright (c) 2005 Perry Rapp
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/**
- * @file CmdArgs.cpp
- *
- * @brief Implementation of CmdArgs class
- *
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#include "stdafx.h"
-#include "CmdArgs.h"
-
-#ifndef __AFXTEMPL_H__
-#include <afxtempl.h>
-#endif
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// helper class StringMap
-
-class StringMap : public CMap<CString, LPCTSTR, CString, CString>
-{
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// main class CmdArgs
-
-CmdArgs::CmdArgs(int argc, TCHAR *argv[])
-{
- m_switches = new StringMap;
- m_switchesCapitalized = new StringMap;
- m_params = new CStringArray;
-
- Parse(argc, argv);
-}
-CmdArgs::~CmdArgs()
-{
- delete m_switches; m_switches=0;
- delete m_switchesCapitalized; m_switchesCapitalized=0;
- delete m_params; m_params=0;
-}
-
-void CmdArgs::Clear()
-{
- m_switches->RemoveAll();
- m_switchesCapitalized->RemoveAll();
- m_params->RemoveAll();
-}
-
-void CmdArgs::Parse(int argc, TCHAR *argv[])
-{
- Clear();
-
- for (int i = 1; i < argc; i++)
- {
- CString arg = argv[i];
- if (arg.GetLength()>0 && (arg[0] == '-' || arg[0] == '/'))
- {
- CString value;
- // advance over flag specifier
- arg = arg.Mid(1);
- int index = arg.Find(':');
- if (index >= 0)
- { // switch has value
- value = arg.Mid(index+1);
- arg = arg.Left(index);
- }
- m_switches->SetAt(arg, value);
- arg.MakeUpper();
- m_switchesCapitalized->SetAt(arg, value);
- }
- else
- {
- m_params->Add(arg);
- }
- }
-}
-
-int
-CmdArgs::GetParamsCount() const
-{
- return m_params->GetSize();
-}
-
-CString
-CmdArgs::GetParam(int i) const
-{
- return m_params->GetAt(i);
-}
-
-/**
- * @brief Lookup a switch (encapsulating case-insensitive logic)
- */
-BOOL
-CmdArgs::Lookup(LPCTSTR key, CString & value, bool CaseSensitive) const
-{
- CString lookup = key;
- if (!CaseSensitive)
- lookup.MakeUpper();
- StringMap * map = (CaseSensitive ? m_switches : m_switchesCapitalized);
- return map->Lookup(lookup, value);
-}
-
-/**
- * @brief returns true if specified switch was present with no value (no colon)
- */
-bool
-CmdArgs::HasEmptySwitch(LPCTSTR name, bool CaseSensitive) const
-{
- CString value;
- if (!Lookup(name, value, CaseSensitive))
- return false;
- return value.IsEmpty()!=FALSE;
-}
-
-/**
- * @brief returns true if specified switch was present
- */
-bool
-CmdArgs::HasSwitch(LPCTSTR name, bool CaseSensitive) const
-{
- CString value;
- return GetSwitch(name, value, CaseSensitive);
-}
-
-/**
- * @brief Gets value of requested switch if found
- */
-bool
-CmdArgs::GetSwitch(LPCTSTR name, CString & value, bool CaseSensitive) const
-{
- if (!Lookup(name, value, CaseSensitive))
- return false;
- return true;
-}
-
Deleted: trunk/Src/Common/CmdArgs.h
===================================================================
--- trunk/Src/Common/CmdArgs.h 2006-11-17 14:23:07 UTC (rev 3811)
+++ trunk/Src/Common/CmdArgs.h 2006-11-17 14:27:57 UTC (rev 3812)
@@ -1,52 +0,0 @@
-/**
- * @file CmdArgs.h
- *
- * @brief Defines the CmdArgs class, which parses & stores commandline arguments for querying
- *
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef CmdArgs_h_included
-#define CmdArgs_h_included
-
-#ifndef __AFXTEMPL_H__
-#include <afxtempl.h>
-#endif
-
-class StringMap;
-
-class CmdArgs
-{
-public:
- CmdArgs(int argc, TCHAR *argv[]);
- ~CmdArgs();
-
-// Settings
- void SetCaseSensitive(bool CaseSensitive=true) { m_CaseSensitive = CaseSensitive; }
-
-// Implementation but available for reparsing
- void Parse(int argc, TCHAR *argv[]);
- void Clear();
-
-// Querying parsed results
- bool HasEmptySwitch(LPCTSTR name, bool CaseSensitive=true) const;
- bool HasSwitch(LPCTSTR name, bool CaseSensitive=true) const;
- bool GetSwitch(LPCTSTR name, CString & value, bool CaseSensitive=true) const;
-
- int GetParamsCount() const;
- CString GetParam(int i) const;
-
-// Implementation methods
-private:
- BOOL Lookup(LPCTSTR key, CString & value, bool CaseSensitive) const;
-
-// Implementation data
-private:
- StringMap * m_switches;
- StringMap * m_switchesCapitalized;
- CStringArray * m_params;
- bool m_CaseSensitive;
-};
-
-#endif // CmdArgs_h_included
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-11-17 14:23:07 UTC (rev 3811)
+++ trunk/Src/MainFrm.cpp 2006-11-17 14:27:57 UTC (rev 3812)
@@ -69,6 +69,7 @@
#include "PreferencesDlg.h"
#include "AppSerialize.h"
#include "ProjectFilePathsDlg.h"
+#include "MergeCmdLineInfo.h"
/*
One source file must compile the stubs for multimonitor
@@ -384,7 +385,7 @@
// Finds debug menu by looking for a submenu which
// starts with item ID_DEBUG_LOADCONFIG
- for (int i=0; i< menu->GetMenuItemCount(); ++i)
+ for (UINT i = 0; i < menu->GetMenuItemCount(); ++i)
{
if (menu->GetSubMenu(i)->GetMenuItemID(0) == ID_DEBUG_LOADCONFIG)
{
@@ -2697,10 +2698,10 @@
}
/**
- * @brief Receive commandline from another instance.
+ * @brief Receive command line from another instance.
*
- * This function receives commandline when only single-instance
- * is allowed. New instance tried to start sends its commandline
+ * This function receives command line when only single-instance
+ * is allowed. New instance tried to start sends its command line
* to here so we can open paths it was meant to.
*/
LRESULT CMainFrame::OnCopyData(WPARAM wParam, LPARAM lParam)
@@ -2710,7 +2711,7 @@
int argc = pCopyData->dwData;
TCHAR **argv = new (TCHAR *[argc]);
USES_CONVERSION;
-
+
for (int i = 0; i < argc; i++)
{
argv[i] = new TCHAR[lstrlenW(p) * (sizeof(WCHAR)/sizeof(TCHAR)) + 1];
@@ -2726,15 +2727,31 @@
LRESULT CMainFrame::OnUser(WPARAM wParam, LPARAM lParam)
{
- int argc = (int)wParam;
- TCHAR **argv = (TCHAR **)lParam;
+ // MFC's ParseCommandLine method is working with __argc and __targv
+ // variables. We need to send MergeCmdLineInfo object rather than
+ // passing the command line as string. Until we do, we temporary
+ // change these variable values and restore then after parsing.
- theApp.ParseArgsAndDoOpen(argc, argv, this);
-
- for (int i = 0; i < argc; i++)
- delete[] argv[i];
- delete [] argv;
+ int argc = __argc;
+ TCHAR **argv = __targv;
+ __argc = wParam;
+ __targv = reinterpret_cast<TCHAR **>(lParam);
+
+ MergeCmdLineInfo cmdInfo(*__targv);
+ theApp.ParseCommandLine(cmdInfo);
+ theApp.ParseArgsAndDoOpen(cmdInfo, this);
+
+ // Delete memrory allocated in OnCopyData method.
+ for (int i = 0; i < argc; ++i)
+ {
+ delete[] __targv[i];
+ }
+ delete __targv;
+
+ __argc = argc;
+ __targv = argv;
+
return TRUE;
}
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-11-17 14:23:07 UTC (rev 3811)
+++ trunk/Src/Merge.cpp 2006-11-17 14:27:57 UTC (rev 3812)
@@ -48,6 +48,8 @@
#include "ProjectFile.h"
#include "MergeEditView.h"
#include "LanguageSelect.h"
+#include "OptionsDef.h"
+#include "MergeCmdLineInfo.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -90,41 +92,22 @@
static void AddEnglishResourceHook();
-class CMergeCmdLineInfo : public CCommandLineInfo
+/**
+* @brief Mapping from command line argument name (eg, ignorews) to WinMerge
+* option name (eg, Settings/IgnoreSpace).
+*
+* These arguments take an optional colon and number, like so:
+*
+* "/ignoreblanklines" (makes WinMerge ignore blank lines)
+* "/ignoreblanklines:1" (makes WinMerge ignore blank lines)
+* "/ignoreblanklines:0" (makes WinMerge not ignore blank lines)
+*/
+struct ArgSetting
{
- public:
-
- CMergeCmdLineInfo();
-
- ~CMergeCmdLineInfo() { }
-
- virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
-
- public:
-
- BOOL m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
+ LPCTSTR CmdArgName;
+ LPCTSTR WinMergeOptionName;
};
-CMergeCmdLineInfo::CMergeCmdLineInfo() : CCommandLineInfo(),
- m_bSingleInstance(FALSE)
-{
-
-}
-
-void CMergeCmdLineInfo::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
-{
- // Give our base class a chance to figure out what is the parameter.
- CCommandLineInfo::ParseParam(pszParam, bFlag, bLast);
-
- if (TRUE == bFlag)
- {
- if (pszParam[0] == _T('s'))
- {
- m_bSingleInstance = TRUE;
- }
- }
-}
-
/////////////////////////////////////////////////////////////////////////////
// CMergeApp construction
@@ -132,11 +115,9 @@
m_bNeedIdleTimer(FALSE)
, m_pDiffTemplate(0)
, m_pDirTemplate(0)
-// FileFilterHelper m_globalFileFilter
, m_mainThreadScripts(NULL)
, m_nLastCompareResult(0)
-, m_bNoninteractive(false)
-, m_bShowUsage(false)
+, m_bNonInteractive(false)
{
// add construction code here,
// Place all significant initialization in InitInstance
@@ -195,7 +176,7 @@
#endif
// Parse command-line arguments.
- CMergeCmdLineInfo cmdInfo;
+ MergeCmdLineInfo cmdInfo(*__targv);
ParseCommandLine(cmdInfo);
// Set default codepage
@@ -206,7 +187,7 @@
SetRegistryKey(_T("Thingamahoochie"));
BOOL bSingleInstance = GetProfileInt(_T("Settings"), _T("SingleInstance"), FALSE) ||
- (TRUE == cmdInfo.m_bSingleInstance);
+ (true == cmdInfo.m_bSingleInstance);
HANDLE hMutex = NULL;
if (bSingleInstance)
@@ -309,41 +290,30 @@
CMenu * pNewMenu = CMenu::FromHandle(pMainFrame->m_hMenuDefault);
pMainFrame->MDISetMenu(pNewMenu, NULL);
- // Command line parsing is handled not by MFC wizard's CComandLineInfo
- // but rather by ParseArgsAndDoOpen below
-
//Track it so any other instances can find it.
instanceChecker.TrackFirstInstanceRunning();
- // The main window has been initialized, so show and update it.
- //pMainFrame->ShowWindow(m_nCmdShow);
- pMainFrame->ActivateFrame(m_nCmdShow);
+ // The main window has been initialized, so activate and update it.
+ pMainFrame->ActivateFrame(cmdInfo.m_nCmdShow);
pMainFrame->UpdateWindow();
// Since this function actually opens paths for compare it must be
// called after initializing CMainFrame!
- ParseArgsAndDoOpen(__argc, __targv, pMainFrame);
+ ParseArgsAndDoOpen(cmdInfo, pMainFrame);
- if (m_bShowUsage)
- {
- CString s = GetUsageDescription();
- AfxMessageBox(s, MB_ICONINFORMATION);
- m_bNoninteractive = false;
- }
-
if (hMutex)
{
ReleaseMutex(hMutex);
CloseHandle(hMutex);
}
- if (m_bNoninteractive)
+ if (m_bNonInteractive)
{
DirViewList DirViews;
pMainFrame->GetDirViews(&DirViews);
if (DirViews.GetCount() == 1)
{
- CDirView * pDirView = DirViews.RemoveHead();
+ CDirView *pDirView = DirViews.RemoveHead();
CDirFrame *pf = pDirView->GetParentFrame();
}
pMainFrame->PostMessage(WM_CLOSE, 0, 0);
@@ -595,7 +565,7 @@
// do not show again checkbox, and implements it on subsequent calls
// (if caller set the style)
- if (m_bNoninteractive)
+ if (m_bNonInteractive)
return IDCANCEL;
// Create the message box dialog.
@@ -646,6 +616,109 @@
m_globalFileFilter.LoadAllFileFilters();
}
+/** @brief Read command line arguments and open files for comparison.
+ *
+ * The name of the function is a legacy code from the time that this function
+ * actually parsed the command line. Today the parsing is done using the
+ * MergeCmdLineInfo class.
+ *
+ */
+void CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame)
+{
+ m_bNonInteractive = cmdInfo.m_bNonInteractive;
+
+ SetOptionsFromCmdLine(cmdInfo);
+
+ // Do not load or remember options (preferences).
+ if (cmdInfo.m_bNoPrefs)
+ {
+ // Turn off serializing to registry.
+ GetOptionsMgr()->SetSerializing(false);
+ // Load all default settings.
+ pMainFrame->ResetOptions();
+ }
+
+ // Set the global file filter.
+ if (!cmdInfo.m_sFileFilter.IsEmpty())
+ {
+ m_globalFileFilter.SetFilter(cmdInfo.m_sFileFilter);
+ }
+
+ // Unless the user has requested to see WinMerge's usage open files for
+ // comparison.
+ if (cmdInfo.m_bShowUsage)
+ {
+ CString s = GetUsageDescription();
+ AfxMessageBox(s, MB_ICONINFORMATION);
+ }
+ else
+ {
+ // Set the required information we need from the command line:
+
+ pMainFrame->m_bClearCaseTool = cmdInfo.m_bClearCaseTool;
+ pMainFrame->m_bExitIfNoDiff = cmdInfo.m_bExitIfNoDiff;
+ pMainFrame->m_bEscShutdown = cmdInfo.m_bEscShutdown;
+
+ pMainFrame->m_strSaveAsPath = _T("");
+
+ pMainFrame->m_strLeftDesc = cmdInfo.m_sLeftDesc;
+ pMainFrame->m_strRightDesc = cmdInfo.m_sRightDesc;
+
+ if (cmdInfo.m_nFiles > 2)
+ {
+ pMainFrame->m_strSaveAsPath = cmdInfo.m_Files[2];
+ pMainFrame->DoFileOpen(cmdInfo.m_Files[0], cmdInfo.m_Files[1],
+ cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer);
+ }
+ else if (cmdInfo.m_nFiles > 1)
+ {
+ cmdInfo.m_dwLeftFlags |= FFILEOPEN_CMDLINE;
+ cmdInfo.m_dwRightFlags |= FFILEOPEN_CMDLINE;
+ pMainFrame->DoFileOpen(cmdInfo.m_Files[0], cmdInfo.m_Files[1],
+ cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer);
+ }
+ else if (cmdInfo.m_nFiles == 1)
+ {
+ CString sFilepath = cmdInfo.m_Files[0];
+ if (IsProjectFile(sFilepath))
+ {
+ LoadAndOpenProjectFile(sFilepath);
+ }
+ else
+ {
+ cmdInfo.m_dwRightFlags = FFILEOPEN_NONE;
+ pMainFrame->DoFileOpen(sFilepath, _T(""),
+ cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer);
+ }
+ }
+ }
+}
+
+/** @brief Handle all command line arguments which are mapped to WinMerge options. */
+void CMergeApp::SetOptionsFromCmdLine(const MergeCmdLineInfo& cmdInfo)
+{
+ static const ArgSetting f_ArgSettings[] =
+ {
+ { _T("ignorews"), OPT_CMP_IGNORE_WHITESPACE },
+ { _T("ignoreblanklines"), OPT_CMP_IGNORE_BLANKLINES },
+ { _T("ignorecase"), OPT_CMP_IGNORE_CASE },
+ { _T("ignoreeol"), OPT_CMP_IGNORE_EOL }
+ };
+
+ for (int i = 0; i < countof(f_ArgSettings); ++i)
+ {
+ const ArgSetting& argSetting = f_ArgSettings[i];
+ LPCTSTR szCmdArgName = argSetting.CmdArgName;
+ LPCTSTR szOptionName = argSetting.WinMergeOptionName;
+ CString sValue;
+
+ if (cmdInfo.m_Settings.Lookup(szCmdArgName, sValue))
+ {
+ GetOptionsMgr()->CoerceAndSaveOption(szOptionName, sValue);
+ }
+ }
+}
+
/** @brief Open help from mainframe when user presses F1*/
void CMergeApp::OnHelp()
{
@@ -741,3 +814,32 @@
{
m_pLangDlg->ReloadMenu();
}
+
+/** @brief Wrap one line of cmdline help in appropriate whitespace */
+static CString CmdlineOption(int idres)
+{
+ CString str = LoadResString(idres) + _T(" \n");
+ return str;
+}
+
+/** @brief Put together string of all cmdline arguments */
+CString CMergeApp::GetUsageDescription()
+{
+ CString str;
+ str += LoadResString(IDS_CMDLINE_SYNTAX);
+ str += _T(" [/f ") + LoadResString(IDS_CMDLINE_SYNTAX_ARG_FILTER) + _T("]");
+ str += _T(" ");
+ str += LoadResString(IDS_CMDLINE_SYNTAX_ARGS);
+ str += _T("\n\n") + LoadResString(IDS_CMDLINE_WHERE) + _T(" \n");
+ str += CmdlineOption(IDS_CMDLINE_HELP);
+ str += CmdlineOption(IDS_CMDLINE_RECURSIVE);
+ str += CmdlineOption(IDS_CMDLINE_ESCKEY);
+ str += CmdlineOption(IDS_CMDLINE_FILEMASK);
+ str += CmdlineOption(IDS_CMDLINE_FASTCLOSE);
+ str += CmdlineOption(IDS_CMDLINE_SINGLE_INST);
+ str += CmdlineOption(IDS_CMDLINE_LEFTPATH);
+ str += CmdlineOption(IDS_CMDLINE_RIGHTPATH);
+ str += CmdlineOption(IDS_CMDLINE_OUTPUTPATH);
+ str += _T("\n\n") + LoadResString(IDS_CMDLINE_SEEMANUAL);
+ return str;
+}
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-11-17 14:23:07 UTC (rev 3811)
+++ trunk/Src/Merge.dsp 2006-11-17 14:27:57 UTC (rev 3812)
@@ -205,7 +205,7 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\CmdArgs.cpp
+SOURCE=.\ClearCaseCmdLineParser.cpp
# End Source File
# Begin Source File
@@ -537,7 +537,7 @@
# End Source File
# Begin Source File
-SOURCE=.\MergeArgs.cpp
+SOURCE=.\MergeCmdLineInfo.cpp
# End Source File
# Begin Source File
@@ -933,6 +933,10 @@
# End Source File
# Begin Source File
+SOURCE=.\WinMergeCmdLineParser.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\WMGotoDlg.cpp
# End Source File
# End Group
@@ -973,10 +977,14 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\CmdArgs.h
+SOURCE=.\ClearCaseCmdLineParser.h
# End Source File
# Begin Source File
+SOURCE=.\CmdLineParser.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\CMoveConstraint.h
# End Source File
# Begin Source File
@@ -1237,6 +1245,10 @@
# End Source File
# Begin Source File
+SOURCE=.\MergeCmdLineInfo.h
+# End Source File
+# Begin Source File
+
SOURCE=.\MergeDiffDetailView.h
# End Source File
# Begin Source File
@@ -1513,6 +1525,10 @@
# End Source File
# Begin Source File
+SOURCE=.\WinMergeCmdLineParser.h
+# End Source File
+# Begin Source File
+
SOURCE=.\WMGotoDlg.h
# End Source File
# End Group
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2006-11-17 14:23:07 UTC (rev 3811)
+++ trunk/Src/Merge.h 2006-11-17 14:27:57 UTC (rev 3812)
@@ -42,6 +42,7 @@
class CAssureScriptsForThread;
class CMainFrame;
class CLanguageSelect;
+class MergeCmdLineInfo;
/////////////////////////////////////////////////////////////////////////////
// CMergeApp:
@@ -86,13 +87,8 @@
virtual BOOL PreTranslateMessage(MSG* pMsg);
void InitializeFileFilters();
-
- // In MergeArgs.cpp
- void ParseArgs(int argc, TCHAR *argv[], CMainFrame* pMainFrame, CStringArray & files, UINT & nFiles, BOOL & recurse,
- DWORD & dwLeftFlags, DWORD & dwRightFlags, CString & prediffer);
- void ParseCCaseArgs(int argc, TCHAR *argv[], CMainFrame* pMainFrame, CStringArray & files, UINT & nFiles,
- DWORD & dwLeftFlags, DWORD & dwRightFlags);
- void ParseArgsAndDoOpen(int argc, TCHAR *argv[], CMainFrame* pMainFrame);
+ void ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame);
+ void SetOptionsFromCmdLine(const MergeCmdLineInfo& cmdInfo);
CString GetUsageDescription();
// End MergeArgs.cpp
@@ -111,8 +107,7 @@
private:
CAssureScriptsForThread * m_mainThreadScripts;
int m_nLastCompareResult;
- bool m_bNoninteractive;
- bool m_bShowUsage;
+ bool m_bNonInteractive;
};
extern CMergeApp theApp;
Deleted: trunk/Src/MergeArgs.cpp
===================================================================
--- trunk/Src/MergeArgs.cpp 2006-11-17 14:23:07 UTC (rev 3811)
+++ trunk/Src/MergeArgs.cpp 2006-11-17 14:27:57 UTC (rev 3812)
@@ -1,420 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// 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.
-//
-/////////////////////////////////////////////////////////////////////////////
-/**
- * @file MergeArgs.cpp
- *
- * @brief Command line argument handling for WinMerge application
- *
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#include "stdafx.h"
-#include "Merge.h"
-
-#include "MainFrm.h"
-#include "CmdArgs.h"
-#include "paths.h"
-#include "OptionsDef.h"
-
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-
-/**
- * @brief Mapping from commandline argument name (eg, ignorews) to WinMerge option name (eg, Settings/IgnoreSpace)
- *
- * These arguments take an optional colon and number, like so:
- * "/ignoreblanklines" (makes WinMerge ignore blank lines)
- * "/ignoreblanklines:1" (makes WinMerge ignore blank lines)
- * "/ignoreblanklines:0" (makes WinMerge not ignore blank lines)
- */
-struct ArgSetting
-{
- LPCTSTR CmdArgName;
- LPCTSTR WinMergeOptionName;
-};
-static ArgSetting f_ArgSettings[] =
-{
- { _T("ignorews"), OPT_CMP_IGNORE_WHITESPACE }
- , { _T("ignoreblanklines"), OPT_CMP_IGNORE_BLANKLINES }
- , { _T("ignorecase"), OPT_CMP_IGNORE_CASE }
- , { _T("ignoreeol"), OPT_CMP_IGNORE_EOL }
-};
-
-
-/**
- * @brief Process command line arguments and open requested files/dirs if appropriate
- */
-void
-CMergeApp::ParseArgsAndDoOpen(int argc, TCHAR *argv[], CMainFrame* pMainFrame)
-{
- UINT nFiles=0;
- DWORD dwLeftFlags = FFILEOPEN_CMDLINE;
- DWORD dwRightFlags = FFILEOPEN_CMDLINE;
- BOOL recurse=FALSE;
- CString prediffer;
- CStringArray files;
- files.SetSize(2);
-
- // Split commandline arguments into files & flags & recursive flag
-
- // Rational ClearCase has a weird way of executing external
- // tools which replace the build-in ones. It also doesn't allow
- // you to define which parameters to send to the executable.
- // So, in order to run as an external tool, WinMerge should do:
- // if argv[0] is "xcompare" then it "knows" that it was
- // executed from ClearCase. In this case, it should read and
- // parse ClearCase's command line parameters and not the
- // "regular" parameters. More information can be found in
- // C:\Program Files\Rational\ClearCase\lib\mgrs\mgr_info.h file.
-
- if (lstrcmpi(argv[0], _T("xcompare")) && lstrcmpi(argv[0], _T("xmerge")))
- {
- ParseArgs(argc, argv, pMainFrame, files, nFiles, recurse, dwLeftFlags, dwRightFlags, prediffer);
- if (m_bShowUsage)
- return;
- }
- else
- {
- ParseCCaseArgs(argc, argv, pMainFrame, files, nFiles, dwLeftFlags, dwRightFlags);
- }
-
- pMainFrame->m_strSaveAsPath = _T("");
-
- if (nFiles > 2)
- {
- pMainFrame->m_strSaveAsPath = files[2];
- pMainFrame->DoFileOpen(files[0], files[1],
- dwLeftFlags, dwRightFlags, recurse, NULL, prediffer);
- }
- else if (nFiles > 1)
- {
- dwLeftFlags |= FFILEOPEN_CMDLINE;
- dwRightFlags |= FFILEOPEN_CMDLINE;
- pMainFrame->DoFileOpen(files[0], files[1],
- dwLeftFlags, dwRightFlags, recurse, NULL, prediffer);
- }
- else if (nFiles == 1)
- {
- CString sFilepath = files[0];
- if (IsProjectFile(sFilepath))
- {
- LoadAndOpenProjectFile(sFilepath);
- }
- else
- {
- dwRightFlags = FFILEOPEN_NONE;
- pMainFrame->DoFileOpen(sFilepath, _T(""),
- dwLeftFlags, dwRightFlags, recurse, NULL, prediffer);
- }
- }
-}
-
-/**
- * @brief Process all command line arguments
- */
-void
-CMergeApp::ParseArgs(int argc, TCHAR *argv[], CMainFrame* pMainFrame, CStringArray & files, UINT & nFiles, BOOL & recurse,
- DWORD & dwLeftFlags, DWORD & dwRightFlags, CString & prediffer)
-{
- CmdArgs cmdArgs(argc, argv);
-
- // -? for help
- if (cmdArgs.HasEmptySwitch(_T("?")))
- {
- m_bShowUsage = true;
- }
-
- cmdArgs.SetCaseSensitive(false);
-
- // -r to compare recursively
- if (cmdArgs.HasEmptySwitch(_T("r")))
- recurse = TRUE;
-
- // -e to allow closing with single esc press
- if (cmdArgs.HasEmptySwitch(_T("e")))
- pMainFrame->m_bEscShutdown = TRUE;
-
- // -x to close application if files are identical.
- if (cmdArgs.HasEmptySwitch(_T("x")))
- pMainFrame->m_bExitIfNoDiff = TRUE;
-
- // -wl to open left path as read-only
- if (cmdArgs.HasEmptySwitch(_T("wl")))
- dwLeftFlags |= FFILEOPEN_READONLY;
-
- // -wr to open right path as read-only
- if (cmdArgs.HasEmptySwitch(_T("wr")))
- dwRightFlags |= FFILEOPEN_READONLY;
-
- // -ul to not add left path to MRU
- if (cmdArgs.HasEmptySwitch(_T("ul")))
- dwLeftFlags |= FFILEOPEN_NOMRU;
-
- // -ur to not add right path to MRU
- if (cmdArgs.HasEmptySwitch(_T("ur")))
- dwRightFlags |= FFILEOPEN_NOMRU;
-
- // -ub to add neither right nor left path to MRU
- if (cmdArgs.HasEmptySwitch(_T("ub")))
- {
- dwLeftFlags |= FFILEOPEN_NOMRU;
- dwRightFlags |= FFILEOPEN_NOMRU;
- }
-
- // -noninteractive to suppress message boxes & close with result code
- if (cmdArgs.HasEmptySwitch(_T("noninteractive")))
- {
- m_bNoninteractive = true;
- }
-
- // Get prediffer if specified (otherwise prediffer will be blank, which is default)
- cmdArgs.GetSwitch(_T("prediffer"), prediffer);
-
- if (cmdArgs.HasSwitch(_T("noprefs")))
- {
- // /noprefs means do not load or remember options (preferences)
-
- // turn off serializing to registry
- GetOptionsMgr()->SetSerializing(false);
- // load all default settings
- GetMainFrame()->ResetOptions();
- }
-
- if (cmdArgs.HasSwitch(_T("minimize")))
- {
- // /minimize means minimize the main window
- m_nCmdShow = SW_MINIMIZE;
- }
-
- // Handle all switches in the f_ArgSettings table
- // this are arguments mapped to WinMerge options
- int i;
- for (i = 0; i < countof(f_ArgSettings); ++i)
- {
- const ArgSetting & argSetting = f_ArgSettings[i];
- LPCTSTR cmdargName = argSetting.CmdArgName;
- LPCTSTR optName = argSetting.WinMergeOptionName;
- CString value;
- if (cmdArgs.GetSwitch(cmdargName, value))
- {
- // eg, treat "/ignorews" as "/ignorews:1"
- if (value.IsEmpty())
- value = _T("1");
- GetOptionsMgr()->CoerceAndSaveOption(optName, value);
- }
- }
-
- // Can't get switches with arguments from cmdArgs
- // because cmdArgs recognizes arguments using colons not spaces
-
- for (i = 1; i < argc; i++)
- {
- LPCTSTR pszParam = argv[i];
- if (pszParam[0] == '-' || pszParam[0] == '/')
- {
- // remove flag specifier
- ++pszParam;
-
-
- // -dl "desc" - description for left file
- // Shown instead of filename
- if (!_tcsicmp(pszParam, _T("dl")))
- {
- if (i < (argc - 1))
- {
- LPCTSTR pszDesc = argv[i+1];
- pMainFrame->m_strLeftDesc = pszDesc;
- i++; // Just read next parameter
- }
- }
-
- // -dr "desc" - description for left file
- // Shown instead of filename
- if (!_tcsicmp(pszParam, _T("dr")))
- {
- if (i < (argc - 1))
- {
- LPCTSTR pszDesc = argv[i+1];
- pMainFrame->m_strRightDesc = pszDesc;
- i++; // Just read next parameter
- }
- }
-
- // -f "mask" - file filter mask ("*.h *.cpp")
- if (!_tcsicmp(pszParam, _T("f")))
- {
- if (i < (argc - 1))
- {
- CString sFilter = argv[i+1];
- sFilter.TrimLeft();
- sFilter.TrimRight();
- m_globalFileFilter.SetFilter(sFilter);
- i++; // Just read next parameter
- }
- }
- }
- else
- {
- CString sParam = pszParam;
- CString sFile = paths_GetLongPath(sParam);
- files.SetAtGrow(nFiles, sFile);
- nFiles++;
- }
- }
-
- // if "compare file dir" make it "compare file dir\file"
- if (nFiles >= 2)
- {
- PATH_EXISTENCE p1 = paths_DoesPathExist(files[0]);
- PATH_EXISTENCE p2 = paths_DoesPathExist(files[1]);
- if (p1 == IS_EXISTING_FILE && p2 == IS_EXISTING_DIR)
- {
- TCHAR fname[_MAX_PATH], fext[_MAX_PATH];
- _tsplitpath(files[0], NULL, NULL, fname, fext);
- if (files[1].Right(1) != _T('\\'))
- files[1] += _T('\\');
- files[1] = files[1] + fname + fext;
- }
- }
-
- // Reload menus in case a satellite language dll was loaded above
- ReloadMenu();
-}
-
-/// Process Rational ClearCase command line arguments
-void
-CMergeApp::ParseCCaseArgs(int argc, TCHAR *argv[], CMainFrame* pMainFrame, CStringArray & files, UINT & nFiles,
- DWORD & dwLeftFlags, DWORD & dwRightFlags)
-{
- CString *pDesc = NULL;
- CString sOutFile;
-
- pMainFrame->m_bClearCaseTool = TRUE;
- pMainFrame->m_bEscShutdown = TRUE;
-
- dwLeftFlags |= FFILEOPEN_READONLY | FFILEOPEN_NOMRU;
- dwRightFlags |= FFILEOPEN_NOMRU;
-
- if (lstrcmpi(argv[0], _T("xmerge")))
- {
- dwRightFlags |= FFILEOPEN_READONLY;
-
- // First description belong to the left file.
- pDesc = &(pMainFrame->m_strLeftDesc);
- }
-
- for (int i = 1; i < argc; i++)
- {
- LPCTSTR pszParam = argv[i];
- if (pszParam[0] == '-')
- {
- // remove flag specifier
- ++pszParam;
-
- if (!_tcsicmp(pszParam, _T("base")))
- {
- i++; // a 2-way merge doesn't need the common ancestor.
- }
-
- if (!_tcsicmp(pszParam, _T("out")))
- {
- if (i < (argc - 1))
- {
- sOutFile = argv[i+1];
- i++;
- }
- }
-
- // -fname "desc" - description for a file
- // Shown instead of filename
- if (!_tcsicmp(pszParam, _T("fname")))
- {
- if (i < (argc - 1))
- {
- if (NULL == pDesc)
- {
- // First description belong to the left file.
- pDesc = &(pMainFrame->m_strLeftDesc);
-
- i++; // Skip the common ancestor description.
- }
- else
- {
- LPCTSTR pszDesc = argv[i+1];
- *pDesc = pszDesc;
- i++; // Just read next parameter
-
- // Next description belong to the right file.
- pDesc = &(pMainFrame->m_strRightDesc);
- }
-
- }
- }
- }
- else
- {
- CString sFile = paths_GetLongPath(pszParam);
- files.SetAtGrow(nFiles, sFile);
- nFiles++;
- }
- }
-
- if (FALSE == sOutFile.IsEmpty())
- {
- files.SetAtGrow(nFiles, sOutFile);
- nFiles++;
- }
-}
-
-/** @brief Wrap one line of cmdline help in appropriate whitespace */
-static CString CmdlineOption(int idres)
-{
- CString str = LoadResString(idres) + _T(" \n");
- return str;
-}
-
-/** @brief Put together string of all cmdline arguments */
-CString CMergeApp::GetUsageDescription()
-{
- CString str;
- str += LoadResString(IDS_CMDLINE_SYNTAX);
- str += _T(" [/f ") + LoadResString(IDS_CMDLINE_SYNTAX_ARG_FILTER) + _T("]");
- str += _T(" ");
- str += LoadResString(IDS_CMDLINE_SYNTAX_ARGS);
- str += _T("\n\n") + LoadResString(IDS_CMDLINE_WHERE) + _T(" \n");
- str += CmdlineOption(IDS_CMDLINE_HELP);
- str += CmdlineOption(IDS_CMDLINE_RECURSIVE);
- str += CmdlineOption(IDS_CMDLINE_ESCKEY);
- str += CmdlineOption(IDS_CMDLINE_FILEMASK);
- str += CmdlineOption(IDS_CMDLINE_FASTCLOSE);
- str += CmdlineOption(IDS_CMDLINE_SINGLE_INST);
- str += CmdlineOption(IDS_CMDLINE_LEFTPATH);
- str += CmdlineOption(IDS_CMDLINE_RIGHTPATH);
- str += CmdlineOption(IDS_CMDLINE_OUTPUTPATH);
- str += _T("\n\n") + LoadResString(IDS_CMDLINE_SEEMANUAL);
- return str;
-}
Added: trunk/Src/MergeCmdLineInfo.cpp
===================================================================
--- trunk/Src/MergeCmdLineInfo.cpp (rev 0)
+++ trunk/Src/MergeCmdLineInfo.cpp 2006-11-17 14:27:57 UTC (rev 3812)
@@ -0,0 +1,93 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file CmdLineParser.h
+ *
+ * @brief CmdLineParser class implementation.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id: CmdLineParser.h $
+
+#include "StdAfx.h"
+
+#include <shlwapi.h> // Required for PathFindFileName
+
+#include "MainFrm.h"
+#include "MergeCmdLineInfo.h"
+#include "ClearCaseCmdLineParser.h"
+#include "WinMergeCmdLineParser.h"
+
+// MergeCmdLineInfo
+
+MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *szExeName) : CCommandLineInfo(),
+ m_nCmdShow(SW_SHOWNORMAL),
+ m_bClearCaseTool(false),
+ m_bEscShutdown(false),
+ m_bExitIfNoDiff(false),
+ m_bRecurse(false),
+ m_bNonInteractive(false),
+ m_bNoPrefs(false),
+ m_bSingleInstance(false),
+ m_bShowUsage(false),
+ m_dwLeftFlags(FFILEOPEN_CMDLINE),
+ m_dwRightFlags(FFILEOPEN_CMDLINE),
+ m_nFiles(0)
+{
+ m_Files.SetSize(2);
+
+ // Rational ClearCase has a weird way of executing external
+ // tools which replace the build-in ones. It also doesn't allow
+ // you to define which parameters to send to the executable.
+ // So, in order to run as an external tool, WinMerge should do:
+ // if argv[0] is "xcompare" then it "knows" that it was
+ // executed from ClearCase. In this case, it should read and
+ // parse ClearCase's command line parameters and not the
+ // "regular" parameters. More information can be found in
+ // C:\Program Files\Rational\ClearCase\lib\mgrs\mgr_info.h file.
+
+ LPTSTR szFileName = ::PathFindFileName(szExeName);
+
+ if (lstrcmpi(szFileName, _T("xcompare")) && lstrcmpi(szFileName, _T("xmerge")))
+ {
+ m_pCmdLineParser = new WinMergeCmdLineParser(*this);
+ }
+ else
+ {
+ m_bClearCaseTool = true;
+ m_pCmdLineParser = new ClearCaseCmdLineParser(*this, szFileName);
+ }
+}
+
+MergeCmdLineInfo::~MergeCmdLineInfo()
+{
+ delete m_pCmdLineParser;
+}
+
+void MergeCmdLineInfo::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
+{
+ // Give our base class a chance to figure out what is the parameter.
+ CCommandLineInfo::ParseParam(pszParam, bFlag, bLast);
+
+ m_pCmdLineParser->ParseParam(pszParam, bFlag, bLast);
+}
Added: trunk/Src/MergeCmdLineInfo.h
===================================================================
--- trunk/Src/MergeCmdLineInfo.h (rev 0)
+++ trunk/Src/MergeCmdLineInfo.h 2006-11-17 14:27:57 UTC (rev 3812)
@@ -0,0 +1,95 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MERGE_CMD_LINE_INFO_INCLUDED_
+#define _MERGE_CMD_LINE_INFO_INCLUDED_
+
+/**
+ * @file MergeCmdLineInfo.h
+ *
+ * @brief MergeCmdLineInfo class declaration.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id: MergeCmdLineInfo.h $
+
+class CmdLineParser;
+
+/**
+ * @brief WinMerge's command line handler.
+ *
+ */
+class MergeCmdLineInfo : public CCommandLineInfo
+{
+public:
+
+ /** @brief ClearCaseCmdLineParser's constructor.
+ *
+ * @param [in] szFileName Executable file name. Required in order to
+ * know which command line parser to create and use.
+ *
+ */
+ MergeCmdLineInfo(const TCHAR *szExeName);
+
+ ~MergeCmdLineInfo();
+
+ /** @brief Override CCommandLineInfo's method. */
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
+
+public:
+
+ int m_nCmdShow; /**< Initial state of the application's window. */
+
+ bool m_bClearCaseTool; /**< Running as Rational ClearCase external tool. */
+ bool m_bEscShutdown; /**< Pressing ESC will close the application */
+ bool m_bExitIfNoDiff; /**< Exit after telling the user that files are identical. */
+ bool m_bRecurse; /**< Include sub folder in directories compare. */
+ bool m_bNonInteractive; /**< Suppress user's notifications. */
+ bool m_bNoPrefs; /**< Do not load or remember preferences. */
+ bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
+ bool m_bShowUsage; /**< Show a brief reminder to command line arguments. */
+
+ DWORD m_dwLeftFlags; /**< Left side file's behavior options. */
+ DWORD m_dwRightFlags; /**< Right side file's behavior options. */
+
+ CString m_sLeftDesc; /**< Left side file's description. */
+ CString m_sRightDesc; /**< Right side file's description. */
+
+ CString m_sFileFilter; /**< File filter mask. */
+ CString m_sPreDiffer;
+
+ /**< Command line arguments which are mapped to WinMerge's preferences. */
+ CMapStringToString m_Settings;
+
+ CStringArray m_Files; /**< Files (or directories) to compare. */
+
+ int m_nFiles; /**< Number of files (or directories) in m_Files. */
+
+private:
+
+ /**< operator= is not implemented. */
+ MergeCmdLineInfo& operator=(const MergeCmdLineInfo& rhs);
+
+ CmdLineParser *m_pCmdLineParser; /**< The command line parser instance. */
+};
+
+#endif // _MERGE_CMD_LINE_INFO_INCLUDED_
Added: trunk/Src/WinMergeCmdLineParser.cpp
===================================================================
--- trunk/Src/WinMergeCmdLineParser.cpp (rev 0)
+++ trunk/Src/WinMergeCmdLineParser.cpp 2006-11-17 14:27:57 UTC (rev 3812)
@@ -0,0 +1,219 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+* @file WinMergeCmdLineParser.h
+*
+* @brief WinMergeCmdLineParser class implementation.
+*
+*/
+
+// RCS ID line follows -- this is updated by CVS
+// $Id: WinMergeCmdLineParser.cpp $
+
+#include "StdAfx.h"
+
+#include "MainFrm.h"
+#include "MergeCmdLineInfo.h"
+#include "WinMergeCmdLineParser.h"
+#include "Paths.h"
+
+WinMergeCmdLineParser::WinMergeCmdLineParser(MergeCmdLineInfo& CmdLineInfo) :
+ CmdLineParser(CmdLineInfo),
+ m_bPreDiff(false),
+ m_bFileFilter(false),
+ m_bLeftDesc(false),
+ m_bRightDesc(false)
+{
+
+}
+
+void WinMergeCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
+{
+ if (TRUE == bFlag)
+ {
+ if (!lstrcmp(pszParam, _T("?")))
+ {
+ // -? to show common command line arguments.
+ m_CmdLineInfo.m_bShowUsage = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("dl")))
+ {
+ // -dl "desc" - description for left file
+ m_bLeftDesc = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("dr")))
+ {
+ // -dr "desc" - description for right file
+ m_bRightDesc = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("e")))
+ {
+ // -e to allow closing with single esc press
+ m_CmdLineInfo.m_bEscShutdown = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("f")))
+ {
+ // -f "mask" - file filter mask ("*.h *.cpp")
+ m_bFileFilter = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("r")))
+ {
+ // -r to compare recursively
+ m_CmdLineInfo.m_bRecurse = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("s")))
+ {
+ // -s to allow only one instance
+ m_CmdLineInfo.m_bSingleInstance = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("noninteractive")))
+ {
+ // -noninteractive to suppress message boxes & close with result code
+ m_CmdLineInfo.m_bNonInteractive = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("noprefs")))
+ {
+ // -noprefs means do not load or remember options (preferences)
+ m_CmdLineInfo.m_bNoPrefs = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("minimize")))
+ {
+ // -minimize means minimize the main window.
+ m_CmdLineInfo.m_nCmdShow = SW_MINIMIZE;
+ }
+ else if (!lstrcmpi(pszParam, _T("maximize")))
+ {
+ // -maximize means maximize the main window.
+ m_CmdLineInfo.m_nCmdShow = SW_MAXIMIZE;
+ }
+ else if (!lstrcmpi(pszParam, _T("prediffer")))
+ {
+ // Get prediffer if specified (otherwise prediffer will be blank, which is default)
+ m_bPreDiff = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("wl")))
+ {
+ // -wl to open left path as read-only
+ m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY;
+ }
+ else if (!lstrcmpi(pszParam, _T("wr")))
+ {
+ // -wr to open right path as read-only
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
+ }
+ else if (!lstrcmpi(pszParam, _T("ul")))
+ {
+ // -ul to not add left path to MRU
+ m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
+ }
+ else if (!lstrcmpi(pszParam, _T("ur")))
+ {
+ // -ur to not add right path to MRU
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+ }
+ else if (!lstrcmpi(pszParam, _T("ub")))
+ {
+ // -ub to add neither right nor left path to MRU
+ m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+ }
+ else if (!lstrcmpi(pszParam, _T("x")))
+ {
+ // -x to close application if files are identical.
+ m_CmdLineInfo.m_bExitIfNoDiff = true;
+ }
+ else
+ {
+ CString sParam = pszParam;
+ CString sValue;
+
+ int nPos = sParam.ReverseFind(_T(':'));
+ if (nPos >= 0)
+ {
+ sParam = sParam.Left(nPos);
+ sValue = sParam.Mid(nPos + 1);
+ }
+ else
+ {
+ // Treat "/ignorews" as "/ignorews:1".
+ sValue = _T("1");
+ }
+
+ m_CmdLineInfo.m_Settings[sParam] = sValue;
+ }
+ }
+ else
+ {
+ if ((m_bPreDiff == true) && m_CmdLineInfo.m_sPreDiffer.IsEmpty())
+ {
+ m_CmdLineInfo.m_sPreDiffer = pszParam;
+ }
+ else if ((m_bFileFilter == true) && m_CmdLineInfo.m_sFileFilter.IsEmpty())
+ {
+ m_CmdLineInfo.m_sFileFilter = pszParam;
+ }
+ else if ((m_bRightDesc == true) && m_CmdLineInfo.m_sRightDesc.IsEmpty())
+ {
+ m_CmdLineInfo.m_sRightDesc = pszParam;
+ }
+ else if ((m_bLeftDesc == true) && m_CmdLineInfo.m_sLeftDesc.IsEmpty())
+ {
+ m_CmdLineInfo.m_sLeftDesc = pszParam;
+ }
+ else
+ {
+ CString sFile = paths_GetLongPath(pszParam);
+ m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
+ m_CmdLineInfo.m_nFiles += 1;
+ }
+ }
+
+ if (TRUE == bLast)
+ {
+ // If "compare file dir" make it "compare file dir\file".
+ if (m_CmdLineInfo.m_nFiles >= 2)
+ {
+ PATH_EXISTENCE p1 = paths_DoesPathExist(m_CmdLineInfo.m_Files[0]);
+ PATH_EXISTENCE p2 = paths_DoesPathExist(m_CmdLineInfo.m_Files[1]);
+
+ if ((p1 == IS_EXISTING_FILE) && (p2 == IS_EXISTING_DIR))
+ {
+ TCHAR fname[_MAX_PATH];
+ TCHAR fext[_MAX_PATH];
+
+ _tsplitpath(m_CmdLineInfo.m_Files[0], NULL, NULL, fname, fext);
+
+ if (m_CmdLineInfo.m_Files[1].Right(1) != _T('\\'))
+ {
+ m_CmdLineInfo.m_Files[1] += _T('\\');
+ }
+
+ m_CmdLineInfo.m_Files[1] = m_CmdLineInfo.m_Files[1] + fname + fext;
+ }
+ }
+
+ if (m_CmdLineInfo.m_bShowUsage)
+ {
+ m_CmdLineInfo.m_bNonInteractive = false;
+ }
+ }
+}
Added: trunk/Src/WinMergeCmdLineParser.h
===================================================================
--- trunk/Src/WinMergeCmdLineParser.h (rev 0)
+++ trunk/Src/WinMergeCmdLineParser.h 2006-11-17 14:27:57 UTC (rev 3812)
@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+* @file WinMergeCmdLineParser.h
+*
+* @brief WinMergeCmdLineParser class decleration.
+*
+*/
+
+// RCS ID line follows -- this is updated by CVS
+// $Id: WinMergeCmdLineParser.h $
+
+#pragma once
+
+#include "CmdLineParser.h"
+
+/**
+* @brief WinMerge's default command line parser.
+*
+*/
+class WinMergeCmdLineParser : public CmdLineParser
+{
+ public:
+
+ WinMergeCmdLineParser(MergeCmdLineInfo& CmdLineInfo);
+
+ virtual ~WinMergeCmdLineParser() { }
+
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
+
+ private:
+
+ bool m_bPreDiff;
+ bool m_bFileFilter;
+ bool m_bLeftDesc;
+ bool m_bRightDesc;
+};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-17 14:33:56
|
Revision: 3811
http://svn.sourceforge.net/winmerge/?rev=3811&view=rev
Author: galh
Date: 2006-11-17 06:23:07 -0800 (Fri, 17 Nov 2006)
Log Message:
-----------
PATCH: Moved white-space trimming to FileFilterHelper class
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileFilterHelper.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-16 19:54:43 UTC (rev 3810)
+++ trunk/Src/Changes.txt 2006-11-17 14:23:07 UTC (rev 3811)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-17 Gal
+ PATCH: Moved white-space trimming to FileFilterHelper class
+ Src: FileFilterHelper.cpp
+
2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)
2006-11-15 Kimmo
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2006-11-16 19:54:43 UTC (rev 3810)
+++ trunk/Src/FileFilterHelper.cpp 2006-11-17 14:23:07 UTC (rev 3811)
@@ -368,6 +368,10 @@
return FALSE;
}
+ // Remove leading and trailing whitespace characters from the string.
+ filter.TrimLeft();
+ filter.TrimRight();
+
// Star means we have a file extension mask
if (filter[0] == '*')
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-17 17:47:02
|
Revision: 3814
http://svn.sourceforge.net/winmerge/?rev=3814&view=rev
Author: galh
Date: 2006-11-17 09:46:59 -0800 (Fri, 17 Nov 2006)
Log Message:
-----------
Updated SVN properties of added files from patch 1598194 (rev 3812).
Revision Links:
--------------
http://svn.sourceforge.net/winmerge/?rev=3812&view=rev
Modified Paths:
--------------
trunk/Src/ClearCaseCmdLineParser.cpp
trunk/Src/ClearCaseCmdLineParser.h
trunk/Src/CmdLineParser.h
trunk/Src/MergeCmdLineInfo.cpp
trunk/Src/MergeCmdLineInfo.h
trunk/Src/WinMergeCmdLineParser.cpp
trunk/Src/WinMergeCmdLineParser.h
Property Changed:
----------------
trunk/Src/ClearCaseCmdLineParser.cpp
trunk/Src/ClearCaseCmdLineParser.h
trunk/Src/CmdLineParser.h
trunk/Src/MergeCmdLineInfo.cpp
trunk/Src/MergeCmdLineInfo.h
trunk/Src/WinMergeCmdLineParser.cpp
trunk/Src/WinMergeCmdLineParser.h
Modified: trunk/Src/ClearCaseCmdLineParser.cpp
===================================================================
--- trunk/Src/ClearCaseCmdLineParser.cpp 2006-11-17 16:23:12 UTC (rev 3813)
+++ trunk/Src/ClearCaseCmdLineParser.cpp 2006-11-17 17:46:59 UTC (rev 3814)
@@ -1,122 +1,122 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// WinMerge: An interactive diff/merge utility
-// Copyright (C) 1997 Dean P. 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.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-/**
- * @file ClearCaseCmdLineParser.cpp
- *
- * @brief ClearCaseCmdLineParser class implemantation.
- *
- */
-
-// RCS ID line follows -- this is updated by CVS
-// $Id: CmdLineParser.cpp $
-
-#include "StdAfx.h"
-
-#include "ClearCaseCmdLineParser.h"
-#include "MainFrm.h"
-#include "MergeCmdLineInfo.h"
-#include "Paths.h"
-
-ClearCaseCmdLineParser::ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szFileName) :
- CmdLineParser(CmdLineInfo),
- m_bDesc(false),
- m_bBaseFile(false),
- m_bOutFile(false)
-{
- m_CmdLineInfo.m_bEscShutdown = true;
-
- m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY | FFILEOPEN_NOMRU;
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
-
- // szFileName is either "xmerge" or "xcompare".
- if (lstrcmpi(szFileName, _T("xmerge")))
- {
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
-
- // Compare tool doesn't have a common ancestor file description. We
- // put a phony description so the command line parser will skip it.
- m_sBaseDesc = _T("<No Base>");
- }
-}
-
-void ClearCaseCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
-{
- if (TRUE == bFlag)
- {
- if (!lstrcmpi(pszParam, _T("base")))
- {
- // -base is followed by common ancestor file description.
- m_bBaseFile = true;
- }
- else if (!lstrcmpi(pszParam, _T("out")))
- {
- // -out is followed by merge's output file name.
- m_bOutFile = true;
- }
- else if (!lstrcmpi(pszParam, _T("fname")))
- {
- // -fname is followed by file description.
- m_bDesc = true;
- }
- }
- else
- {
- if ((m_bBaseFile == true) && m_sBaseFile.IsEmpty())
- {
- m_sBaseFile = pszParam;
- }
- else if ((m_bOutFile == true) && m_sOutFile.IsEmpty())
- {
- m_sOutFile = pszParam;
- }
- else if ((m_bDesc == true) && m_sBaseDesc.IsEmpty())
- {
- m_sBaseDesc = pszParam;
- m_bDesc = false;
- }
- else if ((m_bDesc == true) && m_CmdLineInfo.m_sLeftDesc.IsEmpty())
- {
- m_CmdLineInfo.m_sLeftDesc = pszParam;
- m_bDesc = false;
- }
- else if ((m_bDesc == true) && m_CmdLineInfo.m_sRightDesc.IsEmpty())
- {
- m_CmdLineInfo.m_sRightDesc = pszParam;
- }
- else
- {
- CString sFile = paths_GetLongPath(pszParam);
- m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
- m_CmdLineInfo.m_nFiles += 1;
- }
- }
-
- if (TRUE == bLast)
- {
- if (FALSE == m_sOutFile.IsEmpty())
- {
- CString sFile = paths_GetLongPath(m_sOutFile);
- m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
- m_CmdLineInfo.m_nFiles += 1;
- }
- }
-}
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file ClearCaseCmdLineParser.cpp
+ *
+ * @brief ClearCaseCmdLineParser class implemantation.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#include "StdAfx.h"
+
+#include "ClearCaseCmdLineParser.h"
+#include "MainFrm.h"
+#include "MergeCmdLineInfo.h"
+#include "Paths.h"
+
+ClearCaseCmdLineParser::ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szFileName) :
+ CmdLineParser(CmdLineInfo),
+ m_bDesc(false),
+ m_bBaseFile(false),
+ m_bOutFile(false)
+{
+ m_CmdLineInfo.m_bEscShutdown = true;
+
+ m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY | FFILEOPEN_NOMRU;
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+
+ // szFileName is either "xmerge" or "xcompare".
+ if (lstrcmpi(szFileName, _T("xmerge")))
+ {
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
+
+ // Compare tool doesn't have a common ancestor file description. We
+ // put a phony description so the command line parser will skip it.
+ m_sBaseDesc = _T("<No Base>");
+ }
+}
+
+void ClearCaseCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
+{
+ if (TRUE == bFlag)
+ {
+ if (!lstrcmpi(pszParam, _T("base")))
+ {
+ // -base is followed by common ancestor file description.
+ m_bBaseFile = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("out")))
+ {
+ // -out is followed by merge's output file name.
+ m_bOutFile = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("fname")))
+ {
+ // -fname is followed by file description.
+ m_bDesc = true;
+ }
+ }
+ else
+ {
+ if ((m_bBaseFile == true) && m_sBaseFile.IsEmpty())
+ {
+ m_sBaseFile = pszParam;
+ }
+ else if ((m_bOutFile == true) && m_sOutFile.IsEmpty())
+ {
+ m_sOutFile = pszParam;
+ }
+ else if ((m_bDesc == true) && m_sBaseDesc.IsEmpty())
+ {
+ m_sBaseDesc = pszParam;
+ m_bDesc = false;
+ }
+ else if ((m_bDesc == true) && m_CmdLineInfo.m_sLeftDesc.IsEmpty())
+ {
+ m_CmdLineInfo.m_sLeftDesc = pszParam;
+ m_bDesc = false;
+ }
+ else if ((m_bDesc == true) && m_CmdLineInfo.m_sRightDesc.IsEmpty())
+ {
+ m_CmdLineInfo.m_sRightDesc = pszParam;
+ }
+ else
+ {
+ CString sFile = paths_GetLongPath(pszParam);
+ m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
+ m_CmdLineInfo.m_nFiles += 1;
+ }
+ }
+
+ if (TRUE == bLast)
+ {
+ if (FALSE == m_sOutFile.IsEmpty())
+ {
+ CString sFile = paths_GetLongPath(m_sOutFile);
+ m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
+ m_CmdLineInfo.m_nFiles += 1;
+ }
+ }
+}
Property changes on: trunk/Src/ClearCaseCmdLineParser.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/ClearCaseCmdLineParser.h
===================================================================
--- trunk/Src/ClearCaseCmdLineParser.h 2006-11-17 16:23:12 UTC (rev 3813)
+++ trunk/Src/ClearCaseCmdLineParser.h 2006-11-17 17:46:59 UTC (rev 3814)
@@ -1,71 +1,71 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// WinMerge: An interactive diff/merge utility
-// Copyright (C) 1997 Dean P. 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.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
-#define _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
-
-/**
- * @file ClearCaseCmdLineParser.h
- *
- * @brief ClearCaseCmdLineParser class decleration.
- *
- */
-
-// RCS ID line follows -- this is updated by CVS
-// $Id: CmdLineParser.h $
-
-#include "CmdLineParser.h"
-
-/**
- * @brief Rational ClearCase's command line parser.
- *
- * This parser is able to parse ClearCase external tools' command line, both
- * compare and merge.
- *
- */
-class ClearCaseCmdLineParser : public CmdLineParser
-{
-public:
-
- /** @brief ClearCaseCmdLineParser's constructor.
- *
- * @param [in] szFileName Executable file name. Required in order to
- * know which external tool was executed.
- *
- */
- ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szFileName);
-
- virtual ~ClearCaseCmdLineParser() { }
-
- virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
-
-private:
-
- bool m_bDesc;
- bool m_bBaseFile; /**< Files' common ancestor. Used till we'll have a 3-ways merge. */
- bool m_bOutFile;
-
- CString m_sBaseFile;
- CString m_sBaseDesc;
- CString m_sOutFile;
-};
-
-#endif // _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
+#define _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
+
+/**
+ * @file ClearCaseCmdLineParser.h
+ *
+ * @brief ClearCaseCmdLineParser class decleration.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#include "CmdLineParser.h"
+
+/**
+ * @brief Rational ClearCase's command line parser.
+ *
+ * This parser is able to parse ClearCase external tools' command line, both
+ * compare and merge.
+ *
+ */
+class ClearCaseCmdLineParser : public CmdLineParser
+{
+public:
+
+ /** @brief ClearCaseCmdLineParser's constructor.
+ *
+ * @param [in] szFileName Executable file name. Required in order to
+ * know which external tool was executed.
+ *
+ */
+ ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szFileName);
+
+ virtual ~ClearCaseCmdLineParser() { }
+
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
+
+private:
+
+ bool m_bDesc;
+ bool m_bBaseFile; /**< Files' common ancestor. Used till we'll have a 3-ways merge. */
+ bool m_bOutFile;
+
+ CString m_sBaseFile;
+ CString m_sBaseDesc;
+ CString m_sOutFile;
+};
+
+#endif // _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
Property changes on: trunk/Src/ClearCaseCmdLineParser.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/CmdLineParser.h
===================================================================
--- trunk/Src/CmdLineParser.h 2006-11-17 16:23:12 UTC (rev 3813)
+++ trunk/Src/CmdLineParser.h 2006-11-17 17:46:59 UTC (rev 3814)
@@ -1,84 +1,84 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// WinMerge: An interactive diff/merge utility
-// Copyright (C) 1997 Dean P. 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.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _CMD_LINE_PARSER_INCLUDED_
-#define _CMD_LINE_PARSER_INCLUDED_
-
-/**
- * @file CmdLineParser.h
- *
- * @brief CmdLineParser class declaration.
- *
- */
-
-// RCS ID line follows -- this is updated by CVS
-// $Id: CmdLineParser.h $
-
-class MergeCmdLineInfo;
-
-/**
- * @brief Base command line parser interface.
- *
- * WinMerge is able to parse command line arguments other than its own. In
- * order to add this capability, a developer should inherit this class and
- * implement the ParseParam method.
- *
- */
-class CmdLineParser
-{
-public:
-
- /** @brief CmdLineParser's constructor.
- *
- * @param [in] CmdLineInfo A class which hold the information obtained
- * from the command line arguments.
- *
- */
- CmdLineParser(MergeCmdLineInfo& CmdLineInfo) :
- m_CmdLineInfo(CmdLineInfo)
- {
-
- }
-
- /** @brief CmdLineParser's destructor. */
- virtual ~CmdLineParser() { }
-
-
- /** @brief The command line argument parser.
- *
- * This method should be implemented by the derived class and do the
- * actual parsing.
- *
- * @param [in] pszParam The parameter or flag.
- * @bFlag [in] bFlag Indicates whether pszParam is a parameter or a
- * flag.
- * @bLast [in] bLast Indicates if this is the last parameter or flag
- * on the command line.
- *
- */
- virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast) = 0;
-
-protected:
-
- MergeCmdLineInfo& m_CmdLineInfo;
-};
-
-#endif // _CMD_LINE_PARSER_INCLUDED_
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _CMD_LINE_PARSER_INCLUDED_
+#define _CMD_LINE_PARSER_INCLUDED_
+
+/**
+ * @file CmdLineParser.h
+ *
+ * @brief CmdLineParser class declaration.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+class MergeCmdLineInfo;
+
+/**
+ * @brief Base command line parser interface.
+ *
+ * WinMerge is able to parse command line arguments other than its own. In
+ * order to add this capability, a developer should inherit this class and
+ * implement the ParseParam method.
+ *
+ */
+class CmdLineParser
+{
+public:
+
+ /** @brief CmdLineParser's constructor.
+ *
+ * @param [in] CmdLineInfo A class which hold the information obtained
+ * from the command line arguments.
+ *
+ */
+ CmdLineParser(MergeCmdLineInfo& CmdLineInfo) :
+ m_CmdLineInfo(CmdLineInfo)
+ {
+
+ }
+
+ /** @brief CmdLineParser's destructor. */
+ virtual ~CmdLineParser() { }
+
+
+ /** @brief The command line argument parser.
+ *
+ * This method should be implemented by the derived class and do the
+ * actual parsing.
+ *
+ * @param [in] pszParam The parameter or flag.
+ * @bFlag [in] bFlag Indicates whether pszParam is a parameter or a
+ * flag.
+ * @bLast [in] bLast Indicates if this is the last parameter or flag
+ * on the command line.
+ *
+ */
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast) = 0;
+
+protected:
+
+ MergeCmdLineInfo& m_CmdLineInfo;
+};
+
+#endif // _CMD_LINE_PARSER_INCLUDED_
Property changes on: trunk/Src/CmdLineParser.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/MergeCmdLineInfo.cpp
===================================================================
--- trunk/Src/MergeCmdLineInfo.cpp 2006-11-17 16:23:12 UTC (rev 3813)
+++ trunk/Src/MergeCmdLineInfo.cpp 2006-11-17 17:46:59 UTC (rev 3814)
@@ -1,93 +1,93 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// WinMerge: An interactive diff/merge utility
-// Copyright (C) 1997 Dean P. 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.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-/**
- * @file CmdLineParser.h
- *
- * @brief CmdLineParser class implementation.
- *
- */
-
-// RCS ID line follows -- this is updated by CVS
-// $Id: CmdLineParser.h $
-
-#include "StdAfx.h"
-
-#include <shlwapi.h> // Required for PathFindFileName
-
-#include "MainFrm.h"
-#include "MergeCmdLineInfo.h"
-#include "ClearCaseCmdLineParser.h"
-#include "WinMergeCmdLineParser.h"
-
-// MergeCmdLineInfo
-
-MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *szExeName) : CCommandLineInfo(),
- m_nCmdShow(SW_SHOWNORMAL),
- m_bClearCaseTool(false),
- m_bEscShutdown(false),
- m_bExitIfNoDiff(false),
- m_bRecurse(false),
- m_bNonInteractive(false),
- m_bNoPrefs(false),
- m_bSingleInstance(false),
- m_bShowUsage(false),
- m_dwLeftFlags(FFILEOPEN_CMDLINE),
- m_dwRightFlags(FFILEOPEN_CMDLINE),
- m_nFiles(0)
-{
- m_Files.SetSize(2);
-
- // Rational ClearCase has a weird way of executing external
- // tools which replace the build-in ones. It also doesn't allow
- // you to define which parameters to send to the executable.
- // So, in order to run as an external tool, WinMerge should do:
- // if argv[0] is "xcompare" then it "knows" that it was
- // executed from ClearCase. In this case, it should read and
- // parse ClearCase's command line parameters and not the
- // "regular" parameters. More information can be found in
- // C:\Program Files\Rational\ClearCase\lib\mgrs\mgr_info.h file.
-
- LPTSTR szFileName = ::PathFindFileName(szExeName);
-
- if (lstrcmpi(szFileName, _T("xcompare")) && lstrcmpi(szFileName, _T("xmerge")))
- {
- m_pCmdLineParser = new WinMergeCmdLineParser(*this);
- }
- else
- {
- m_bClearCaseTool = true;
- m_pCmdLineParser = new ClearCaseCmdLineParser(*this, szFileName);
- }
-}
-
-MergeCmdLineInfo::~MergeCmdLineInfo()
-{
- delete m_pCmdLineParser;
-}
-
-void MergeCmdLineInfo::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
-{
- // Give our base class a chance to figure out what is the parameter.
- CCommandLineInfo::ParseParam(pszParam, bFlag, bLast);
-
- m_pCmdLineParser->ParseParam(pszParam, bFlag, bLast);
-}
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file CmdLineParser.h
+ *
+ * @brief CmdLineParser class implementation.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#include "StdAfx.h"
+
+#include <shlwapi.h> // Required for PathFindFileName
+
+#include "MainFrm.h"
+#include "MergeCmdLineInfo.h"
+#include "ClearCaseCmdLineParser.h"
+#include "WinMergeCmdLineParser.h"
+
+// MergeCmdLineInfo
+
+MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *szExeName) : CCommandLineInfo(),
+ m_nCmdShow(SW_SHOWNORMAL),
+ m_bClearCaseTool(false),
+ m_bEscShutdown(false),
+ m_bExitIfNoDiff(false),
+ m_bRecurse(false),
+ m_bNonInteractive(false),
+ m_bNoPrefs(false),
+ m_bSingleInstance(false),
+ m_bShowUsage(false),
+ m_dwLeftFlags(FFILEOPEN_CMDLINE),
+ m_dwRightFlags(FFILEOPEN_CMDLINE),
+ m_nFiles(0)
+{
+ m_Files.SetSize(2);
+
+ // Rational ClearCase has a weird way of executing external
+ // tools which replace the build-in ones. It also doesn't allow
+ // you to define which parameters to send to the executable.
+ // So, in order to run as an external tool, WinMerge should do:
+ // if argv[0] is "xcompare" then it "knows" that it was
+ // executed from ClearCase. In this case, it should read and
+ // parse ClearCase's command line parameters and not the
+ // "regular" parameters. More information can be found in
+ // C:\Program Files\Rational\ClearCase\lib\mgrs\mgr_info.h file.
+
+ LPTSTR szFileName = ::PathFindFileName(szExeName);
+
+ if (lstrcmpi(szFileName, _T("xcompare")) && lstrcmpi(szFileName, _T("xmerge")))
+ {
+ m_pCmdLineParser = new WinMergeCmdLineParser(*this);
+ }
+ else
+ {
+ m_bClearCaseTool = true;
+ m_pCmdLineParser = new ClearCaseCmdLineParser(*this, szFileName);
+ }
+}
+
+MergeCmdLineInfo::~MergeCmdLineInfo()
+{
+ delete m_pCmdLineParser;
+}
+
+void MergeCmdLineInfo::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
+{
+ // Give our base class a chance to figure out what is the parameter.
+ CCommandLineInfo::ParseParam(pszParam, bFlag, bLast);
+
+ m_pCmdLineParser->ParseParam(pszParam, bFlag, bLast);
+}
Property changes on: trunk/Src/MergeCmdLineInfo.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/MergeCmdLineInfo.h
===================================================================
--- trunk/Src/MergeCmdLineInfo.h 2006-11-17 16:23:12 UTC (rev 3813)
+++ trunk/Src/MergeCmdLineInfo.h 2006-11-17 17:46:59 UTC (rev 3814)
@@ -1,95 +1,95 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// WinMerge: An interactive diff/merge utility
-// Copyright (C) 1997 Dean P. 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.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MERGE_CMD_LINE_INFO_INCLUDED_
-#define _MERGE_CMD_LINE_INFO_INCLUDED_
-
-/**
- * @file MergeCmdLineInfo.h
- *
- * @brief MergeCmdLineInfo class declaration.
- *
- */
-
-// RCS ID line follows -- this is updated by CVS
-// $Id: MergeCmdLineInfo.h $
-
-class CmdLineParser;
-
-/**
- * @brief WinMerge's command line handler.
- *
- */
-class MergeCmdLineInfo : public CCommandLineInfo
-{
-public:
-
- /** @brief ClearCaseCmdLineParser's constructor.
- *
- * @param [in] szFileName Executable file name. Required in order to
- * know which command line parser to create and use.
- *
- */
- MergeCmdLineInfo(const TCHAR *szExeName);
-
- ~MergeCmdLineInfo();
-
- /** @brief Override CCommandLineInfo's method. */
- virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
-
-public:
-
- int m_nCmdShow; /**< Initial state of the application's window. */
-
- bool m_bClearCaseTool; /**< Running as Rational ClearCase external tool. */
- bool m_bEscShutdown; /**< Pressing ESC will close the application */
- bool m_bExitIfNoDiff; /**< Exit after telling the user that files are identical. */
- bool m_bRecurse; /**< Include sub folder in directories compare. */
- bool m_bNonInteractive; /**< Suppress user's notifications. */
- bool m_bNoPrefs; /**< Do not load or remember preferences. */
- bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
- bool m_bShowUsage; /**< Show a brief reminder to command line arguments. */
-
- DWORD m_dwLeftFlags; /**< Left side file's behavior options. */
- DWORD m_dwRightFlags; /**< Right side file's behavior options. */
-
- CString m_sLeftDesc; /**< Left side file's description. */
- CString m_sRightDesc; /**< Right side file's description. */
-
- CString m_sFileFilter; /**< File filter mask. */
- CString m_sPreDiffer;
-
- /**< Command line arguments which are mapped to WinMerge's preferences. */
- CMapStringToString m_Settings;
-
- CStringArray m_Files; /**< Files (or directories) to compare. */
-
- int m_nFiles; /**< Number of files (or directories) in m_Files. */
-
-private:
-
- /**< operator= is not implemented. */
- MergeCmdLineInfo& operator=(const MergeCmdLineInfo& rhs);
-
- CmdLineParser *m_pCmdLineParser; /**< The command line parser instance. */
-};
-
-#endif // _MERGE_CMD_LINE_INFO_INCLUDED_
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MERGE_CMD_LINE_INFO_INCLUDED_
+#define _MERGE_CMD_LINE_INFO_INCLUDED_
+
+/**
+ * @file MergeCmdLineInfo.h
+ *
+ * @brief MergeCmdLineInfo class declaration.
+ *
+ */
+
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+class CmdLineParser;
+
+/**
+ * @brief WinMerge's command line handler.
+ *
+ */
+class MergeCmdLineInfo : public CCommandLineInfo
+{
+public:
+
+ /** @brief ClearCaseCmdLineParser's constructor.
+ *
+ * @param [in] szFileName Executable file name. Required in order to
+ * know which command line parser to create and use.
+ *
+ */
+ MergeCmdLineInfo(const TCHAR *szExeName);
+
+ ~MergeCmdLineInfo();
+
+ /** @brief Override CCommandLineInfo's method. */
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
+
+public:
+
+ int m_nCmdShow; /**< Initial state of the application's window. */
+
+ bool m_bClearCaseTool; /**< Running as Rational ClearCase external tool. */
+ bool m_bEscShutdown; /**< Pressing ESC will close the application */
+ bool m_bExitIfNoDiff; /**< Exit after telling the user that files are identical. */
+ bool m_bRecurse; /**< Include sub folder in directories compare. */
+ bool m_bNonInteractive; /**< Suppress user's notifications. */
+ bool m_bNoPrefs; /**< Do not load or remember preferences. */
+ bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
+ bool m_bShowUsage; /**< Show a brief reminder to command line arguments. */
+
+ DWORD m_dwLeftFlags; /**< Left side file's behavior options. */
+ DWORD m_dwRightFlags; /**< Right side file's behavior options. */
+
+ CString m_sLeftDesc; /**< Left side file's description. */
+ CString m_sRightDesc; /**< Right side file's description. */
+
+ CString m_sFileFilter; /**< File filter mask. */
+ CString m_sPreDiffer;
+
+ /**< Command line arguments which are mapped to WinMerge's preferences. */
+ CMapStringToString m_Settings;
+
+ CStringArray m_Files; /**< Files (or directories) to compare. */
+
+ int m_nFiles; /**< Number of files (or directories) in m_Files. */
+
+private:
+
+ /**< operator= is not implemented. */
+ MergeCmdLineInfo& operator=(const MergeCmdLineInfo& rhs);
+
+ CmdLineParser *m_pCmdLineParser; /**< The command line parser instance. */
+};
+
+#endif // _MERGE_CMD_LINE_INFO_INCLUDED_
Property changes on: trunk/Src/MergeCmdLineInfo.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/WinMergeCmdLineParser.cpp
===================================================================
--- trunk/Src/WinMergeCmdLineParser.cpp 2006-11-17 16:23:12 UTC (rev 3813)
+++ trunk/Src/WinMergeCmdLineParser.cpp 2006-11-17 17:46:59 UTC (rev 3814)
@@ -1,219 +1,219 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// WinMerge: An interactive diff/merge utility
-// Copyright (C) 1997 Dean P. 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.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-/**
-* @file WinMergeCmdLineParser.h
-*
-* @brief WinMergeCmdLineParser class implementation.
-*
-*/
-
-// RCS ID line follows -- this is updated by CVS
-// $Id: WinMergeCmdLineParser.cpp $
-
-#include "StdAfx.h"
-
-#include "MainFrm.h"
-#include "MergeCmdLineInfo.h"
-#include "WinMergeCmdLineParser.h"
-#include "Paths.h"
-
-WinMergeCmdLineParser::WinMergeCmdLineParser(MergeCmdLineInfo& CmdLineInfo) :
- CmdLineParser(CmdLineInfo),
- m_bPreDiff(false),
- m_bFileFilter(false),
- m_bLeftDesc(false),
- m_bRightDesc(false)
-{
-
-}
-
-void WinMergeCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
-{
- if (TRUE == bFlag)
- {
- if (!lstrcmp(pszParam, _T("?")))
- {
- // -? to show common command line arguments.
- m_CmdLineInfo.m_bShowUsage = true;
- }
- else if (!lstrcmpi(pszParam, _T("dl")))
- {
- // -dl "desc" - description for left file
- m_bLeftDesc = true;
- }
- else if (!lstrcmpi(pszParam, _T("dr")))
- {
- // -dr "desc" - description for right file
- m_bRightDesc = true;
- }
- else if (!lstrcmpi(pszParam, _T("e")))
- {
- // -e to allow closing with single esc press
- m_CmdLineInfo.m_bEscShutdown = true;
- }
- else if (!lstrcmpi(pszParam, _T("f")))
- {
- // -f "mask" - file filter mask ("*.h *.cpp")
- m_bFileFilter = true;
- }
- else if (!lstrcmpi(pszParam, _T("r")))
- {
- // -r to compare recursively
- m_CmdLineInfo.m_bRecurse = true;
- }
- else if (!lstrcmpi(pszParam, _T("s")))
- {
- // -s to allow only one instance
- m_CmdLineInfo.m_bSingleInstance = true;
- }
- else if (!lstrcmpi(pszParam, _T("noninteractive")))
- {
- // -noninteractive to suppress message boxes & close with result code
- m_CmdLineInfo.m_bNonInteractive = true;
- }
- else if (!lstrcmpi(pszParam, _T("noprefs")))
- {
- // -noprefs means do not load or remember options (preferences)
- m_CmdLineInfo.m_bNoPrefs = true;
- }
- else if (!lstrcmpi(pszParam, _T("minimize")))
- {
- // -minimize means minimize the main window.
- m_CmdLineInfo.m_nCmdShow = SW_MINIMIZE;
- }
- else if (!lstrcmpi(pszParam, _T("maximize")))
- {
- // -maximize means maximize the main window.
- m_CmdLineInfo.m_nCmdShow = SW_MAXIMIZE;
- }
- else if (!lstrcmpi(pszParam, _T("prediffer")))
- {
- // Get prediffer if specified (otherwise prediffer will be blank, which is default)
- m_bPreDiff = true;
- }
- else if (!lstrcmpi(pszParam, _T("wl")))
- {
- // -wl to open left path as read-only
- m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY;
- }
- else if (!lstrcmpi(pszParam, _T("wr")))
- {
- // -wr to open right path as read-only
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
- }
- else if (!lstrcmpi(pszParam, _T("ul")))
- {
- // -ul to not add left path to MRU
- m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
- }
- else if (!lstrcmpi(pszParam, _T("ur")))
- {
- // -ur to not add right path to MRU
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
- }
- else if (!lstrcmpi(pszParam, _T("ub")))
- {
- // -ub to add neither right nor left path to MRU
- m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
- }
- else if (!lstrcmpi(pszParam, _T("x")))
- {
- // -x to close application if files are identical.
- m_CmdLineInfo.m_bExitIfNoDiff = true;
- }
- else
- {
- CString sParam = pszParam;
- CString sValue;
-
- int nPos = sParam.ReverseFind(_T(':'));
- if (nPos >= 0)
- {
- sParam = sParam.Left(nPos);
- sValue = sParam.Mid(nPos + 1);
- }
- else
- {
- // Treat "/ignorews" as "/ignorews:1".
- sValue = _T("1");
- }
-
- m_CmdLineInfo.m_Settings[sParam] = sValue;
- }
- }
- else
- {
- if ((m_bPreDiff == true) && m_CmdLineInfo.m_sPreDiffer.IsEmpty())
- {
- m_CmdLineInfo.m_sPreDiffer = pszParam;
- }
- else if ((m_bFileFilter == true) && m_CmdLineInfo.m_sFileFilter.IsEmpty())
- {
- m_CmdLineInfo.m_sFileFilter = pszParam;
- }
- else if ((m_bRightDesc == true) && m_CmdLineInfo.m_sRightDesc.IsEmpty())
- {
- m_CmdLineInfo.m_sRightDesc = pszParam;
- }
- else if ((m_bLeftDesc == true) && m_CmdLineInfo.m_sLeftDesc.IsEmpty())
- {
- m_CmdLineInfo.m_sLeftDesc = pszParam;
- }
- else
- {
- CString sFile = paths_GetLongPath(pszParam);
- m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
- m_CmdLineInfo.m_nFiles += 1;
- }
- }
-
- if (TRUE == bLast)
- {
- // If "compare file dir" make it "compare file dir\file".
- if (m_CmdLineInfo.m_nFiles >= 2)
- {
- PATH_EXISTENCE p1 = paths_DoesPathExist(m_CmdLineInfo.m_Files[0]);
- PATH_EXISTENCE p2 = paths_DoesPathExist(m_CmdLineInfo.m_Files[1]);
-
- if ((p1 == IS_EXISTING_FILE) && (p2 == IS_EXISTING_DIR))
- {
- TCHAR fname[_MAX_PATH];
- TCHAR fext[_MAX_PATH];
-
- _tsplitpath(m_CmdLineInfo.m_Files[0], NULL, NULL, fname, fext);
-
- if (m_CmdLineInfo.m_Files[1].Right(1) != _T('\\'))
- {
- m_CmdLineInfo.m_Files[1] += _T('\\');
- }
-
- m_CmdLineInfo.m_Files[1] = m_CmdLineInfo.m_Files[1] + fname + fext;
- }
- }
-
- if (m_CmdLineInfo.m_bShowUsage)
- {
- m_CmdLineInfo.m_bNonInteractive = false;
- }
- }
-}
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+* @file WinMergeCmdLineParser.h
+*
+* @brief WinMergeCmdLineParser class implementation.
+*
+*/
+
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#include "StdAfx.h"
+
+#include "MainFrm.h"
+#include "MergeCmdLineInfo.h"
+#include "WinMergeCmdLineParser.h"
+#include "Paths.h"
+
+WinMergeCmdLineParser::WinMergeCmdLineParser(MergeCmdLineInfo& CmdLineInfo) :
+ CmdLineParser(CmdLineInfo),
+ m_bPreDiff(false),
+ m_bFileFilter(false),
+ m_bLeftDesc(false),
+ m_bRightDesc(false)
+{
+
+}
+
+void WinMergeCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
+{
+ if (TRUE == bFlag)
+ {
+ if (!lstrcmp(pszParam, _T("?")))
+ {
+ // -? to show common command line arguments.
+ m_CmdLineInfo.m_bShowUsage = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("dl")))
+ {
+ // -dl "desc" - description for left file
+ m_bLeftDesc = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("dr")))
+ {
+ // -dr "desc" - description for right file
+ m_bRightDesc = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("e")))
+ {
+ // -e to allow closing with single esc press
+ m_CmdLineInfo.m_bEscShutdown = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("f")))
+ {
+ // -f "mask" - file filter mask ("*.h *.cpp")
+ m_bFileFilter = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("r")))
+ {
+ // -r to compare recursively
+ m_CmdLineInfo.m_bRecurse = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("s")))
+ {
+ // -s to allow only one instance
+ m_CmdLineInfo.m_bSingleInstance = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("noninteractive")))
+ {
+ // -noninteractive to suppress message boxes & close with result code
+ m_CmdLineInfo.m_bNonInteractive = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("noprefs")))
+ {
+ // -noprefs means do not load or remember options (preferences)
+ m_CmdLineInfo.m_bNoPrefs = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("minimize")))
+ {
+ // -minimize means minimize the main window.
+ m_CmdLineInfo.m_nCmdShow = SW_MINIMIZE;
+ }
+ else if (!lstrcmpi(pszParam, _T("maximize")))
+ {
+ // -maximize means maximize the main window.
+ m_CmdLineInfo.m_nCmdShow = SW_MAXIMIZE;
+ }
+ else if (!lstrcmpi(pszParam, _T("prediffer")))
+ {
+ // Get prediffer if specified (otherwise prediffer will be blank, which is default)
+ m_bPreDiff = true;
+ }
+ else if (!lstrcmpi(pszParam, _T("wl")))
+ {
+ // -wl to open left path as read-only
+ m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY;
+ }
+ else if (!lstrcmpi(pszParam, _T("wr")))
+ {
+ // -wr to open right path as read-only
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
+ }
+ else if (!lstrcmpi(pszParam, _T("ul")))
+ {
+ // -ul to not add left path to MRU
+ m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
+ }
+ else if (!lstrcmpi(pszParam, _T("ur")))
+ {
+ // -ur to not add right path to MRU
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+ }
+ else if (!lstrcmpi(pszParam, _T("ub")))
+ {
+ // -ub to add neither right nor left path to MRU
+ m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
+ m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+ }
+ else if (!lstrcmpi(pszParam, _T("x")))
+ {
+ // -x to close application if files are identical.
+ m_CmdLineInfo.m_bExitIfNoDiff = true;
+ }
+ else
+ {
+ CString sParam = pszParam;
+ CString sValue;
+
+ int nPos = sParam.ReverseFind(_T(':'));
+ if (nPos >= 0)
+ {
+ sParam = sParam.Left(nPos);
+ sValue = sParam.Mid(nPos + 1);
+ }
+ else
+ {
+ // Treat "/ignorews" as "/ignorews:1".
+ sValue = _T("1");
+ }
+
+ m_CmdLineInfo.m_Settings[sParam] = sValue;
+ }
+ }
+ else
+ {
+ if ((m_bPreDiff == true) && m_CmdLineInfo.m_sPreDiffer.IsEmpty())
+ {
+ m_CmdLineInfo.m_sPreDiffer = pszParam;
+ }
+ else if ((m_bFileFilter == true) && m_CmdLineInfo.m_sFileFilter.IsEmpty())
+ {
+ m_CmdLineInfo.m_sFileFilter = pszParam;
+ }
+ else if ((m_bRightDesc == true) && m_CmdLineInfo.m_sRightDesc.IsEmpty())
+ {
+ m_CmdLineInfo.m_sRightDesc = pszParam;
+ }
+ else if ((m_bLeftDesc == true) && m_CmdLineInfo.m_sLeftDesc.IsEmpty())
+ {
+ m_CmdLineInfo.m_sLeftDesc = pszParam;
+ }
+ else
+ {
+ CString sFile = paths_GetLongPath(pszParam);
+ m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
+ m_CmdLineInfo.m_nFiles += 1;
+ }
+ }
+
+ if (TRUE == bLast)
+ {
+ // If "compare file dir" make it "compare file dir\file".
+ if (m_CmdLineInfo.m_nFiles >= 2)
+ {
+ PATH_EXISTENCE p1 = paths_DoesPathExist(m_CmdLineInfo.m_Files[0]);
+ PATH_EXISTENCE p2 = paths_DoesPathExist(m_CmdLineInfo.m_Files[1]);
+
+ if ((p1 == IS_EXISTING_FILE) && (p2 == IS_EXISTING_DIR))
+ {
+ TCHAR fname[_MAX_PATH];
+ TCHAR fext[_MAX_PATH];
+
+ _tsplitpath(m_CmdLineInfo.m_Files[0], NULL, NULL, fname, fext);
+
+ if (m_CmdLineInfo.m_Files[1].Right(1) != _T('\\'))
+ {
+ m_CmdLineInfo.m_Files[1] += _T('\\');
+ }
+
+ m_CmdLineInfo.m_Files[1] = m_CmdLineInfo.m_Files[1] + fname + fext;
+ }
+ }
+
+ if (m_CmdLineInfo.m_bShowUsage)
+ {
+ m_CmdLineInfo.m_bNonInteractive = false;
+ }
+ }
+}
Property changes on: trunk/Src/WinMergeCmdLineParser.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/WinMergeCmdLineParser.h
===================================================================
--- trunk/Src/WinMergeCmdLineParser.h 2006-11-17 16:23:12 UTC (rev 3813)
+++ trunk/Src/WinMergeCmdLineParser.h 2006-11-17 17:46:59 UTC (rev 3814)
@@ -1,56 +1,56 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// WinMerge: An interactive diff/merge utility
-// Copyright (C) 1997 Dean P. 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.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-/**
-* @file WinMergeCmdLineParser.h
-*
-* @brief WinMergeCmdLineParser class decleration.
-*
-*/
-
-// RCS ID line follows -- this is updated by CVS
-// $Id: WinMergeCmdLineParser.h $
-
-#pragma once
-
-#include "CmdLineParser.h"
-
-/**
-* @brief WinMerge's default command line parser.
-*
-*/
-class WinMergeCmdLineParser : public CmdLineParser
-{
- public:
-
- WinMergeCmdLineParser(MergeCmdLineInfo& CmdLineInfo);
-
- virtual ~WinMergeCmdLineParser() { }
-
- virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
-
- private:
-
- bool m_bPreDiff;
- bool m_bFileFilter;
- bool m_bLeftDesc;
- bool m_bRightDesc;
-};
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+* @file WinMergeCmdLineParser.h
+*
+* @brief WinMergeCmdLineParser class decleration.
+*
+*/
+
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#pragma once
+
+#include "CmdLineParser.h"
+
+/**
+* @brief WinMerge's default command line parser.
+*
+*/
+class WinMergeCmdLineParser : public CmdLineParser
+{
+ public:
+
+ WinMergeCmdLineParser(MergeCmdLineInfo& CmdLineInfo);
+
+ virtual ~WinMergeCmdLineParser() { }
+
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
+
+ private:
+
+ bool m_bPreDiff;
+ bool m_bFileFilter;
+ bool m_bLeftDesc;
+ bool m_bRightDesc;
+};
Property changes on: trunk/Src/WinMergeCmdLineParser.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-17 18:51:51
|
Revision: 3815
http://svn.sourceforge.net/winmerge/?rev=3815&view=rev
Author: galh
Date: 2006-11-17 10:51:50 -0800 (Fri, 17 Nov 2006)
Log Message:
-----------
PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/SplitterWndEx.cpp
trunk/Src/MergeDiffDetailView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-17 17:46:59 UTC (rev 3814)
+++ trunk/Src/Changes.txt 2006-11-17 18:51:50 UTC (rev 3815)
@@ -3,6 +3,11 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2006-11-17 Gal
+ PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
+ Src: MergeDiffDetailView.cpp
+ Src/Common: SplitterWndEx.cpp
+
+2006-11-17 Gal
PATCH: [ 1598194 ] New command line parser
Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
Modified: trunk/Src/Common/SplitterWndEx.cpp
===================================================================
--- trunk/Src/Common/SplitterWndEx.cpp 2006-11-17 17:46:59 UTC (rev 3814)
+++ trunk/Src/Common/SplitterWndEx.cpp 2006-11-17 18:51:50 UTC (rev 3815)
@@ -179,21 +179,27 @@
int i;
int sum = 0;
int hmin;
+
for (i = 0 ; i < m_nCols ; i++)
{
int v;
GetColumnInfo(i, v, hmin);
sum += v;
}
- int vEqual = sum/m_nCols;
- for (i = 0 ; i < m_nCols-1 ; i++)
+
+ // Sum is negative if WinMerge started minimized.
+ if (sum > 0)
{
- SetColumnInfo(i, vEqual, hmin);
- sum -= vEqual;
+ int vEqual = sum/m_nCols;
+ for (i = 0 ; i < m_nCols-1 ; i++)
+ {
+ SetColumnInfo(i, vEqual, hmin);
+ sum -= vEqual;
+ }
+ SetColumnInfo(i, sum, hmin);
+
+ RecalcLayout();
}
- SetColumnInfo(i, sum, hmin);
-
- RecalcLayout();
}
Modified: trunk/Src/MergeDiffDetailView.cpp
===================================================================
--- trunk/Src/MergeDiffDetailView.cpp 2006-11-17 17:46:59 UTC (rev 3814)
+++ trunk/Src/MergeDiffDetailView.cpp 2006-11-17 18:51:50 UTC (rev 3815)
@@ -316,16 +316,21 @@
ScrollToLine(m_lineBegin);
// tell the others views about this diff (no need to call UpdateSiblingScrollPos)
- CSplitterWnd *pSplitterWnd = GetParentSplitter (this, FALSE);
- int nRows = pSplitterWnd->GetRowCount ();
- int nCols = pSplitterWnd->GetColumnCount ();
- for (int nRow = 0; nRow < nRows; nRow++)
+ CSplitterWnd *pSplitterWnd = GetParentSplitter(this, FALSE);
+
+ // pSplitterWnd is NULL if WinMerge started minimized.
+ if (pSplitterWnd != NULL)
{
- for (int nCol = 0; nCol < nCols; nCol++)
+ int nRows = pSplitterWnd->GetRowCount ();
+ int nCols = pSplitterWnd->GetColumnCount ();
+ for (int nRow = 0; nRow < nRows; nRow++)
{
- CMergeDiffDetailView *pSiblingView = static_cast<CMergeDiffDetailView*>(GetSiblingView (nRow, nCol));
- if (pSiblingView != NULL)
- pSiblingView->OnDisplayDiff(nDiff);
+ for (int nCol = 0; nCol < nCols; nCol++)
+ {
+ CMergeDiffDetailView *pSiblingView = static_cast<CMergeDiffDetailView*>(GetSiblingView (nRow, nCol));
+ if (pSiblingView != NULL)
+ pSiblingView->OnDisplayDiff(nDiff);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-20 19:12:00
|
Revision: 3817
http://svn.sourceforge.net/winmerge/?rev=3817&view=rev
Author: kimmov
Date: 2006-11-20 11:11:52 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ProjectFile.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-19 06:56:04 UTC (rev 3816)
+++ trunk/Src/Changes.txt 2006-11-20 19:11:52 UTC (rev 3817)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-20 Kimmo
+ BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
+ Src: ProjectFile.cpp
+
2006-11-17 Gal
PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
Src: MergeDiffDetailView.cpp
Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp 2006-11-19 06:56:04 UTC (rev 3816)
+++ trunk/Src/ProjectFile.cpp 2006-11-20 19:11:52 UTC (rev 3817)
@@ -143,7 +143,7 @@
if (left)
{
LPCTSTR path = NULL;
- path = scew_element_contents(right);
+ path = scew_element_contents(left);
m_leftFile = path;
}
if (right)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-21 15:29:50
|
Revision: 3823
http://svn.sourceforge.net/winmerge/?rev=3823&view=rev
Author: kimmov
Date: 2006-11-21 07:29:49 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
PATCH: [ 1600000 ] Fix project file Has*() functions
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ProjectFile.cpp
trunk/Src/ProjectFile.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-20 21:51:53 UTC (rev 3822)
+++ trunk/Src/Changes.txt 2006-11-21 15:29:49 UTC (rev 3823)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-21 Kimmo
+ PATCH: [ 1600000 ] Fix project file Has*() functions
+ Src: ProjectFile.cpp ProjectFile.h
+
2006-11-20 Kimmo
BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
Src: ProjectFile.cpp
Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp 2006-11-20 21:51:53 UTC (rev 3822)
+++ trunk/Src/ProjectFile.cpp 2006-11-21 15:29:49 UTC (rev 3823)
@@ -41,7 +41,11 @@
* @brief Standard constructor.
*/
ProjectFile::ProjectFile()
-: m_subfolders(-1)
+: m_bHasLeft(FALSE)
+, m_bHasRight(FALSE)
+, m_bHasFilter(FALSE)
+, m_bHasSubfolders(FALSE)
+, m_subfolders(-1)
, m_bLeftReadOnly(FALSE)
, m_bRightReadOnly(FALSE)
{
@@ -72,8 +76,10 @@
scew_element * root = GetRootElement(tree);
if (root)
{
- loaded = TRUE;
- GetPathsData(root);
+ // Currently our content is paths, so expect
+ // having paths in valid project file!
+ if (GetPathsData(root))
+ loaded = TRUE;
};
}
scew_tree_free(tree);
@@ -114,9 +120,11 @@
* @brief Reads the paths data from the XML data.
* This function reads the paths data inside given element in XML data.
* @param [in] parent Parent element for the paths data.
+ * @return TRUE if pathdata was found from the file.
*/
-void ProjectFile::GetPathsData(scew_element * parent)
+BOOL ProjectFile::GetPathsData(scew_element * parent)
{
+ BOOL bFoundPaths = FALSE;
scew_element *paths = NULL;
if (parent != NULL)
@@ -126,6 +134,7 @@
if (paths != NULL)
{
+ bFoundPaths = TRUE;
scew_element *left = NULL;
scew_element *right = NULL;
scew_element *filter = NULL;
@@ -145,24 +154,28 @@
LPCTSTR path = NULL;
path = scew_element_contents(left);
m_leftFile = path;
+ m_bHasLeft = TRUE;
}
if (right)
{
LPCTSTR path = NULL;
path = scew_element_contents(right);
m_rightFile = path;
+ m_bHasRight = TRUE;
}
if (filter)
{
LPCTSTR filtername = NULL;
filtername = scew_element_contents(filter);
m_filter = filtername;
+ m_bHasFilter = TRUE;
}
if (subfolders)
{
LPCTSTR folders = NULL;
folders = scew_element_contents(subfolders);
m_subfolders = _ttoi(folders);
+ m_bHasSubfolders = TRUE;
}
if (left_ro)
{
@@ -177,6 +190,7 @@
m_bRightReadOnly = (_ttoi(readonly) != 0);
}
}
+ return bFoundPaths;
}
/**
@@ -309,35 +323,39 @@
}
/**
- * @brief Returns if left path is defined.
+ * @brief Returns if left path is defined in project file.
+ * @return TRUE if project file has left path.
*/
BOOL ProjectFile::HasLeft() const
{
- return !m_leftFile.IsEmpty();
+ return m_bHasLeft;
}
/**
- * @brief Returns if right path is defined.
+ * @brief Returns if right path is defined in project file.
+ * @return TRUE if project file has right path.
*/
BOOL ProjectFile::HasRight() const
{
- return !m_rightFile.IsEmpty();
+ return m_bHasRight;
}
/**
- * @brief Returns if filter is defined.
+ * @brief Returns if filter is defined in project file.
+ * @return TRUE if project file has filter.
*/
BOOL ProjectFile::HasFilter() const
{
- return !m_filter.IsEmpty();
+ return m_bHasFilter;
}
/**
- * @brief Returns if subfolder is included.
+ * @brief Returns if subfolder is defined in projectfile.
+ * @return TRUE if project file has subfolder definition.
*/
BOOL ProjectFile::HasSubfolders() const
{
- return (m_subfolders != -1);
+ return m_bHasSubfolders;
}
/**
Modified: trunk/Src/ProjectFile.h
===================================================================
--- trunk/Src/ProjectFile.h 2006-11-20 21:51:53 UTC (rev 3822)
+++ trunk/Src/ProjectFile.h 2006-11-21 15:29:49 UTC (rev 3823)
@@ -30,9 +30,9 @@
/**
* @brief Class for handling project files.
*
- * This class handles project files, reading and saving projectdata from
- * XML files. Jochen's Markdown -parser (@s markdown.h) is used. We use UTF-8
- * encoding so Unicode paths are supported.
+ * This class loads and saves project files. Expat parser and SCEW wrapper for
+ * expat are used for XML parsing. We use UTF-8 encoding so Unicode paths are
+ * supported.
*/
class ProjectFile
{
@@ -62,15 +62,19 @@
protected:
scew_element* GetRootElement(scew_tree * tree);
- void GetPathsData(scew_element * parent);
+ BOOL GetPathsData(scew_element * parent);
scew_element* AddPathsElement(scew_element * parent);
BOOL AddPathsContent(scew_element * parent);
private:
+ BOOL m_bHasLeft; /**< Has left path? */
CString m_leftFile; /**< Left path */
+ BOOL m_bHasRight; /**< Has right path? */
CString m_rightFile; /**< Right path */
+ BOOL m_bHasFilter; /**< Has filter? */
CString m_filter; /**< Filter name or mask */
+ BOOL m_bHasSubfolders; /**< Has subfolders? */
int m_subfolders; /**< Are subfolders included (recursive scan) */
BOOL m_bLeftReadOnly; /**< Is left path opened as read-only */
BOOL m_bRightReadOnly; /**< Is right path opened as read-only */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-22 16:42:50
|
Revision: 3836
http://svn.sourceforge.net/winmerge/?rev=3836&view=rev
Author: kimmov
Date: 2006-11-22 08:42:46 -0800 (Wed, 22 Nov 2006)
Log Message:
-----------
PATCH: [ 1600714 ] Allow canceling when started from commandline
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.cpp
trunk/Src/Merge.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-22 15:24:22 UTC (rev 3835)
+++ trunk/Src/Changes.txt 2006-11-22 16:42:46 UTC (rev 3836)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-22 Kimmo
+ PATCH: [ 1600714 ] Allow canceling when started from commandline
+ Src: Merge.cpp Merge.h
+
2006-11-21 Kimmo
PATCH: [ 1600000 ] Fix project file Has*() functions
Src: ProjectFile.cpp ProjectFile.h
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-11-22 15:24:22 UTC (rev 3835)
+++ trunk/Src/Merge.cpp 2006-11-22 16:42:46 UTC (rev 3836)
@@ -179,6 +179,12 @@
MergeCmdLineInfo cmdInfo(*__targv);
ParseCommandLine(cmdInfo);
+ // If paths were given to commandline we consider this being an invoke from
+ // commandline (from other application, shellextension etc).
+ BOOL bCommandLineInvoke = FALSE;
+ if (cmdInfo.m_nFiles > 0)
+ bCommandLineInvoke = TRUE;
+
// Set default codepage
DirScan_InitializeDefaultCodepage();
@@ -299,7 +305,9 @@
// Since this function actually opens paths for compare it must be
// called after initializing CMainFrame!
- ParseArgsAndDoOpen(cmdInfo, pMainFrame);
+ BOOL bContinue = TRUE;
+ if (ParseArgsAndDoOpen(cmdInfo, pMainFrame) == FALSE && bCommandLineInvoke)
+ bContinue = FALSE;
if (hMutex)
{
@@ -316,10 +324,16 @@
CDirView *pDirView = DirViews.RemoveHead();
CDirFrame *pf = pDirView->GetParentFrame();
}
+ bContinue = FALSE;
+ }
+
+ // If user wants to cancel the compare, close WinMerge
+ if (bContinue == FALSE)
+ {
pMainFrame->PostMessage(WM_CLOSE, 0, 0);
}
- return TRUE;
+ return bContinue;
}
// App command to run the dialog
@@ -621,10 +635,13 @@
* The name of the function is a legacy code from the time that this function
* actually parsed the command line. Today the parsing is done using the
* MergeCmdLineInfo class.
- *
+ * @param [in] cmdInfo Commandline parameters info.
+ * @param [in] pMainFrame Pointer to application main frame.
+ * @return TRUE if we opened the compare, FALSE if the compare was canceled.
*/
-void CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame)
+BOOL CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame)
{
+ BOOL bCompared = FALSE;
m_bNonInteractive = cmdInfo.m_bNonInteractive;
SetOptionsFromCmdLine(cmdInfo);
@@ -667,15 +684,19 @@
if (cmdInfo.m_nFiles > 2)
{
pMainFrame->m_strSaveAsPath = cmdInfo.m_Files[2];
- pMainFrame->DoFileOpen(cmdInfo.m_Files[0], cmdInfo.m_Files[1],
- cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer);
+ bCompared = pMainFrame->DoFileOpen(cmdInfo.m_Files[0],
+ cmdInfo.m_Files[1], cmdInfo.m_dwLeftFlags,
+ cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL,
+ cmdInfo.m_sPreDiffer);
}
else if (cmdInfo.m_nFiles > 1)
{
cmdInfo.m_dwLeftFlags |= FFILEOPEN_CMDLINE;
cmdInfo.m_dwRightFlags |= FFILEOPEN_CMDLINE;
- pMainFrame->DoFileOpen(cmdInfo.m_Files[0], cmdInfo.m_Files[1],
- cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer);
+ bCompared = pMainFrame->DoFileOpen(cmdInfo.m_Files[0],
+ cmdInfo.m_Files[1], cmdInfo.m_dwLeftFlags,
+ cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL,
+ cmdInfo.m_sPreDiffer);
}
else if (cmdInfo.m_nFiles == 1)
{
@@ -687,11 +708,13 @@
else
{
cmdInfo.m_dwRightFlags = FFILEOPEN_NONE;
- pMainFrame->DoFileOpen(sFilepath, _T(""),
- cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer);
+ bCompared = pMainFrame->DoFileOpen(sFilepath, _T(""),
+ cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags,
+ cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer);
}
}
}
+ return bCompared;
}
/** @brief Handle all command line arguments which are mapped to WinMerge options. */
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2006-11-22 15:24:22 UTC (rev 3835)
+++ trunk/Src/Merge.h 2006-11-22 16:42:46 UTC (rev 3836)
@@ -87,7 +87,7 @@
virtual BOOL PreTranslateMessage(MSG* pMsg);
void InitializeFileFilters();
- void ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame);
+ BOOL ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame);
void SetOptionsFromCmdLine(const MergeCmdLineInfo& cmdInfo);
CString GetUsageDescription();
// End MergeArgs.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-23 17:54:43
|
Revision: 3841
http://svn.sourceforge.net/winmerge/?rev=3841&view=rev
Author: kimmov
Date: 2006-11-23 09:54:41 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
PATCH: [ 1512881 ] Fix memleak from charsets.c
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.cpp
trunk/Src/charsets.c
trunk/Src/charsets.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-23 16:41:49 UTC (rev 3840)
+++ trunk/Src/Changes.txt 2006-11-23 17:54:41 UTC (rev 3841)
@@ -5,6 +5,8 @@
2006-11-22 Kimmo
PATCH: [ 1600714 ] Allow canceling when started from commandline
Src: Merge.cpp Merge.h
+ PATCH: [ 1512881 ] Fix memleak from charsets.c
+ Src: charsets.cp charsets.h Merge.cpp
2006-11-21 Kimmo
PATCH: [ 1600000 ] Fix project file Has*() functions
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-11-23 16:41:49 UTC (rev 3840)
+++ trunk/Src/Merge.cpp 2006-11-23 17:54:41 UTC (rev 3841)
@@ -51,6 +51,9 @@
#include "OptionsDef.h"
#include "MergeCmdLineInfo.h"
+// For shutdown cleanup
+#include "charsets.h"
+
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -150,6 +153,7 @@
// Keep freed memory blocks in the heap's linked list and mark them as freed
tmpFlag |= _CRTDBG_DELAY_FREE_MEM_DF;
// Call _CrtCheckMemory at every allocation and deallocation request.
+ // WARNING: This slows down WinMerge *A LOT*
tmpFlag |= _CRTDBG_CHECK_ALWAYS_DF;
// Set the new state for the flag
_CrtSetDbgFlag( tmpFlag );
@@ -522,14 +526,20 @@
pCmdUI->Enable(bLangsInstalled);
}
+/**
+ * @brief Called when application is about to exit.
+ * This functions is called when application is exiting, so this is
+ * good place to do cleanups.
+ * @return Application's exit value (returned from WinMain()).
+ */
int CMergeApp::ExitInstance()
{
+ charsets_cleanup();
delete m_mainThreadScripts;
CWinApp::ExitInstance();
return m_nLastCompareResult;
}
-
static void AddEnglishResourceHook()
{
// After calling AfxSetResourceHandle to point to a language
Modified: trunk/Src/charsets.c
===================================================================
--- trunk/Src/charsets.c 2006-11-23 16:41:49 UTC (rev 3840)
+++ trunk/Src/charsets.c 2006-11-23 17:54:41 UTC (rev 3841)
@@ -962,6 +962,10 @@
{ 0, NULL, 0, no }
};
+static struct _charsetInfo **index1;
+static struct _charsetInfo **index2;
+static struct _charsetInfo **index3;
+
enum { numCharsetInfo = sizeof charsetInfo / sizeof *charsetInfo - 1 };
static int CompareByName(const void *elem1, const void *elem2)
@@ -988,22 +992,21 @@
static struct _charsetInfo const *FindByName(const char *name)
{
struct _charsetInfo const *info = NULL;
- static struct _charsetInfo const **index = NULL;
- if (index == NULL)
+ if (index1 == NULL)
{
size_t i;
- index = (struct _charsetInfo const **)calloc(numCharsetInfo, sizeof(void *));
+ index1 = (struct _charsetInfo **)calloc(numCharsetInfo, sizeof(void *));
for (i = numCharsetInfo ; i-- ; )
{
- index[i] = charsetInfo + i;
+ index1[i] = charsetInfo + i;
}
- qsort((void*)index, numCharsetInfo, sizeof(void *), CompareByName);
+ qsort((void*)index1, numCharsetInfo, sizeof(void *), CompareByName);
}
- if (index && name)
+ if (index1 && name)
{
struct _charsetInfo const key = {0, name, 0, no};
struct _charsetInfo const *pkey = &key;
- struct _charsetInfo const **pinfo = (struct _charsetInfo const **)bsearch(&pkey, index, numCharsetInfo, sizeof *index, CompareByName);
+ struct _charsetInfo const **pinfo = (struct _charsetInfo **)bsearch(&pkey, index1, numCharsetInfo, sizeof *index1, CompareByName);
if (pinfo)
{
info = *pinfo;
@@ -1015,47 +1018,65 @@
static struct _charsetInfo const *FindById(unsigned id)
{
size_t numIndex = charsetInfo[numCharsetInfo - 1].id + 1;
- static struct _charsetInfo const **index = NULL;
- if (index == NULL)
+ if (index2 == NULL)
{
size_t i;
- index = (struct _charsetInfo const **)calloc(numIndex, sizeof(void *));
+ index2 = (struct _charsetInfo **)calloc(numIndex, sizeof(void *));
for (i = numCharsetInfo ; i-- ; )
{
- index[charsetInfo[i].id] = charsetInfo + i;
+ index2[charsetInfo[i].id] = charsetInfo + i;
}
}
- return index && id < numIndex ? index[id] : NULL;
+ return index2 && id < numIndex ? index2[id] : NULL;
}
static struct _charsetInfo const *FindByCodePage(unsigned codepage)
{
struct _charsetInfo const *info = NULL;
size_t numIndex = charsetInfo[numCharsetInfo - 1].id + 1;
- static struct _charsetInfo const **index = NULL;
- if (index == NULL)
+ if (index3 == NULL)
{
size_t i;
- index = (struct _charsetInfo const **)calloc(numIndex, sizeof(void *));
+ index3 = (struct _charsetInfo **)calloc(numIndex, sizeof(void *));
for (i = numCharsetInfo + 1 ; i-- ; )
{
- index[charsetInfo[i].id] = charsetInfo + i;
+ index3[charsetInfo[i].id] = charsetInfo + i;
}
- qsort((void*)index, numIndex, sizeof(void *), SortCompareByCodePage);
+ qsort((void*)index3, numIndex, sizeof(void *), SortCompareByCodePage);
}
- if (index && codepage)
+ if (index3 && codepage)
{
struct _charsetInfo const key = {0, 0, codepage, no};
struct _charsetInfo const *pkey = &key;
- struct _charsetInfo const **pinfo = (struct _charsetInfo const **)bsearch(&pkey, index, numIndex, sizeof(void *), CompareByCodePage);
+ struct _charsetInfo const **pinfo = (struct _charsetInfo **)bsearch(&pkey, index3, numIndex, sizeof(void *), CompareByCodePage);
if (pinfo) do
{
info = *pinfo;
- } while (pinfo > index && CompareByCodePage(--pinfo, &pkey) == 0);
+ } while (pinfo > index3 && CompareByCodePage(--pinfo, &pkey) == 0);
}
return info;
}
+void charsets_cleanup(void)
+{
+ if (index1)
+ {
+ free(index1);
+ index1 = NULL;
+ }
+ if (index2)
+ {
+ free(index2);
+ index2 = NULL;
+ }
+ if (index3)
+ {
+ free(index3);
+ index3 = NULL;
+ }
+}
+
+
unsigned GetEncodingIdFromName(const char *name)
{
struct _charsetInfo const *info = FindByName(name);
Modified: trunk/Src/charsets.h
===================================================================
--- trunk/Src/charsets.h 2006-11-23 16:41:49 UTC (rev 3840)
+++ trunk/Src/charsets.h 2006-11-23 17:54:41 UTC (rev 3841)
@@ -12,6 +12,9 @@
Runtime-allocated index arrays have been added to improve lookup speed.
*/
+#ifndef _CHARSETS_H_
+#define _CHARSETS_H_
+
#ifdef __cplusplus
#define extern extern "C"
#endif
@@ -23,4 +26,8 @@
extern const char *GetEncodingNameFromId(unsigned id);
extern const char *GetEncodingNameFromCodePage(unsigned cp);
+extern void charsets_cleanup(void);
+
#undef extern
+
+#endif // _CHARSETS_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-23 18:33:34
|
Revision: 3842
http://svn.sourceforge.net/winmerge/?rev=3842&view=rev
Author: kimmov
Date: 2006-11-23 10:33:21 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
- Submitted by Gal, minor edit by Kimmo
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/StdAfx.cpp
trunk/Src/StdAfx.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-23 17:54:41 UTC (rev 3841)
+++ trunk/Src/Changes.txt 2006-11-23 18:33:21 UTC (rev 3842)
@@ -7,6 +7,9 @@
Src: Merge.cpp Merge.h
PATCH: [ 1512881 ] Fix memleak from charsets.c
Src: charsets.cp charsets.h Merge.cpp
+ PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
+ Submitted by Gal, minor edit by Kimmo
+ Src: StdAfx.cpp StdAfx.h
2006-11-21 Kimmo
PATCH: [ 1600000 ] Fix project file Has*() functions
Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp 2006-11-23 17:54:41 UTC (rev 3841)
+++ trunk/Src/StdAfx.cpp 2006-11-23 18:33:21 UTC (rev 3842)
@@ -183,7 +183,7 @@
#endif
}
-#if _MSC_VER == 1310
+#if _MSC_VER <= 1310
/**
* @brief Calculates a number absolute value.
*/
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2006-11-23 17:54:41 UTC (rev 3841)
+++ trunk/Src/StdAfx.h 2006-11-23 18:33:21 UTC (rev 3842)
@@ -16,9 +16,20 @@
#define WINVER 0x400
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+// Disable VC6's "identifier was truncated..." warning. It is meaningless.
+#if _MSC_VER == 1200
+ #pragma warning(disable: 4786)
+#endif
+
+// Declare this function for VC6 and VS2002
+// We dont' know if the function exists in VS2002 so we'd better be safe here!
+#if _MSC_VER <= 1300
+ __int64 _abs64_patch(__int64 n);
+#endif
+
// A patch to solve a VC 7.1 bug. It seems that it doesn't export _abs64
// function.
-#if _MSC_VER == 1310
+#if _MSC_VER <= 1310
#define _abs64 _abs64_patch
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-23 19:40:51
|
Revision: 3843
http://svn.sourceforge.net/winmerge/?rev=3843&view=rev
Author: kimmov
Date: 2006-11-23 11:40:50 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/LocationView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-23 18:33:21 UTC (rev 3842)
+++ trunk/Src/Changes.txt 2006-11-23 19:40:50 UTC (rev 3843)
@@ -10,6 +10,9 @@
PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
Submitted by Gal, minor edit by Kimmo
Src: StdAfx.cpp StdAfx.h
+ BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
+ Fix submitted by Gal
+ Src: LocationView.cpp
2006-11-21 Kimmo
PATCH: [ 1600000 ] Fix project file Has*() functions
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2006-11-23 18:33:21 UTC (rev 3842)
+++ trunk/Src/LocationView.cpp 2006-11-23 19:40:50 UTC (rev 3843)
@@ -760,7 +760,7 @@
*/
void CLocationView::UpdateVisiblePos(int nTopLine, int nBottomLine)
{
- DrawVisibleAreaRect(nTopLine, nBottomLine);
+ DrawVisibleAreaRect();
if (m_displayMovedBlocks != DISPLAY_MOVED_NONE)
DrawConnectLines();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-24 22:32:39
|
Revision: 3845
http://svn.sourceforge.net/winmerge/?rev=3845&view=rev
Author: kimmov
Date: 2006-11-24 14:32:35 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Fix bunch of doxygen warnings (wrong parameter names etc)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/CmdLineParser.h
trunk/Src/DiffWrapper.cpp
trunk/Src/DirDoc.cpp
trunk/Src/FilepathEdit.cpp
trunk/Src/PropEditor.cpp
trunk/Src/WMGotoDlg.h
trunk/Src/files.cpp
trunk/Src/paths.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/Changes.txt 2006-11-24 22:32:35 UTC (rev 3845)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-24 Kimmo
+ Fix bunch of doxygen warnings (wrong parameter names etc)
+ Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
+ paths.cpp PropEditor.cpp WMGotoDlg.h
+
2006-11-23 WinMerge experimental release 2.7.1.2 (SVN revision 3844)
2006-11-23 Kimmo
Modified: trunk/Src/CmdLineParser.h
===================================================================
--- trunk/Src/CmdLineParser.h 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/CmdLineParser.h 2006-11-24 22:32:35 UTC (rev 3845)
@@ -68,11 +68,10 @@
* actual parsing.
*
* @param [in] pszParam The parameter or flag.
- * @bFlag [in] bFlag Indicates whether pszParam is a parameter or a
+ * @param [in] bFlag Indicates whether pszParam is a parameter or a
* flag.
- * @bLast [in] bLast Indicates if this is the last parameter or flag
+ * @param [in] bLast Indicates if this is the last parameter or flag
* on the command line.
- *
*/
virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast) = 0;
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/DiffWrapper.cpp 2006-11-24 22:32:35 UTC (rev 3845)
@@ -132,7 +132,7 @@
* This function enables or disables DiffList creation. When
* @p diffList is NULL difflist is not created. When valid DiffList
* pointer is given, compare results are stored into it.
- * @param [in] difflist Pointer to DiffList getting compare results.
+ * @param [in] diffList Pointer to DiffList getting compare results.
*/
void CDiffWrapper::SetCreateDiffList(DiffList *diffList)
{
@@ -603,8 +603,8 @@
/**
* @brief Set source paths for original (NON-TEMP) diffing two files.
* Sets full paths to two (NON-TEMP) files we are diffing.
- * @param [in] filepath1 First file to compare "(NON-TEMP) file".
- * @param [in] filepath2 Second file to compare "(NON-TEMP) file".
+ * @param [in] OriginalFile1 First file to compare "(NON-TEMP) file".
+ * @param [in] OriginalFile2 Second file to compare "(NON-TEMP) file".
*/
void CDiffWrapper::SetCompareFiles(const CString &OriginalFile1, const CString &OriginalFile2)
{
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/DirDoc.cpp 2006-11-24 22:32:35 UTC (rev 3845)
@@ -335,12 +335,9 @@
}
/**
- * @brief Determines if user wants to see this item
- * @param [in] pCtxt CDiffContext containing filedata
- * @param [in] di Item tested
- * @param [in] llen Lenght of normalised left path
- * @param [in] rlen Lenght of normalised right path
- * @return File- or subfolder name of item, NULL if user does not want to see it
+ * @brief Determines if the user wants to see given item.
+ * @param [in] di Item to check.
+ * @return TRUE if item should be shown, FALSE if not.
* @sa CDirDoc::Redisplay()
*/
BOOL CDirDoc::IsShowable(const DIFFITEM & di)
Modified: trunk/Src/FilepathEdit.cpp
===================================================================
--- trunk/Src/FilepathEdit.cpp 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/FilepathEdit.cpp 2006-11-24 22:32:35 UTC (rev 3845)
@@ -53,8 +53,8 @@
* slash chars.
*
* @param [in] pDC Pointer to draw context.
- * @param [in] nMaxWidth Maximum width of string.
- * @param [in,out] sFilePath:
+ * @param [in] maxWidth Maximum width of string.
+ * @param [in,out] sFilepath:
* - in: string to format
* - out: formatted string
* @return Number of lines path is splitted to.
Modified: trunk/Src/PropEditor.cpp
===================================================================
--- trunk/Src/PropEditor.cpp 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/PropEditor.cpp 2006-11-24 22:32:35 UTC (rev 3845)
@@ -150,7 +150,7 @@
/**
* @brief Shortcut to enable or disable a control
* @param [in] item ID of dialog control to enable/disable.
- * @paran [in] enable if true control is enabled, else disabled.
+ * @param [in] enable if true control is enabled, else disabled.
*/
void CPropEditor::EnableDlgItem(int item, bool enable)
{
Modified: trunk/Src/WMGotoDlg.h
===================================================================
--- trunk/Src/WMGotoDlg.h 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/WMGotoDlg.h 2006-11-24 22:32:35 UTC (rev 3845)
@@ -15,7 +15,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
/////////////////////////////////////////////////////////////////////////////
/**
- * @file WMGotodDlg.h
+ * @file WMGotoDlg.h
*
* @brief Declaration file for CWMGotoDlg
*
Modified: trunk/Src/files.cpp
===================================================================
--- trunk/Src/files.cpp 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/files.cpp 2006-11-24 22:32:35 UTC (rev 3845)
@@ -155,8 +155,8 @@
/**
* @brief Checks if file is read-only on disk.
* Optionally returns also if file exists.
- * @param [in] Full path to file to check.
- * @param [in, out] If non-NULL, returns if file exists.
+ * @param [in] file Full path to file to check.
+ * @param [in, out] fileExists If non-NULL, function returns if file exists.
* @return TRUE if file is read-only, FALSE otherwise.
*/
BOOL files_isFileReadOnly(const CString &file, BOOL *fileExists /*=NULL*/)
Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp 2006-11-23 19:54:31 UTC (rev 3844)
+++ trunk/Src/paths.cpp 2006-11-24 22:32:35 UTC (rev 3845)
@@ -18,7 +18,7 @@
/**
* @brief Checks if char in string is slash.
* @param [in] pszStart String to check.
- * @param [in] Position of char in string to check (0-based index).
+ * @param [in] nPos of char in string to check (0-based index).
* @return true if char is slash.
*/
static bool IsSlash(LPCTSTR pszStart, int nPos)
@@ -441,7 +441,7 @@
* This function appends subpath to given path. Function ensures there
* is only one backslash between path parts.
* @param [in] path "Base" path where other part is appended.
- * @param [in] subPath Path part to append to base part.
+ * @param [in] subpath Path part to append to base part.
* @return Formatted path. If one of arguments is empty then returns
* non-empty argument. If both argumets are empty empty string is returned.
*/
@@ -476,7 +476,7 @@
/**
* @brief Get parent path.
* This function returns parent path for given path. For example for
- * path "c:\folder\subfolder" we return "c:\folder.
+ * path "c:\folder\subfolder" we return "c:\folder".
* @param [in] path Path to get parent path for.
* @return Parent path.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-25 09:59:05
|
Revision: 3846
http://svn.sourceforge.net/winmerge/?rev=3846&view=rev
Author: kimmov
Date: 2006-11-25 01:59:02 -0800 (Sat, 25 Nov 2006)
Log Message:
-----------
PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/PreferencesDlg.cpp
trunk/Src/DirActions.cpp
trunk/Src/DirCmpReportDlg.cpp
trunk/Src/FileFiltersDlg.cpp
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/Merge.dsp
trunk/Src/Merge.h
trunk/Src/MergeDoc.cpp
trunk/Src/OpenDlg.cpp
trunk/Src/PatchDlg.cpp
trunk/Src/ProjectFilePathsDlg.cpp
trunk/Src/PropRegistry.cpp
trunk/Src/PropVss.cpp
Added Paths:
-----------
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/FileOrFolderSelect.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/Changes.txt 2006-11-25 09:59:02 UTC (rev 3846)
@@ -2,6 +2,14 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-25 Kimmo
+ PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
+ Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
+ Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
+ PropRegistry.cpp PropVss.cpp
+ Src/Common: PreferencesDlg.cpp
+ Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h
+
2006-11-24 Kimmo
Fix bunch of doxygen warnings (wrong parameter names etc)
Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
Modified: trunk/Src/Common/PreferencesDlg.cpp
===================================================================
--- trunk/Src/Common/PreferencesDlg.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/Common/PreferencesDlg.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -18,7 +18,7 @@
#include "PreferencesDlg.h"
#include "MainFrm.h"
#include "coretools.h" //SplitFilename()
-#include "Merge.h" // SelectFile()
+#include "FileOrFolderSelect.h"
#include "winclasses.h"
#include "wclassdefines.h"
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/DirActions.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -32,6 +32,7 @@
#include "FileActionScript.h"
#include "LoadSaveCodepageDlg.h"
#include "IntToIntMap.h"
+#include "FileOrFolderSelect.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Modified: trunk/Src/DirCmpReportDlg.cpp
===================================================================
--- trunk/Src/DirCmpReportDlg.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/DirCmpReportDlg.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -9,11 +9,11 @@
//
#include "stdafx.h"
-#include "Merge.h"
#include "Coretools.h"
#include "DirCmpReportDlg.h"
#include "DirReportTypes.h"
#include "paths.h"
+#include "FileOrFolderSelect.h"
IMPLEMENT_DYNAMIC(DirCmpReportDlg, CDialog)
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/FileFiltersDlg.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -32,6 +32,7 @@
#include "paths.h"
#include "SharedFilterDlg.h"
#include "TestFilterDlg.h"
+#include "FileOrFolderSelect.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Added: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp (rev 0)
+++ trunk/Src/FileOrFolderSelect.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -0,0 +1,176 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file FileOrFolderSelect.cpp
+ *
+ * @brief Implementation of the file and folder selection routines.
+ */
+
+#include "stdafx.h"
+#include "FileOrFolderSelect.h"
+#include "coretools.h"
+#include "paths.h"
+
+/**
+ * @brief Helper function for selecting dir/file
+ * @param [in] parent Handle to parent window. Can be a NULL, but then
+ * CMainFrame is used which can cause modality problems.
+ * @param [out] path Selected path is returned in this string
+ * @param [in] initialPath Initial path (and file) shown when dialog is opened
+ * @param [in] title Title for path selection dialog
+ * @param [in] filterid 0 or STRING ID for filter string
+ * - 0 means "All files (*.*)"
+ * @param [in] is_open Selects Open/Save -dialog
+ */
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/,
+ LPCTSTR title /*= _T("Open")*/, UINT filterid /*=0*/,
+ BOOL is_open /*=TRUE*/)
+{
+ path.Empty(); // Clear output param
+
+ // This will tell common file dialog what to show
+ // and also this will hold its return value
+ CString sSelectedFile;
+
+ // check if specified path is a file
+ if (initialPath && initialPath[0])
+ {
+ // If initial path info includes a file
+ // we put the bare filename into sSelectedFile
+ // so the common file dialog will start up with that file selected
+ if (paths_DoesPathExist(initialPath) == IS_EXISTING_FILE)
+ {
+ SplitFilename(initialPath, 0, &sSelectedFile, 0);
+ }
+ }
+
+ if (parent == NULL)
+ parent = AfxGetMainWnd()->GetSafeHwnd();
+
+ if (!filterid)
+ filterid = IDS_ALLFILES;
+ CString filters = LoadResString(filterid);
+
+ // Convert extension mask from MFC style separators ('|')
+ // to Win32 style separators ('\0')
+ LPTSTR filtersStr = filters.GetBuffer(0);
+ ConvertFilter(filtersStr);
+ filters.ReleaseBuffer();
+
+ OPENFILENAME ofn;
+ memset(&ofn, 0, sizeof(ofn));
+ ofn.lStructSize = sizeof(ofn);
+ ofn.hwndOwner = parent;
+ ofn.lpstrFilter = filtersStr;
+ ofn.lpstrCustomFilter = NULL;
+ ofn.nFilterIndex = 1;
+ ofn.lpstrFile = sSelectedFile.GetBuffer(MAX_PATH);
+ ofn.nMaxFile = MAX_PATH;
+ ofn.lpstrInitialDir = initialPath;
+ ofn.lpstrTitle = title;
+ ofn.lpstrFileTitle = NULL;
+ ofn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
+
+ BOOL bRetVal = FALSE;
+ if (is_open)
+ bRetVal = GetOpenFileName(&ofn);
+ else
+ bRetVal = GetSaveFileName(&ofn);
+ // common file dialog populated sSelectedFile variable's buffer
+ sSelectedFile.ReleaseBuffer();
+ SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
+
+ if (bRetVal)
+ path = sSelectedFile;
+
+ return bRetVal;
+}
+
+/**
+ * @brief Helper function for selecting directory
+ * @param [out] path Selected path is returned in this string
+ * @param [in] root_path Initial path shown when dialog is opened
+ * @param [in] title Title for path selection dialog
+ * @param [in] hwndOwner Handle to owner window or NULL
+ * @return TRUE if valid folder selected (not cancelled)
+ */
+BOOL SelectFolder(CString& path, LPCTSTR root_path /*=NULL*/,
+ LPCTSTR title /*=NULL*/,
+ HWND hwndOwner /*=NULL*/)
+{
+ UNREFERENCED_PARAMETER(root_path);
+ BROWSEINFO bi;
+ LPMALLOC pMalloc;
+ LPITEMIDLIST pidl;
+ TCHAR szPath[MAX_PATH] = {0};
+ BOOL bRet = FALSE;
+
+ bi.hwndOwner = hwndOwner;
+ bi.pidlRoot = NULL; // Start from desktop folder
+ bi.pszDisplayName = szPath;
+ bi.lpszTitle = title;
+ bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
+ bi.lpfn = NULL;
+ bi.lParam = NULL;
+
+ pidl = SHBrowseForFolder(&bi);
+
+ if (pidl)
+ {
+ if (SHGetPathFromIDList(pidl, szPath))
+ {
+ path = szPath;
+ bRet = TRUE;
+ }
+
+ SHGetMalloc(&pMalloc);
+ pMalloc->Free(pidl);
+ pMalloc->Release();
+ }
+ return bRet;
+}
+
+/**
+ * @brief Helper function for converting filter format.
+ *
+ * MFC functions separate filter strings with | char which is also
+ * good choice to safe into resource. But WinAPI32 functions we use
+ * needs '\0' as separator. This function replaces '|'s with '\0's.
+ *
+ * @param [in,out] filterStr
+ * - in Mask string to convert
+ * - out Converted string
+ */
+void ConvertFilter(LPTSTR filterStr)
+{
+ TCHAR *ch = 0;
+ TCHAR *strPtr = filterStr;
+ do
+ {
+ ch = _tcschr(strPtr, '|');
+ if (ch)
+ {
+ strPtr = ch + 1;
+ *ch = '\0';
+ }
+ }
+ while (ch != 0);
+}
Added: trunk/Src/FileOrFolderSelect.h
===================================================================
--- trunk/Src/FileOrFolderSelect.h (rev 0)
+++ trunk/Src/FileOrFolderSelect.h 2006-11-25 09:59:02 UTC (rev 3846)
@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////
+// WinMerge: an interactive diff/merge utility
+// Copyright (C) 1997-2006 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.
+//
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file FileOrFolderSelect.h
+ *
+ * @brief Declaration of the file and folder selection routines.
+ */
+
+#ifndef _FILE_OR_FOLDER_SELECTION_H_
+#define _FILE_OR_FOLDER_SELECTION_H_
+
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR root_path = NULL,
+ LPCTSTR title = _T("Open"), UINT filterid = 0,
+ BOOL is_open =TRUE);
+
+BOOL SelectFolder(CString& path, LPCTSTR root_path = NULL,
+ LPCTSTR title = NULL,
+ HWND hwndOwner = NULL);
+
+void ConvertFilter(LPTSTR filterStr);
+
+#endif
\ No newline at end of file
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/MainFrm.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -70,6 +70,7 @@
#include "AppSerialize.h"
#include "ProjectFilePathsDlg.h"
#include "MergeCmdLineInfo.h"
+#include "FileOrFolderSelect.h"
/*
One source file must compile the stubs for multimonitor
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/Merge.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -350,152 +350,7 @@
/////////////////////////////////////////////////////////////////////////////
// CMergeApp commands
-/**
- * @brief Helper function for selecting dir/file
- * @param [in] parent Handle to parent window. Can be a NULL, but then
- * CMainFrame is used which can cause modality problems.
- * @param [out] path Selected path is returned in this string
- * @param [in] initialPath Initial path (and file) shown when dialog is opened
- * @param [in] title Title for path selection dialog
- * @param [in] filterid 0 or STRING ID for filter string
- * - 0 means "All files (*.*)"
- * @param [in] is_open Selects Open/Save -dialog
- */
-BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/,
- LPCTSTR title /*= _T("Open")*/, UINT filterid /*=0*/,
- BOOL is_open /*=TRUE*/)
-{
- path.Empty(); // Clear output param
- // This will tell common file dialog what to show
- // and also this will hold its return value
- CString sSelectedFile;
-
- // check if specified path is a file
- if (initialPath && initialPath[0])
- {
- // If initial path info includes a file
- // we put the bare filename into sSelectedFile
- // so the common file dialog will start up with that file selected
- if (paths_DoesPathExist(initialPath) == IS_EXISTING_FILE)
- {
- SplitFilename(initialPath, 0, &sSelectedFile, 0);
- }
- }
-
- if (parent == NULL)
- parent = AfxGetMainWnd()->GetSafeHwnd();
-
- if (!filterid)
- filterid = IDS_ALLFILES;
- CString filters = LoadResString(filterid);
-
- // Convert extension mask from MFC style separators ('|')
- // to Win32 style separators ('\0')
- LPTSTR filtersStr = filters.GetBuffer(0);
- ConvertFilter(filtersStr);
- filters.ReleaseBuffer();
-
- OPENFILENAME ofn;
- memset(&ofn, 0, sizeof(ofn));
- ofn.lStructSize = sizeof(ofn);
- ofn.hwndOwner = parent;
- ofn.lpstrFilter = filtersStr;
- ofn.lpstrCustomFilter = NULL;
- ofn.nFilterIndex = 1;
- ofn.lpstrFile = sSelectedFile.GetBuffer(MAX_PATH);
- ofn.nMaxFile = MAX_PATH;
- ofn.lpstrInitialDir = initialPath;
- ofn.lpstrTitle = title;
- ofn.lpstrFileTitle = NULL;
- ofn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
-
- BOOL bRetVal = FALSE;
- if (is_open)
- bRetVal = GetOpenFileName(&ofn);
- else
- bRetVal = GetSaveFileName(&ofn);
- // common file dialog populated sSelectedFile variable's buffer
- sSelectedFile.ReleaseBuffer();
- SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
-
- if (bRetVal)
- path = sSelectedFile;
-
- return bRetVal;
-}
-
-/**
- * @brief Helper function for selecting directory
- * @param [out] path Selected path is returned in this string
- * @param [in] root_path Initial path shown when dialog is opened
- * @param [in] title Title for path selection dialog
- * @param [in] hwndOwner Handle to owner window or NULL
- * @return TRUE if valid folder selected (not cancelled)
- */
-BOOL SelectFolder(CString& path, LPCTSTR root_path /*=NULL*/,
- LPCTSTR title /*=NULL*/,
- HWND hwndOwner /*=NULL*/)
-{
- UNREFERENCED_PARAMETER(root_path);
- BROWSEINFO bi;
- LPMALLOC pMalloc;
- LPITEMIDLIST pidl;
- TCHAR szPath[MAX_PATH] = {0};
- BOOL bRet = FALSE;
-
- bi.hwndOwner = hwndOwner;
- bi.pidlRoot = NULL; // Start from desktop folder
- bi.pszDisplayName = szPath;
- bi.lpszTitle = title;
- bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
- bi.lpfn = NULL;
- bi.lParam = NULL;
-
- pidl = SHBrowseForFolder(&bi);
-
- if (pidl)
- {
- if (SHGetPathFromIDList(pidl, szPath))
- {
- path = szPath;
- bRet = TRUE;
- }
-
- SHGetMalloc(&pMalloc);
- pMalloc->Free(pidl);
- pMalloc->Release();
- }
- return bRet;
-}
-
-/**
- * @brief Helper function for converting filter format.
- *
- * MFC functions separate filter strings with | char which is also
- * good choice to safe into resource. But WinAPI32 functions we use
- * needs '\0' as separator. This function replaces '|'s with '\0's.
- *
- * @param [in,out] filterStr
- * - in Mask string to convert
- * - out Converted string
- */
-void ConvertFilter(LPTSTR filterStr)
-{
- TCHAR *ch = 0;
- TCHAR *strPtr = filterStr;
- do
- {
- ch = _tcschr(strPtr, '|');
- if (ch)
- {
- strPtr = ch + 1;
- *ch = '\0';
- }
- }
- while (ch != 0);
-}
-
BOOL CMergeApp::PreTranslateMessage(MSG* pMsg)
{
// CG: The following lines were added by the Splash Screen component.
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/Merge.dsp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -421,6 +421,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FileOrFolderSelect.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\FilepathEdit.cpp
# End Source File
# Begin Source File
@@ -1153,6 +1157,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FileOrFolderSelect.h
+# End Source File
+# Begin Source File
+
SOURCE=.\FilepathEdit.h
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/Merge.h 2006-11-25 09:59:02 UTC (rev 3846)
@@ -114,16 +114,7 @@
/////////////////////////////////////////////////////////////////////////////
CMergeDoc *GetDoc();
-BOOL SelectFile(HWND parent, CString& path, LPCTSTR root_path = NULL,
- LPCTSTR title = _T("Open"), UINT filterid = 0,
- BOOL is_open =TRUE);
-BOOL SelectFolder(CString& path, LPCTSTR root_path = NULL,
- LPCTSTR title = NULL,
- HWND hwndOwner = NULL);
-
-void ConvertFilter(LPTSTR filterStr);
-
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/MergeDoc.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -62,6 +62,7 @@
#include "OptionsMgr.h"
#include "ProjectFile.h"
#include "MergeLineFlags.h"
+#include "FileOrFolderSelect.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/OpenDlg.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -40,6 +40,7 @@
#include "MainFrm.h"
#include "OptionsMgr.h"
#include "dlgutil.h"
+#include "FileOrFolderSelect.h"
#ifdef COMPILE_MULTIMON_STUBS
#undef COMPILE_MULTIMON_STUBS
Modified: trunk/Src/PatchDlg.cpp
===================================================================
--- trunk/Src/PatchDlg.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/PatchDlg.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -29,6 +29,7 @@
#include "coretools.h"
#include "paths.h"
#include "CompareOptions.h"
+#include "FileOrFolderSelect.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/ProjectFilePathsDlg.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -14,6 +14,7 @@
#include "ProjectFile.h"
#include "coretools.h"
#include "ProjectFilePathsDlg.h"
+#include "FileOrFolderSelect.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Modified: trunk/Src/PropRegistry.cpp
===================================================================
--- trunk/Src/PropRegistry.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/PropRegistry.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -27,7 +27,7 @@
#include "PropRegistry.h"
#include "RegKey.h"
#include "coretools.h"
-#include "Merge.h" // SelectFile()
+#include "FileOrFolderSelect.h"
#include "MainFrm.h" // GetDefaultEditor()
#include "OptionsDef.h"
#include "OptionsMgr.h"
Modified: trunk/Src/PropVss.cpp
===================================================================
--- trunk/Src/PropVss.cpp 2006-11-24 22:32:35 UTC (rev 3845)
+++ trunk/Src/PropVss.cpp 2006-11-25 09:59:02 UTC (rev 3846)
@@ -22,7 +22,7 @@
//
#include "stdafx.h"
-#include "merge.h"
+#include "FileOrFolderSelect.h"
#include "MainFrm.h" // VCS_* constants
#include "PropVss.h"
#include "OptionsDef.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-27 09:02:28
|
Revision: 3854
http://svn.sourceforge.net/winmerge/?rev=3854&view=rev
Author: galh
Date: 2006-11-27 01:02:26 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
BUG: [ 1603562 ] Location pane's bar outlines
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/LocationView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-26 20:35:20 UTC (rev 3853)
+++ trunk/Src/Changes.txt 2006-11-27 09:02:26 UTC (rev 3854)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-27 Gal
+ BUG: [ 1603562 ] Location pane's bar outlines
+ Src: LocationView.cpp
+
2006-11-26 Kimmo
Perry is not active developer
Docs/Users: Contributors.txt
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2006-11-26 20:35:20 UTC (rev 3853)
+++ trunk/Src/LocationView.cpp 2006-11-27 09:02:26 UTC (rev 3854)
@@ -73,8 +73,8 @@
SetConnectMovedBlocks(GetOptionsMgr()->GetInt(OPT_CONNECT_MOVED_BLOCKS));
- m_view[0] = NULL;
- m_view[1] = NULL;
+ m_view[MERGE_VIEW_LEFT] = NULL;
+ m_view[MERGE_VIEW_RIGHT] = NULL;
}
BEGIN_MESSAGE_MAP(CLocationView, CView)
@@ -147,14 +147,17 @@
*/
void CLocationView::OnDraw(CDC* pDC)
{
+ ASSERT(m_view[MERGE_VIEW_LEFT] != NULL);
+ ASSERT(m_view[MERGE_VIEW_RIGHT] != NULL);
+
+ if (m_view[MERGE_VIEW_LEFT] == NULL || m_view[MERGE_VIEW_RIGHT] == NULL)
+ return;
+
if (!m_view[MERGE_VIEW_LEFT]->IsInitialized()) return;
CRect rc;
GetClientRect(rc);
- if (m_view[MERGE_VIEW_LEFT] == NULL || m_view[MERGE_VIEW_RIGHT] == NULL)
- return;
-
CMergeDoc *pDoc = GetDocument();
const int w = rc.Width() / 4;
m_nLeftBarLeft = (rc.Width() - 2 * w) / 3;
@@ -191,8 +194,8 @@
// Draw bar outlines
CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
- pDC->Rectangle(m_nLeftBarLeft, Y_OFFSET - 1, m_nLeftBarRight, LineInPix * nbLines + Y_OFFSET);
- pDC->Rectangle(m_nRightBarLeft, Y_OFFSET - 1, m_nRightBarRight, LineInPix * nbLines + Y_OFFSET);
+ pDC->Rectangle(m_nLeftBarLeft, Y_OFFSET - 1, m_nLeftBarRight, LineInPix * nbLines + Y_OFFSET + 1);
+ pDC->Rectangle(m_nRightBarLeft, Y_OFFSET - 1, m_nRightBarRight, LineInPix * nbLines + Y_OFFSET + 1);
pDC->SelectObject(oldObj);
while (true)
@@ -694,7 +697,7 @@
int nTopCoord = (int) (Y_OFFSET + ((double)nTopLine * LineInPix));
int nLeftCoord = INDICATOR_MARGIN;
- int nBottomCoord = (int) (Y_OFFSET + ((double)(nTopLine + nScreenLines) * LineInPix));
+ int nBottomCoord = (int) (Y_OFFSET + ((double)nBottomLine * LineInPix));
int nRightCoord = rc.Width() - INDICATOR_MARGIN;
// Visible area was not changed
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-27 16:59:49
|
Revision: 3856
http://svn.sourceforge.net/winmerge/?rev=3856&view=rev
Author: kimmov
Date: 2006-11-27 08:59:44 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-27 09:07:26 UTC (rev 3855)
+++ trunk/Src/Changes.txt 2006-11-27 16:59:44 UTC (rev 3856)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-27 Kimmo
+ BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
+ Src: Merge.cpp
+
2006-11-27 Gal
BUG: [ 1603562 ] Location pane's bar outlines
Src: LocationView.cpp
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-11-27 09:07:26 UTC (rev 3855)
+++ trunk/Src/Merge.cpp 2006-11-27 16:59:44 UTC (rev 3856)
@@ -568,7 +568,7 @@
CString sFilepath = cmdInfo.m_Files[0];
if (IsProjectFile(sFilepath))
{
- LoadAndOpenProjectFile(sFilepath);
+ bCompared = LoadAndOpenProjectFile(sFilepath);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-27 17:06:33
|
Revision: 3857
http://svn.sourceforge.net/winmerge/?rev=3857&view=rev
Author: kimmov
Date: 2006-11-27 09:06:31 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/FileOrFolderSelect.h
trunk/Src/OpenDlg.cpp
trunk/Src/OpenDlg.h
trunk/Src/ProjectFilePathsDlg.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-27 16:59:44 UTC (rev 3856)
+++ trunk/Src/Changes.txt 2006-11-27 17:06:31 UTC (rev 3857)
@@ -5,6 +5,8 @@
2006-11-27 Kimmo
BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
Src: Merge.cpp
+ PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
+ Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h
2006-11-27 Gal
BUG: [ 1603562 ] Location pane's bar outlines
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2006-11-27 16:59:44 UTC (rev 3856)
+++ trunk/Src/FileOrFolderSelect.cpp 2006-11-27 17:06:31 UTC (rev 3857)
@@ -149,6 +149,99 @@
}
/**
+ * @brief Shows file/folder selection dialog.
+ *
+ * We need this custom function so we can select files and folders with the
+ * same dialog.
+ * - If existing filename is selected return it
+ * - If filename in (CFileDialog) editbox and current folder doesn't form
+ * a valid path to file, return current folder.
+ * @param [in] parent Handle to parent window. Can be a NULL, but then
+ * CMainFrame is used which can cause modality problems.
+ * @param [out] path Selected folder/filename
+ * @param [in] initialPath Initial file or folder shown/selected.
+ * @return TRUE if user choosed a file/folder, FALSE if user canceled dialog.
+ */
+BOOL SelectFileOrFolder(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/)
+{
+ CString title;
+ VERIFY(title.LoadString(IDS_OPEN_TITLE));
+
+ CString dirSelTag;
+
+ // This will tell common file dialog what to show
+ // and also this will hold its return value
+ CString sSelectedFile;
+
+ // check if specified path is a file
+ if (initialPath && initialPath[0])
+ {
+ // If initial path info includes a file
+ // we put the bare filename into sSelectedFile
+ // so the common file dialog will start up with that file selected
+ if (paths_DoesPathExist(initialPath) == IS_EXISTING_FILE)
+ {
+ SplitFilename(initialPath, 0, &sSelectedFile, 0);
+ }
+ }
+
+ if (parent == NULL)
+ parent = AfxGetMainWnd()->GetSafeHwnd();
+
+ int filterid = IDS_ALLFILES;
+
+ if (!filterid)
+ filterid = IDS_ALLFILES;
+ CString filters;
+ VERIFY(filters.LoadString(filterid));
+ // Convert extension mask from MFC style separators ('|')
+ // to Win32 style separators ('\0')
+ LPTSTR filtersStr = filters.GetBuffer(0);
+ ConvertFilter(filtersStr);
+
+ VERIFY(dirSelTag.LoadString(IDS_DIRSEL_TAG));
+
+ // Set initial filename to folder selection tag
+ dirSelTag += _T("."); // Treat it as filename
+ sSelectedFile = dirSelTag;
+
+ OPENFILENAME ofn;
+ memset(&ofn, 0, sizeof(ofn));
+ ofn.lStructSize = sizeof(ofn);
+ ofn.hwndOwner = parent;
+ ofn.lpstrFilter = filtersStr;
+ ofn.lpstrCustomFilter = NULL;
+ ofn.nFilterIndex = 1;
+ ofn.lpstrFile = sSelectedFile.GetBuffer(MAX_PATH);
+ ofn.nMaxFile = MAX_PATH;
+ ofn.lpstrInitialDir = initialPath;
+ ofn.lpstrTitle = title;
+ ofn.lpstrFileTitle = NULL;
+ ofn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_NOTESTFILECREATE;
+
+ BOOL bRetVal = GetOpenFileName(&ofn);
+ // common file dialog populated sSelectedFile variable's buffer
+ sSelectedFile.ReleaseBuffer();
+ SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
+
+ if (bRetVal)
+ {
+ path = sSelectedFile;
+ struct _stati64 statBuffer;
+ int nRetVal = _tstati64(path, &statBuffer);
+ if (nRetVal == -1)
+ {
+ // We have a valid folder name, but propably garbage as a filename.
+ // Return folder name
+ CString folder = GetPathOnly(sSelectedFile);
+ path = folder + '\\';
+ }
+ }
+ return bRetVal;
+}
+
+
+/**
* @brief Helper function for converting filter format.
*
* MFC functions separate filter strings with | char which is also
Modified: trunk/Src/FileOrFolderSelect.h
===================================================================
--- trunk/Src/FileOrFolderSelect.h 2006-11-27 16:59:44 UTC (rev 3856)
+++ trunk/Src/FileOrFolderSelect.h 2006-11-27 17:06:31 UTC (rev 3857)
@@ -27,7 +27,7 @@
#ifndef _FILE_OR_FOLDER_SELECTION_H_
#define _FILE_OR_FOLDER_SELECTION_H_
-BOOL SelectFile(HWND parent, CString& path, LPCTSTR root_path = NULL,
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath = NULL,
LPCTSTR title = _T("Open"), UINT filterid = 0,
BOOL is_open =TRUE);
@@ -35,6 +35,8 @@
LPCTSTR title = NULL,
HWND hwndOwner = NULL);
+BOOL SelectFileOrFolder(HWND parent, CString& path, LPCTSTR root_path = NULL);
+
void ConvertFilter(LPTSTR filterStr);
#endif
\ No newline at end of file
Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp 2006-11-27 16:59:44 UTC (rev 3856)
+++ trunk/Src/OpenDlg.cpp 2006-11-27 17:06:31 UTC (rev 3857)
@@ -234,7 +234,7 @@
break;
}
- if (SelectFile(s, sfolder))
+ if (SelectFileOrFolder(GetSafeHwnd(), s, sfolder))
{
m_strLeft = s;
UpdateData(FALSE);
@@ -268,7 +268,7 @@
break;
}
- if (SelectFile(s, sfolder))
+ if (SelectFileOrFolder(GetSafeHwnd(), s, sfolder))
{
m_strRight = s;
UpdateData(FALSE);
@@ -433,81 +433,6 @@
SetUnpackerStatus(IDS_OPEN_UNPACKERDISABLED);
}
-/**
- * @brief Shows file/folder selection dialog.
- *
- * We need this custom function so we can select files and folders with the
- * same dialog.
- * - If existing filename is selected return it
- * - If filename in (CFileDialog) editbox and current folder doesn't form
- * a valid path to file, return current folder.
- * @param [out] path Selected folder/filename
- * @param [in] pszFolder Initial folder shown
- * @return TRUE if user choosed a file/folder, FALSE if user canceled dialog.
- */
-BOOL COpenDlg::SelectFile(CString& path, LPCTSTR initialPath)
-{
- CString title;
- VERIFY(title.LoadString(IDS_OPEN_TITLE));
-
- CString dirSelTag;
-
- // This will tell common file dialog what to show
- // and also this will hold its return value
- CString sSelectedFile;
-
- int filterid = IDS_ALLFILES;
-
- if (!filterid)
- filterid = IDS_ALLFILES;
- CString filters;
- VERIFY(filters.LoadString(filterid));
- // Convert extension mask from MFC style separators ('|')
- // to Win32 style separators ('\0')
- LPTSTR filtersStr = filters.GetBuffer(0);
- ConvertFilter(filtersStr);
-
- VERIFY(dirSelTag.LoadString(IDS_DIRSEL_TAG));
-
- // Set initial filename to folder selection tag
- dirSelTag += _T("."); // Treat it as filename
- sSelectedFile = dirSelTag;
-
- OPENFILENAME ofn;
- memset(&ofn, 0, sizeof(ofn));
- ofn.lStructSize = sizeof(ofn);
- ofn.hwndOwner = GetSafeHwnd();
- ofn.lpstrFilter = filtersStr;
- ofn.lpstrCustomFilter = NULL;
- ofn.nFilterIndex = 1;
- ofn.lpstrFile = sSelectedFile.GetBuffer(MAX_PATH);
- ofn.nMaxFile = MAX_PATH;
- ofn.lpstrInitialDir = initialPath;
- ofn.lpstrTitle = title;
- ofn.lpstrFileTitle = NULL;
- ofn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_NOTESTFILECREATE;
-
- BOOL bRetVal = GetOpenFileName(&ofn);
- // common file dialog populated sSelectedFile variable's buffer
- sSelectedFile.ReleaseBuffer();
- SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
-
- if (bRetVal)
- {
- path = sSelectedFile;
- struct _stati64 statBuffer;
- int nRetVal = _tstati64(path, &statBuffer);
- if (nRetVal == -1)
- {
- // We have a valid folder name, but propably garbage as a filename.
- // Return folder name
- CString folder = GetPathOnly(sSelectedFile);
- path = folder + '\\';
- }
- }
- return bRetVal;
-}
-
void COpenDlg::OnSelchangeLeftCombo()
{
int sel = m_ctlLeft.GetCurSel();
Modified: trunk/Src/OpenDlg.h
===================================================================
--- trunk/Src/OpenDlg.h 2006-11-27 16:59:44 UTC (rev 3856)
+++ trunk/Src/OpenDlg.h 2006-11-27 17:06:31 UTC (rev 3857)
@@ -49,7 +49,6 @@
COpenDlg(CWnd* pParent = NULL); // standard constructor
~COpenDlg();
void UpdateButtonStates();
- BOOL SelectFile(CString& path, LPCTSTR pszFolder);
// Dialog Data
//{{AFX_DATA(COpenDlg)
Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp 2006-11-27 16:59:44 UTC (rev 3856)
+++ trunk/Src/ProjectFilePathsDlg.cpp 2006-11-27 17:06:31 UTC (rev 3857)
@@ -74,8 +74,7 @@
void ProjectFilePathsDlg::OnBnClickedProjLfileBrowse()
{
UpdateData(TRUE);
- if (::SelectFile(GetSafeHwnd(), m_sLeftFile, m_sLeftFile, NULL, NULL,
- TRUE))
+ if (::SelectFileOrFolder(GetSafeHwnd(), m_sLeftFile, m_sLeftFile))
UpdateData(FALSE);
}
@@ -85,8 +84,7 @@
void ProjectFilePathsDlg::OnBnClickedProjRfileBrowse()
{
UpdateData(TRUE);
- if (::SelectFile(GetSafeHwnd(), m_sRightFile, m_sRightFile, NULL, NULL,
- TRUE))
+ if (::SelectFileOrFolder(GetSafeHwnd(), m_sRightFile, m_sRightFile))
UpdateData(FALSE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-11-28 06:41:43
|
Revision: 3864
http://svn.sourceforge.net/winmerge/?rev=3864&view=rev
Author: galh
Date: 2006-11-27 22:41:41 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/MergeCmdLineInfo.cpp
trunk/Src/MergeCmdLineInfo.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-27 18:05:59 UTC (rev 3863)
+++ trunk/Src/Changes.txt 2006-11-28 06:41:41 UTC (rev 3864)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-28 Gal
+ PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
+ Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
+
2006-11-27 Kimmo
BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
Src: Merge.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-11-27 18:05:59 UTC (rev 3863)
+++ trunk/Src/MainFrm.cpp 2006-11-28 06:41:41 UTC (rev 3864)
@@ -2708,51 +2708,34 @@
LRESULT CMainFrame::OnCopyData(WPARAM wParam, LPARAM lParam)
{
COPYDATASTRUCT *pCopyData = (COPYDATASTRUCT*)lParam;
- LPWSTR p = (LPWSTR)(pCopyData->lpData);
- int argc = pCopyData->dwData;
- TCHAR **argv = new (TCHAR *[argc]);
- USES_CONVERSION;
- for (int i = 0; i < argc; i++)
- {
- argv[i] = new TCHAR[lstrlenW(p) * (sizeof(WCHAR)/sizeof(TCHAR)) + 1];
- lstrcpy(argv[i], W2T(p));
- while (*p) p++;
- p++;
- }
+ BYTE* pBuf = new BYTE[pCopyData->cbData];
+ ::CopyMemory(pBuf, pCopyData->lpData, pCopyData->cbData);
- PostMessage(WM_USER, (WPARAM)argc, (LPARAM)argv);
+ PostMessage(WM_USER, pCopyData->cbData, reinterpret_cast<LPARAM>(pBuf));
return TRUE;
}
LRESULT CMainFrame::OnUser(WPARAM wParam, LPARAM lParam)
{
- // MFC's ParseCommandLine method is working with __argc and __targv
- // variables. We need to send MergeCmdLineInfo object rather than
- // passing the command line as string. Until we do, we temporary
- // change these variable values and restore then after parsing.
+ BYTE* pBuf = reinterpret_cast<BYTE*>(lParam);
- int argc = __argc;
- TCHAR **argv = __targv;
+ CMemFile file;
+ file.Attach(pBuf, wParam);
- __argc = wParam;
- __targv = reinterpret_cast<TCHAR **>(lParam);
+ CArchive ar(&file, CArchive::load);
+
+ MergeCmdLineInfo cmdInfo;
+ cmdInfo.Serialize(ar);
- MergeCmdLineInfo cmdInfo(*__targv);
- theApp.ParseCommandLine(cmdInfo);
+ ar.Close();
+ file.Close();
+
theApp.ParseArgsAndDoOpen(cmdInfo, this);
- // Delete memrory allocated in OnCopyData method.
- for (int i = 0; i < argc; ++i)
- {
- delete[] __targv[i];
- }
- delete __targv;
+ delete pBuf;
- __argc = argc;
- __targv = argv;
-
return TRUE;
}
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-11-27 18:05:59 UTC (rev 3863)
+++ trunk/Src/Merge.cpp 2006-11-28 06:41:41 UTC (rev 3864)
@@ -213,24 +213,23 @@
{
USES_CONVERSION;
- // Activate previous instance and send commandline to it
+ // Activate previous instance and send command line to it
HWND hWnd = instanceChecker.ActivatePreviousInstance();
+
+ CMemFile file;
+ CArchive ar(&file, CArchive::store);
- WCHAR *pszArgs = new WCHAR[_tcslen(__targv[0]) + _tcslen(m_lpCmdLine) + 3];
- WCHAR *p = pszArgs;
- for (int i = 0; i < __argc; i++)
- {
- wcscpy(p, T2W(__targv[i]));
- p += lstrlenW(p) + 1;
- }
- *p++ = _T('\0');
- COPYDATASTRUCT data = {0};
- data.cbData = (DWORD)(p - pszArgs) * sizeof(WCHAR);
- data.lpData = pszArgs;
- data.dwData = __argc;
- SendMessage(hWnd, WM_COPYDATA, NULL, (LPARAM)&data);
- delete[] pszArgs;
+ cmdInfo.Serialize(ar);
+ ar.Close();
+
+ COPYDATASTRUCT data;
+ data.cbData = static_cast<DWORD>(file.GetLength());
+ data.lpData = file.Detach();
+ data.dwData = 0;
+ ::SendMessage(hWnd, WM_COPYDATA, NULL, (LPARAM)&data);
+ file.Close();
+
ReleaseMutex(hMutex);
CloseHandle(hMutex);
Modified: trunk/Src/MergeCmdLineInfo.cpp
===================================================================
--- trunk/Src/MergeCmdLineInfo.cpp 2006-11-27 18:05:59 UTC (rev 3863)
+++ trunk/Src/MergeCmdLineInfo.cpp 2006-11-28 06:41:41 UTC (rev 3864)
@@ -40,6 +40,8 @@
// MergeCmdLineInfo
+IMPLEMENT_SERIAL(MergeCmdLineInfo, CCommandLineInfo, 1)
+
MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *szExeName) : CCommandLineInfo(),
m_nCmdShow(SW_SHOWNORMAL),
m_bClearCaseTool(false),
@@ -91,3 +93,105 @@
m_pCmdLineParser->ParseParam(pszParam, bFlag, bLast);
}
+
+void MergeCmdLineInfo::Serialize(CArchive& ar)
+{
+ CCommandLineInfo::Serialize(ar);
+
+ if (ar.IsStoring())
+ {
+ Store(ar);
+ }
+ else
+ {
+ Load(ar);
+ }
+}
+
+void MergeCmdLineInfo::Store(CArchive& ar)
+{
+ ASSERT(ar.IsStoring());
+
+ ar << m_nCmdShow;
+ ar << m_bClearCaseTool;
+ ar << m_bEscShutdown;
+ ar << m_bExitIfNoDiff;
+ ar << m_bRecurse;
+ ar << m_bNonInteractive;
+ ar << m_bNoPrefs;
+ ar << m_bSingleInstance;
+ ar << m_bShowUsage;
+ ar << m_dwLeftFlags;
+ ar << m_dwRightFlags;
+ ar << m_sLeftDesc;
+ ar << m_sRightDesc;
+ ar << m_sFileFilter;
+ ar << m_sPreDiffer;
+
+ ar << m_Settings.GetCount();
+
+ if (m_Settings.GetCount() > 0)
+ {
+ CMapStringToString::CPair* pIter = m_Settings.PGetFirstAssoc();
+ while (pIter != NULL)
+ {
+ ar << pIter->key;
+ ar << pIter->value;
+
+ pIter = m_Settings.PGetNextAssoc(pIter);
+ }
+ }
+
+ ar << m_nFiles;
+ for (INT_PTR i = 0; i < m_nFiles; ++i)
+ {
+ ar << m_Files[i];
+ }
+}
+
+void MergeCmdLineInfo::Load(CArchive& ar)
+{
+ ASSERT(ar.IsLoading());
+
+ INT_PTR i;
+
+ ar >> m_nCmdShow;
+ ar >> m_bClearCaseTool;
+ ar >> m_bEscShutdown;
+ ar >> m_bExitIfNoDiff;
+ ar >> m_bRecurse;
+ ar >> m_bNonInteractive;
+ ar >> m_bNoPrefs;
+ ar >> m_bSingleInstance;
+ ar >> m_bShowUsage;
+ ar >> m_dwLeftFlags;
+ ar >> m_dwRightFlags;
+ ar >> m_sLeftDesc;
+ ar >> m_sRightDesc;
+ ar >> m_sFileFilter;
+ ar >> m_sPreDiffer;
+
+ INT_PTR nSettings;
+ ar >> nSettings;
+
+ for (i = 0; i < nSettings; ++i)
+ {
+ CString sParam;
+ CString sValue;
+ ar >> sParam;
+ ar >> sValue;
+
+ m_Settings[sParam] = sValue;
+ }
+
+ ar >> m_nFiles;
+ m_Files.SetSize(m_nFiles);
+
+ for (i = 0; i < m_nFiles; ++i)
+ {
+ CString sFile;
+ ar >> sFile;
+
+ m_Files.SetAtGrow(i, sFile);
+ }
+}
Modified: trunk/Src/MergeCmdLineInfo.h
===================================================================
--- trunk/Src/MergeCmdLineInfo.h 2006-11-27 18:05:59 UTC (rev 3863)
+++ trunk/Src/MergeCmdLineInfo.h 2006-11-28 06:41:41 UTC (rev 3864)
@@ -40,6 +40,8 @@
*/
class MergeCmdLineInfo : public CCommandLineInfo
{
+ DECLARE_SERIAL(MergeCmdLineInfo)
+
public:
/** @brief ClearCaseCmdLineParser's constructor.
@@ -50,11 +52,16 @@
*/
MergeCmdLineInfo(const TCHAR *szExeName);
+ // Default constructor is required for CArchive's serialization.
+ MergeCmdLineInfo() : m_pCmdLineParser(NULL) { }
+
~MergeCmdLineInfo();
/** @brief Override CCommandLineInfo's method. */
virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
+ void Serialize(CArchive& ar);
+
public:
int m_nCmdShow; /**< Initial state of the application's window. */
@@ -86,6 +93,10 @@
private:
+ void Store(CArchive& ar);
+
+ void Load(CArchive& ar);
+
/**< operator= is not implemented. */
MergeCmdLineInfo& operator=(const MergeCmdLineInfo& rhs);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-28 19:29:20
|
Revision: 3866
http://svn.sourceforge.net/winmerge/?rev=3866&view=rev
Author: kimmov
Date: 2006-11-28 11:29:07 -0800 (Tue, 28 Nov 2006)
Log Message:
-----------
PATCH: [ 1604078 ] Hide skipped items by default
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/OptionsInit.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-28 15:57:04 UTC (rev 3865)
+++ trunk/Src/Changes.txt 2006-11-28 19:29:07 UTC (rev 3866)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-28 Kimmo
+ PATCH: [ 1604078 ] Hide skipped items by default
+ Src: OptionsInit.cpp
+
2006-11-28 Gal
PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2006-11-28 15:57:04 UTC (rev 3865)
+++ trunk/Src/OptionsInit.cpp 2006-11-28 19:29:07 UTC (rev 3866)
@@ -30,7 +30,7 @@
m_options.InitOption(OPT_SHOW_DIFFERENT, true);
m_options.InitOption(OPT_SHOW_IDENTICAL, true);
m_options.InitOption(OPT_SHOW_BINARIES, true);
- m_options.InitOption(OPT_SHOW_SKIPPED, true);
+ m_options.InitOption(OPT_SHOW_SKIPPED, false);
m_options.InitOption(OPT_SHOW_TOOLBAR, true);
m_options.InitOption(OPT_SHOW_STATUSBAR, true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-11-30 14:24:41
|
Revision: 3872
http://svn.sourceforge.net/winmerge/?rev=3872&view=rev
Author: sdottaka
Date: 2006-11-30 06:24:38 -0800 (Thu, 30 Nov 2006)
Log Message:
-----------
BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/res/equalfile.ico
trunk/Src/res/fileskip.ico
trunk/Src/res/lfile.ico
trunk/Src/res/notequalfile.ico
trunk/Src/res/rfile.ico
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-29 21:47:55 UTC (rev 3871)
+++ trunk/Src/Changes.txt 2006-11-30 14:24:38 UTC (rev 3872)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-30 Takashi
+ BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
+ Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
+
2006-11-28 Kimmo
PATCH: [ 1604078 ] Hide skipped items by default
Src: OptionsInit.cpp
Modified: trunk/Src/res/equalfile.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/res/fileskip.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/res/lfile.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/res/notequalfile.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/res/rfile.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
