diff --git a/Plugins/PluginFolderInfo/FolderInfo.cpp b/Plugins/PluginFolderInfo/FolderInfo.cpp
index cd6c8734..2801926e 100644
--- a/Plugins/PluginFolderInfo/FolderInfo.cpp
+++ b/Plugins/PluginFolderInfo/FolderInfo.cpp
@@ -9,8 +9,8 @@ FolderInfo::FolderInfo(const wchar_t* aPath)
mySubFolderFlag = false;
myHiddenFileFlag = false;
mySystemFileFlag = false;
- myRegExFilter = NULL;
- myRegExFilterExtra = NULL;
+ myRegExpFilter = NULL;
+ myRegExpFilterExtra = NULL;
myLastUpdateTime = 0;
Clear();
SetPath(aPath);
@@ -82,9 +82,9 @@ void FolderInfo::CalculateSize()
else if (!mySystemFileFlag && (findData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) {
continue;
}
- else if (!isFolder && myRegExFilter) {
+ else if (!isFolder && myRegExpFilter) {
int utf8BufLen = WideCharToMultiByte(CP_UTF8, 0, findData.cFileName, wcslen(findData.cFileName) + 1, utf8Buf, MAX_PATH * 3, NULL, NULL);
- if (0 != pcre_exec(myRegExFilter, myRegExFilterExtra, utf8Buf, utf8BufLen, 0, 0, NULL, 0)) {
+ if (0 != pcre_exec(myRegExpFilter, myRegExpFilterExtra, utf8Buf, utf8BufLen, 0, 0, NULL, 0)) {
continue;
}
}
@@ -108,12 +108,12 @@ void FolderInfo::CalculateSize()
}
}
-void FolderInfo::SetRegExFilter(const wchar_t* aFilter)
+void FolderInfo::SetRegExpFilter(const wchar_t* aFilter)
{
- if (myRegExFilter) {
- pcre_free(myRegExFilter);
- myRegExFilter = NULL;
- myRegExFilterExtra = NULL;
+ if (myRegExpFilter) {
+ pcre_free(myRegExpFilter);
+ myRegExpFilter = NULL;
+ myRegExpFilterExtra = NULL;
}
if (aFilter == NULL) {
@@ -128,9 +128,9 @@ void FolderInfo::SetRegExFilter(const wchar_t* aFilter)
const char* error;
int erroffset;
- myRegExFilter = pcre_compile(buf, PCRE_UTF8, &error, &erroffset, NULL);
- if (myRegExFilter) {
- myRegExFilterExtra = pcre_study(myRegExFilter, 0, &error);
+ myRegExpFilter = pcre_compile(buf, PCRE_UTF8, &error, &erroffset, NULL);
+ if (myRegExpFilter) {
+ myRegExpFilterExtra = pcre_study(myRegExpFilter, 0, &error);
}
}
diff --git a/Plugins/PluginFolderInfo/FolderInfo.h b/Plugins/PluginFolderInfo/FolderInfo.h
index f4b8f82b..2a4e05c4 100644
--- a/Plugins/PluginFolderInfo/FolderInfo.h
+++ b/Plugins/PluginFolderInfo/FolderInfo.h
@@ -30,8 +30,8 @@ private:
UINT64 mySize;
unsigned int myFileCount;
unsigned int myFolderCount;
- pcre* myRegExFilter;
- pcre_extra* myRegExFilterExtra;
+ pcre* myRegExpFilter;
+ pcre_extra* myRegExpFilterExtra;
DWORD myLastUpdateTime;
private:
@@ -45,7 +45,7 @@ public:
return myLastUpdateTime;
}
- void SetRegExFilter(const wchar_t* aFilter);
+ void SetRegExpFilter(const wchar_t* aFilter);
void IncludeSubFolders(bool aFlag)
{
diff --git a/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp b/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp
index f3b48df6..ad1b707f 100644
--- a/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp
+++ b/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp
@@ -146,9 +146,9 @@ UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
}
if (measureInfo->Folder) {
- const wchar_t* strRegExFilter = ReadConfigString(section, L"RegExFilter", L"");
- if (strRegExFilter && wcslen(strRegExFilter) > 0) {
- measureInfo->Folder->SetRegExFilter(strRegExFilter);
+ const wchar_t* strRegExpFilter = ReadConfigString(section, L"RegExpFilter", L"");
+ if (strRegExpFilter && wcslen(strRegExpFilter) > 0) {
+ measureInfo->Folder->SetRegExpFilter(strRegExpFilter);
}
const wchar_t* strIncludeSubFolders = ReadConfigString(section, L"IncludeSubFolders", L"");
@@ -189,7 +189,7 @@ static void FormatSize(wchar_t* buffer, size_t bufferSize, UINT64 size)
wsprintf(buffer, L"%d.%02d k", (int)(size >> 10), (int)(( size << 54 >> 54 ) / 10.24));
}
else {
- wsprintf(buffer, L"%ld b", size);
+ wsprintf(buffer, L"%ld ", size);
}
}
@@ -292,7 +292,7 @@ void Finalize(HMODULE instance, UINT id)
*/
UINT GetPluginVersion()
{
- return 0001;
+ return 0002;
}
/*
diff --git a/Plugins/PluginFolderInfo/PluginFolderInfo.vcproj b/Plugins/PluginFolderInfo/PluginFolderInfo.vcproj
index bee0bfb2..46447bb3 100644
--- a/Plugins/PluginFolderInfo/PluginFolderInfo.vcproj
+++ b/Plugins/PluginFolderInfo/PluginFolderInfo.vcproj
@@ -76,12 +76,13 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Rainmeter.sln b/Rainmeter.sln
index bab77afd..e2680e02 100644
--- a/Rainmeter.sln
+++ b/Rainmeter.sln
@@ -130,7 +130,6 @@ Global
{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|Win32.ActiveCfg = Release|Win32
{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|Win32.Build.0 = Release|Win32
{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|x64.ActiveCfg = Release|x64
- {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|x64.Build.0 = Release|x64
{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release64|Win32.ActiveCfg = Release64|Win32
{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release64|Win32.Build.0 = Release64|Win32
{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release64|x64.ActiveCfg = Release64|x64
@@ -307,7 +306,6 @@ Global
{6D032D6B-7656-4743-B454-3388E2921EB0}.Release|Win32.ActiveCfg = Release|Win32
{6D032D6B-7656-4743-B454-3388E2921EB0}.Release|Win32.Build.0 = Release|Win32
{6D032D6B-7656-4743-B454-3388E2921EB0}.Release|x64.ActiveCfg = Release|x64
- {6D032D6B-7656-4743-B454-3388E2921EB0}.Release|x64.Build.0 = Release|x64
{6D032D6B-7656-4743-B454-3388E2921EB0}.Release64|Win32.ActiveCfg = Release64|Win32
{6D032D6B-7656-4743-B454-3388E2921EB0}.Release64|Win32.Build.0 = Release64|Win32
{6D032D6B-7656-4743-B454-3388E2921EB0}.Release64|x64.ActiveCfg = Release64|x64
@@ -319,7 +317,6 @@ Global
{4640AB3A-5A8B-2DA0-980C-A70BCAB3A7F1}.Release|Win32.ActiveCfg = Release|Win32
{4640AB3A-5A8B-2DA0-980C-A70BCAB3A7F1}.Release|Win32.Build.0 = Release|Win32
{4640AB3A-5A8B-2DA0-980C-A70BCAB3A7F1}.Release|x64.ActiveCfg = Release|x64
- {4640AB3A-5A8B-2DA0-980C-A70BCAB3A7F1}.Release|x64.Build.0 = Release|x64
{4640AB3A-5A8B-2DA0-980C-A70BCAB3A7F1}.Release64|Win32.ActiveCfg = Release64|Win32
{4640AB3A-5A8B-2DA0-980C-A70BCAB3A7F1}.Release64|Win32.Build.0 = Release64|Win32
{4640AB3A-5A8B-2DA0-980C-A70BCAB3A7F1}.Release64|x64.ActiveCfg = Release64|x64
@@ -331,7 +328,6 @@ Global
{EB48A04A-657E-41B8-B2F5-D47F8C30B2B4}.Release|Win32.ActiveCfg = Release|Win32
{EB48A04A-657E-41B8-B2F5-D47F8C30B2B4}.Release|Win32.Build.0 = Release|Win32
{EB48A04A-657E-41B8-B2F5-D47F8C30B2B4}.Release|x64.ActiveCfg = Release|x64
- {EB48A04A-657E-41B8-B2F5-D47F8C30B2B4}.Release|x64.Build.0 = Release|x64
{EB48A04A-657E-41B8-B2F5-D47F8C30B2B4}.Release64|Win32.ActiveCfg = Release64|Win32
{EB48A04A-657E-41B8-B2F5-D47F8C30B2B4}.Release64|Win32.Build.0 = Release64|Win32
{EB48A04A-657E-41B8-B2F5-D47F8C30B2B4}.Release64|x64.ActiveCfg = Release64|x64
@@ -343,7 +339,6 @@ Global
{A221819D-4263-42AA-B22A-C022924842A7}.Release|Win32.ActiveCfg = Release|Win32
{A221819D-4263-42AA-B22A-C022924842A7}.Release|Win32.Build.0 = Release|Win32
{A221819D-4263-42AA-B22A-C022924842A7}.Release|x64.ActiveCfg = Release|x64
- {A221819D-4263-42AA-B22A-C022924842A7}.Release|x64.Build.0 = Release|x64
{A221819D-4263-42AA-B22A-C022924842A7}.Release64|Win32.ActiveCfg = Release64|Win32
{A221819D-4263-42AA-B22A-C022924842A7}.Release64|Win32.Build.0 = Release64|Win32
{A221819D-4263-42AA-B22A-C022924842A7}.Release64|x64.ActiveCfg = Release64|x64