additional checks in math expressions

3 files changed, 12 insertions, 22 deletions

diff --git a/stopspam.cpp b/stopspam.cpp
index f99e4c9..d39e84e 100755
--- a/stopspam.cpp
+++ b/stopspam.cpp
@@ -235,7 +235,7 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_FILTER_ADD, w, l)
 				std::list<int> args;
 				std::list<TCHAR> actions;
 				tstring::size_type p1 = gbQuestion.find(_T("X")), p2 = 0;
-				const tstring expr_chars = _T("X+-/*");
+				const tstring expr_chars = _T("X+-/*"), expr_acts = _T("+-/*");
 				while(p1 < gbQuestion.length() && p1 != tstring::npos && expr_chars.find(gbQuestion[p1]) != tstring::npos)
 				{
 					std::string arg;
@@ -252,7 +252,7 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_FILTER_ADD, w, l)
 					tmp_question.replace(p2, arg.size(), arg);
 #endif
 					args.push_back(atoi(arg.c_str()));
-					if((p1 < gbQuestion.length()) && (p1 != tstring::npos))
+					if((p1 < gbQuestion.length()) && (p1 != tstring::npos) && (expr_acts.find(gbQuestion[p1]) != tstring::npos))
 						actions.push_back(gbQuestion[p1]);
 					++p1;
 				}
diff --git a/stopspam_10.vcxproj b/stopspam_10.vcxproj
index 07e6524..cf2a91b 100755
--- a/stopspam_10.vcxproj
+++ b/stopspam_10.vcxproj
@@ -252,7 +252,7 @@
     <Link>

       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)stopspam.pdb</ProgramDatabaseFile>

+      <ProgramDatabaseFile>c:\debug\stopspam.pdb</ProgramDatabaseFile>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

@@ -297,7 +297,7 @@
     </PreBuildEvent>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>X:\temp\windows\libs\boost;X:\temp\windows\libs\utf8cpp\include;X:\install\git\miranda\miranda-im\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>X:\temp\windows\libs\Boost\include;X:\temp\windows\libs\utf8cpp\include;X:\install\git\miranda\miranda-im\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -310,14 +310,14 @@
     <Link>

       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)stopspam.pdb</ProgramDatabaseFile>

+      <ProgramDatabaseFile>c:\debug\stopspam.pdb</ProgramDatabaseFile>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

       <ImportLibrary>$(OutDir)stopspam.lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

-      <AdditionalLibraryDirectories>X:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>X:\temp\windows\libs\Boost\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'">

@@ -327,7 +327,7 @@
     </PreBuildEvent>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>C:\Boost\include\boost-1_45;X:\temp\windows\libs\utf8cpp\include;X:\install\git\miranda\miranda-im\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>X:\temp\windows\libs\Boost\include;X:\temp\windows\libs\utf8cpp\include;X:\install\git\miranda\miranda-im\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -339,13 +339,13 @@
     <Link>

       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)stopspam.pdb</ProgramDatabaseFile>

+      <ProgramDatabaseFile>c:\debug\stopspam.pdb</ProgramDatabaseFile>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

       <ImportLibrary>$(OutDir)stopspam.lib</ImportLibrary>

-      <AdditionalLibraryDirectories>C:\Boost\lib-debug-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>X:\temp\windows\libs\Boost\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -628,7 +628,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>X:\temp\windows\libs\boost;X:\temp\windows\libs\utf8cpp\include;X:\install\git\miranda\miranda-im\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>X:\temp\windows\libs\Boost\include;X:\temp\windows\libs\utf8cpp\include;X:\install\git\miranda\miranda-im\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -654,7 +654,7 @@
       </DataExecutionPrevention>

       <ImportLibrary>

       </ImportLibrary>

-      <AdditionalLibraryDirectories>X:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>X:\temp\windows\libs\Boost\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

     </Link>

     <PostBuildEvent>

       <Command>

diff --git a/utilities.cpp b/utilities.cpp
index 660a203..2b2126c 100755
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -502,17 +502,7 @@ std::string toUTF8(std::wstring str)
 
 std::string toUTF8(std::string str)
 {
-	std::string ustr;
-	std::string tmpstr;
-	try{
-	utf8::replace_invalid(str.begin(), str.end(), back_inserter(tmpstr));
-	utf8::utf16to8(tmpstr.begin(), tmpstr.end(), back_inserter(ustr));
-	}
-	catch(const std::exception &e)
-	{
-		//TODO: handle utf8cpp exceptions
-	}
-	return ustr;
+	return toUTF8(toUTF16(str));
 }