PATCH: [ 1403457 ] Support Unicode file filter files

  Src: FileFilterMgr.cpp

diff --git a/Src/Changes.txt b/Src/Changes.txt
index b367c42..e95ca1b 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -1,3 +1,7 @@
+2006-01-14 Perry
+ PATCH: [ 1403457 ] Support Unicode file filter files
+  Src: FileFilterMgr.cpp
+
 2006-01-14 Kimmo
  PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
   Src: DirActions.cpp DirView.h Merge.dsp

diff --git a/Src/FileFilterMgr.cpp b/Src/FileFilterMgr.cpp
index 0f4c952..b673a8d 100644 (file)
--- a/Src/FileFilterMgr.cpp
+++ b/Src/FileFilterMgr.cpp
@@ -18,6 +18,7 @@
 #include "stdafx.h"
 #include "FileFilterMgr.h"
 #include "RegExp.h"
+#include "UniFile.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -211,9 +212,12 @@ static void AddFilterPattern(FileFilterList & filterList, CString & str)
  */
 FileFilter * FileFilterMgr::LoadFilterFile(LPCTSTR szFilepath, LPCTSTR szFilename)
 {
-       CStdioFile file;
-       if (!file.Open(szFilepath, CFile::modeRead | CFile::shareDenyNone))
+       UniMemFile file;
+       if (!file.OpenReadOnly(szFilepath))
                return NULL;
+
+       file.ReadBom(); // in case it is a Unicode file, let UniMemFile handle BOM
+
        FileFilter *pfilter = new FileFilter;
        pfilter->fullpath = szFilepath;
        pfilter->name = szFilename; // default if no name