diff --git a/Library/Exports.def b/Library/Exports.def index 695ac4a6..d3f75801 100644 --- a/Library/Exports.def +++ b/Library/Exports.def @@ -8,3 +8,11 @@ EXPORTS LSLog ReadConfigString PluginBridge + + ; Private + pcre_compile @9 NONAME + pcre_exec @10 NONAME + pcre_study @12 NONAME + Initialize @13 NONAME + Quit @14 NONAME + ExecuteBang @15 NONAME \ No newline at end of file diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp index 0d885291..e534ea24 100644 --- a/Library/TrayWindow.cpp +++ b/Library/TrayWindow.cpp @@ -29,8 +29,7 @@ #include "../Version.h" #define RAINMETER_OFFICIAL L"http://rainmeter.net/cms/" -#define RAINMETER_MANUAL L"http://rainmeter.net/cms/Manual" -#define RAINMETER_MANUALBETA L"http://rainmeter.net/cms/Manual_beta" +#define RAINMETER_HELP L"http://rainmeter.net/cms/Support" #define ZPOS_FLAGS (SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOACTIVATE | SWP_NOSENDCHANGING) @@ -427,7 +426,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA } else if (wParam == ID_CONTEXT_SHOW_HELP) { - RunCommand(NULL, revision_beta ? RAINMETER_MANUALBETA : RAINMETER_MANUAL, SW_SHOWNORMAL); + RunCommand(NULL, RAINMETER_HELP, SW_SHOWNORMAL); } else if (wParam == ID_CONTEXT_NEW_VERSION) { diff --git a/Plugins/PluginFolderInfo/FolderInfo.cpp b/Plugins/PluginFolderInfo/FolderInfo.cpp index b2785e0f..d3962774 100644 --- a/Plugins/PluginFolderInfo/FolderInfo.cpp +++ b/Plugins/PluginFolderInfo/FolderInfo.cpp @@ -3,7 +3,7 @@ #include namespace PluginFolderInfo { - + FolderInfo::FolderInfo(const wchar_t* aPath, const wchar_t* aIniPath) { mySubFolderFlag = false; @@ -16,6 +16,11 @@ FolderInfo::FolderInfo(const wchar_t* aPath, const wchar_t* aIniPath) SetPath(aPath, aIniPath); } +FolderInfo::~FolderInfo() +{ + FreePcre(); +} + void FolderInfo::Clear() { mySize = 0; @@ -23,6 +28,19 @@ void FolderInfo::Clear() myFolderCount = 0; } +void FolderInfo::FreePcre() +{ + if (myRegExpFilter) { + pcre_free(myRegExpFilter); + myRegExpFilter = NULL; + } + + if (myRegExpFilterExtra) { + pcre_free(myRegExpFilterExtra); + myRegExpFilterExtra = NULL; + } +} + void FolderInfo::SetPath(const wchar_t* aPath, const wchar_t* aIniPath) { if (!aPath || 0 == aPath[0]) { @@ -122,11 +140,7 @@ void FolderInfo::CalculateSize() void FolderInfo::SetRegExpFilter(const wchar_t* aFilter) { - if (myRegExpFilter) { - pcre_free(myRegExpFilter); - myRegExpFilter = NULL; - myRegExpFilterExtra = NULL; - } + FreePcre(); if (aFilter == NULL) { return; @@ -144,6 +158,8 @@ void FolderInfo::SetRegExpFilter(const wchar_t* aFilter) if (myRegExpFilter) { myRegExpFilterExtra = pcre_study(myRegExpFilter, 0, &error); } + + delete [] buf; } } // namespace PluginFolderInfo diff --git a/Plugins/PluginFolderInfo/FolderInfo.h b/Plugins/PluginFolderInfo/FolderInfo.h index f70ad48b..9e8d926f 100644 --- a/Plugins/PluginFolderInfo/FolderInfo.h +++ b/Plugins/PluginFolderInfo/FolderInfo.h @@ -37,6 +37,7 @@ private: private: void Clear(); + void FreePcre(); void CalculateSize(); void SetPath(const wchar_t* aPath, const wchar_t* aIniPath); @@ -77,8 +78,10 @@ public: { return myFolderCount; } - + FolderInfo(const wchar_t* aPath, const wchar_t* aIniPath); + ~FolderInfo(); + void Update(); }; // class FolderInfo diff --git a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj index a538a75b..2dd01321 100644 --- a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj +++ b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj @@ -94,7 +94,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -134,7 +134,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -175,7 +175,7 @@ MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -221,7 +221,7 @@ /GL %(AdditionalOptions) MaxSpeed OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -260,246 +260,7 @@ - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginFolderInfo_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - + Disabled diff --git a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj.filters b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj.filters index 18569717..e6939414 100644 --- a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj.filters +++ b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj.filters @@ -2,36 +2,32 @@ - - - - + + pcre + + + pcre + + + pcre + + + pcre + - - - - - - - - - - - - - - - - - - - - + + pcre + + + + {aaeb51d4-65cd-4eb6-954f-724800c27387} + + \ No newline at end of file diff --git a/Plugins/PluginWebParser/PluginWebParser.vcxproj b/Plugins/PluginWebParser/PluginWebParser.vcxproj index d0ac5a47..f88fd764 100644 --- a/Plugins/PluginWebParser/PluginWebParser.vcxproj +++ b/Plugins/PluginWebParser/PluginWebParser.vcxproj @@ -261,246 +261,7 @@ - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 - + Disabled WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8 diff --git a/Plugins/PluginWebParser/PluginWebParser.vcxproj.filters b/Plugins/PluginWebParser/PluginWebParser.vcxproj.filters index 2eff3ec8..cdecb07c 100644 --- a/Plugins/PluginWebParser/PluginWebParser.vcxproj.filters +++ b/Plugins/PluginWebParser/PluginWebParser.vcxproj.filters @@ -20,67 +20,10 @@ - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - + pcre - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - - pcre - - diff --git a/Plugins/PluginWebParser/WebParser.cpp b/Plugins/PluginWebParser/WebParser.cpp index dcbdaf6a..c32d957c 100644 --- a/Plugins/PluginWebParser/WebParser.cpp +++ b/Plugins/PluginWebParser/WebParser.cpp @@ -1076,7 +1076,9 @@ void ParseData(UrlData* urlData, LPCSTR parseData, DWORD dwSize) } // Release memory used for the compiled pattern + RmLog(LOG_ERROR, L"HERE"); pcre_free(re); + RmLog(LOG_ERROR, L"HERE2"); } else {