Index: src/libchcore/TStringPattern.cpp
===================================================================
diff -u -N -rd18db617f4727a237c94b59af9b4328f829eda16 -ra4635addad389b9e117679437a3e1b64a739ea96
--- src/libchcore/TStringPattern.cpp	(.../TStringPattern.cpp)	(revision d18db617f4727a237c94b59af9b4328f829eda16)
+++ src/libchcore/TStringPattern.cpp	(.../TStringPattern.cpp)	(revision a4635addad389b9e117679437a3e1b64a739ea96)
@@ -1,132 +1,132 @@
-#include "stdafx.h"
-#include "TStringPattern.h"
-#include "TCoreException.h"
-#include "ErrorCodes.h"
-#include <tchar.h>
-
-namespace chcore
-{
-	namespace
-	{
-		bool _tcicmp(TCHAR c1, TCHAR c2)
-		{
-			TCHAR ch1[2] = { c1, 0 }, ch2[2] = { c2, 0 };
-			return (_tcsicmp(ch1, ch2) == 0);
-		}
-	}
-
-	TStringPattern::TStringPattern(EPatternType ePatternType) :
-		m_ePatternType(ePatternType)
-	{
-	}
-
-	TStringPattern::TStringPattern(const TString& strPattern, EPatternType ePatternType) :
-		m_ePatternType(ePatternType),
-		m_strPattern(strPattern)
-	{
-	}
-
-	TStringPattern TStringPattern::CreateFromString(const TString& strPattern, EPatternType eDefaultPatternType)
-	{
-		TStringPattern pattern;
-		pattern.FromString(strPattern, eDefaultPatternType);
-		return pattern;
-	}
-
-	void TStringPattern::FromString(const TString& strPattern, EPatternType eDefaultPatternType)
-	{
-		m_ePatternType = eDefaultPatternType;
-		if (strPattern.StartsWith(L"WC;"))
-		{
-			m_strPattern = strPattern.Mid(3);
-			m_ePatternType = EPatternType::eType_Wildcard;
-		}
-		else
-			m_strPattern = strPattern;
-	}
-
-	TString TStringPattern::ToString() const
-	{
-		TString strPrefix;
-		switch (m_ePatternType)
-		{
-		case EPatternType::eType_Wildcard:
-			break;	// wildcard won't have any prefix (it's implicit)
-
-		default:
-			throw TCoreException(eErr_UnhandledCase, L"Pattern type not supported", LOCATION);
-		}
-
-		return TString(strPrefix + m_strPattern);
-	}
-
-	bool TStringPattern::MatchMask(LPCTSTR lpszMask, LPCTSTR lpszString) const
-	{
-		bool bMatch = true;
-
-		//iterate and delete '?' and '*' one by one
-		while (*lpszMask != _T('\0') && bMatch && *lpszString != _T('\0'))
-		{
-			if (*lpszMask == _T('?')) lpszString++;
-			else if (*lpszMask == _T('*'))
-			{
-				bMatch = Scan(lpszMask, lpszString);
-				lpszMask--;
-			}
-			else
-			{
-				bMatch = _tcicmp(*lpszMask, *lpszString);
-				lpszString++;
-			}
-			lpszMask++;
-		}
-		while (*lpszMask == _T('*') && bMatch) lpszMask++;
-
-		return bMatch && *lpszString == _T('\0') && *lpszMask == _T('\0');
-	}
-
-	// scan '?' and '*'
-	bool TStringPattern::Scan(LPCTSTR& lpszMask, LPCTSTR& lpszString) const
-	{
-		// remove the '?' and '*'
-		for (lpszMask++; *lpszString != _T('\0') && (*lpszMask == _T('?') || *lpszMask == _T('*')); lpszMask++)
-			if (*lpszMask == _T('?')) lpszString++;
-		while (*lpszMask == _T('*')) lpszMask++;
-
-		// if lpszString is empty and lpszMask has more characters or,
-		// lpszMask is empty, return 
-		if (*lpszString == _T('\0') && *lpszMask != _T('\0')) return false;
-		if (*lpszString == _T('\0') && *lpszMask == _T('\0')) return true;
-		// else search substring
-		else
-		{
-			LPCTSTR wdsCopy = lpszMask;
-			LPCTSTR lpszStringCopy = lpszString;
-			bool bMatch = true;
-			do
-			{
-				if (!MatchMask(lpszMask, lpszString)) lpszStringCopy++;
-				lpszMask = wdsCopy;
-				lpszString = lpszStringCopy;
-				while (!(_tcicmp(*lpszMask, *lpszString)) && (*lpszString != '\0')) lpszString++;
-				wdsCopy = lpszMask;
-				lpszStringCopy = lpszString;
-			} while ((*lpszString != _T('\0')) ? !MatchMask(lpszMask, lpszString) : (bMatch = false) != false);
-
-			if (*lpszString == _T('\0') && *lpszMask == _T('\0')) return true;
-
-			return bMatch;
-		}
-	}
-
-	bool TStringPattern::Matches(const TString& strTextToMatch) const
-	{
-		return MatchMask(m_strPattern.c_str(), strTextToMatch.c_str());
-	}
-
-	void TStringPattern::SetPattern(const TString& strPattern, EPatternType ePatternType)
-	{
-		m_ePatternType = ePatternType;
-		m_strPattern = strPattern;
-	}
-}
+#include "stdafx.h"
+#include "TStringPattern.h"
+#include "TCoreException.h"
+#include "ErrorCodes.h"
+#include <tchar.h>
+
+namespace chcore
+{
+	namespace
+	{
+		bool _tcicmp(TCHAR c1, TCHAR c2)
+		{
+			TCHAR ch1[2] = { c1, 0 }, ch2[2] = { c2, 0 };
+			return (_tcsicmp(ch1, ch2) == 0);
+		}
+	}
+
+	TStringPattern::TStringPattern(EPatternType ePatternType) :
+		m_ePatternType(ePatternType)
+	{
+	}
+
+	TStringPattern::TStringPattern(const TString& strPattern, EPatternType ePatternType) :
+		m_ePatternType(ePatternType),
+		m_strPattern(strPattern)
+	{
+	}
+
+	TStringPattern TStringPattern::CreateFromString(const TString& strPattern, EPatternType eDefaultPatternType)
+	{
+		TStringPattern pattern;
+		pattern.FromString(strPattern, eDefaultPatternType);
+		return pattern;
+	}
+
+	void TStringPattern::FromString(const TString& strPattern, EPatternType eDefaultPatternType)
+	{
+		m_ePatternType = eDefaultPatternType;
+		if (strPattern.StartsWith(L"WC;"))
+		{
+			m_strPattern = strPattern.Mid(3);
+			m_ePatternType = EPatternType::eType_Wildcard;
+		}
+		else
+			m_strPattern = strPattern;
+	}
+
+	TString TStringPattern::ToString() const
+	{
+		TString strPrefix;
+		switch (m_ePatternType)
+		{
+		case EPatternType::eType_Wildcard:
+			break;	// wildcard won't have any prefix (it's implicit)
+
+		default:
+			throw TCoreException(eErr_UnhandledCase, L"Pattern type not supported", LOCATION);
+		}
+
+		return TString(strPrefix + m_strPattern);
+	}
+
+	bool TStringPattern::MatchMask(LPCTSTR lpszMask, LPCTSTR lpszString) const
+	{
+		bool bMatch = true;
+
+		//iterate and delete '?' and '*' one by one
+		while (*lpszMask != _T('\0') && bMatch && *lpszString != _T('\0'))
+		{
+			if (*lpszMask == _T('?')) lpszString++;
+			else if (*lpszMask == _T('*'))
+			{
+				bMatch = Scan(lpszMask, lpszString);
+				lpszMask--;
+			}
+			else
+			{
+				bMatch = _tcicmp(*lpszMask, *lpszString);
+				lpszString++;
+			}
+			lpszMask++;
+		}
+		while (*lpszMask == _T('*') && bMatch) lpszMask++;
+
+		return bMatch && *lpszString == _T('\0') && *lpszMask == _T('\0');
+	}
+
+	// scan '?' and '*'
+	bool TStringPattern::Scan(LPCTSTR& lpszMask, LPCTSTR& lpszString) const
+	{
+		// remove the '?' and '*'
+		for (lpszMask++; *lpszString != _T('\0') && (*lpszMask == _T('?') || *lpszMask == _T('*')); lpszMask++)
+			if (*lpszMask == _T('?')) lpszString++;
+		while (*lpszMask == _T('*')) lpszMask++;
+
+		// if lpszString is empty and lpszMask has more characters or,
+		// lpszMask is empty, return 
+		if (*lpszString == _T('\0') && *lpszMask != _T('\0')) return false;
+		if (*lpszString == _T('\0') && *lpszMask == _T('\0')) return true;
+		// else search substring
+		else
+		{
+			LPCTSTR wdsCopy = lpszMask;
+			LPCTSTR lpszStringCopy = lpszString;
+			bool bMatch = true;
+			do
+			{
+				if (!MatchMask(lpszMask, lpszString)) lpszStringCopy++;
+				lpszMask = wdsCopy;
+				lpszString = lpszStringCopy;
+				while (!(_tcicmp(*lpszMask, *lpszString)) && (*lpszString != '\0')) lpszString++;
+				wdsCopy = lpszMask;
+				lpszStringCopy = lpszString;
+			} while ((*lpszString != _T('\0')) ? !MatchMask(lpszMask, lpszString) : (bMatch = false) != false);
+
+			if (*lpszString == _T('\0') && *lpszMask == _T('\0')) return true;
+
+			return bMatch;
+		}
+	}
+
+	bool TStringPattern::Matches(const TString& strTextToMatch) const
+	{
+		return MatchMask(m_strPattern.c_str(), strTextToMatch.c_str());
+	}
+
+	void TStringPattern::SetPattern(const TString& strPattern, EPatternType ePatternType)
+	{
+		m_ePatternType = ePatternType;
+		m_strPattern = strPattern;
+	}
+}