Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
Merge.rc resource.h
Src/Languages/*: Merge*.rc
+ PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
+ Src: FileFilterHelper.cpp FileFilterHelper.h
2006-08-01 Kimmo
PATCH: [ 1531845 ] Fix memory leak after find
* It is directoryname + filemask, for example, for a filter for all users:
* "C:\Program Files\WinMerge\Filters\*.flt"
* Examples of user-specific filters:
- * "C:\\Documents And Settings\\username\\Local Settings\\Application Data\\WinMerge\\Filters\\*.flt"
- * "C:\\Documents And Settings\\username\\Application Data\\WinMerge\\Filters\\*.flt"
+ * "C:\Documents and Settings\User\My Documents\WinMergeFilters\*.flt"
*/
void FileFilterHelper::LoadFileFilterDirPattern(FILEFILTER_FILEMAP & patternsLoaded,
const CString & sPattern)
// Program application directory
m_sGlobalFilterPath = GetModulePath() + _T("\\Filters");
LoadFileFilterDirPattern(patternsLoaded, m_sGlobalFilterPath + _T("\\*") + FileFilterExt);
-
LoadFileFilterDirPattern(patternsLoaded, m_sUserSelFilterPath + _T("\\*") + FileFilterExt);
-
- // User application data path
- m_sUserProfilePath.Empty();
- CString sAppPath;
- if (GetAppDataPath(sAppPath))
- {
- m_sUserProfilePath = sAppPath + _T("\\WinMerge\\Filters");
- LoadFileFilterDirPattern(patternsLoaded, m_sUserProfilePath + _T("\\*") + FileFilterExt);
- }
- else
- {
- // User profile local & roaming settings
- CString sProfile;
- if (GetUserProfilePath(sProfile))
- {
- m_sUserProfilePath = sProfile + _T("\\Application Data\\WinMerge\\Filters");
- LoadFileFilterDirPattern(patternsLoaded, m_sUserProfilePath + _T("\\*") + FileFilterExt);
- }
- }
}
/**
CString m_sMask; /*< File mask (if defined) "*.cpp *.h" etc */
BOOL m_bUseMask; /*< If TRUE file mask is used, filter otherwise */
CString m_sGlobalFilterPath; /*< Path for shared filters */
- CString m_sUserProfilePath; /*< Path for user's profile folder */
CString m_sUserSelFilterPath; /*< Path for user's private filters */
CRegExp m_rgx; /*< Compiled file mask regular expression */