don't mark utf8 messages as unicode

added vc9 project files

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@414 4f64403b-2f21-0410-a795-97e2b3489a10

6 files changed, 332 insertions, 4 deletions

diff --git a/nohtml/common.h b/nohtml/common.h
index 794a5d9..51486f9 100644
--- a/nohtml/common.h
+++ b/nohtml/common.h
@@ -33,7 +33,8 @@
 #include <malloc.h>

 #include <stdlib.h>

 

-#define MIRANDA_VER	0x0600

+#define MIRANDA_VER	0x0800

+

 #include <newpluginapi.h>

 #include <m_system.h>

 #include <m_database.h>

diff --git a/nohtml/filter.cpp b/nohtml/filter.cpp
index 951140b..b29781d 100644
--- a/nohtml/filter.cpp
+++ b/nohtml/filter.cpp
@@ -85,7 +85,8 @@ int FilterSendMessage(WPARAM wParam, LPARAM lParam) {
 

 int FilterSendMessageW(WPARAM wParam, LPARAM lParam) {

     CCSDATA *ccs = (CCSDATA *) lParam;

-	ccs->wParam |= PREF_UNICODE;

+	if(!(ccs->wParam & PREF_UTF))

+		ccs->wParam |= PREF_UNICODE;

 

 	return FilterSendMessage(wParam, lParam);

 }

@@ -187,7 +188,7 @@ int NewContact(WPARAM wParam, LPARAM lParam) {
 

 void RegisterFilter() {

 	PROTOCOLDESCRIPTOR pd = {0};

-	pd.cbSize = sizeof(pd);

+	pd.cbSize = PROTOCOLDESCRIPTOR_V3_SIZE;//sizeof(pd);

 	pd.szName = MODULE "Filter";	

 	pd.type = PROTOTYPE_FILTER; 

 

diff --git a/nohtml/nohtml.cpp b/nohtml/nohtml.cpp
index caacecb..8c0b8da 100644
--- a/nohtml/nohtml.cpp
+++ b/nohtml/nohtml.cpp
@@ -13,6 +13,8 @@ PLUGINLINK *pluginLink;
 DWORD mirandaVer;

 int codepage;

 

+struct MM_INTERFACE mmi;

+

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

 	//META_PROTO,

@@ -97,6 +99,8 @@ extern "C" __declspec (dllexport) int Load(PLUGINLINK *link) {
 	pluginLink=link;

 

 	codepage = (int)CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);

+	mir_getMMI(&mmi);

+

 	InitOptions();

 

 	/////////////

diff --git a/nohtml/nohtml_9.sln b/nohtml/nohtml_9.sln
new file mode 100644
index 0000000..73bb545
--- /dev/null
+++ b/nohtml/nohtml_9.sln
@@ -0,0 +1,26 @@
+

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nohtml", "nohtml_9.vcproj", "{35961A10-6297-47AA-A6D9-1713389AC5F9}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug (Unicode)|Win32 = Debug (Unicode)|Win32

+		Debug|Win32 = Debug|Win32

+		Release (Unicode)|Win32 = Release (Unicode)|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{35961A10-6297-47AA-A6D9-1713389AC5F9}.Debug (Unicode)|Win32.ActiveCfg = Release|Win32

+		{35961A10-6297-47AA-A6D9-1713389AC5F9}.Debug (Unicode)|Win32.Build.0 = Release|Win32

+		{35961A10-6297-47AA-A6D9-1713389AC5F9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{35961A10-6297-47AA-A6D9-1713389AC5F9}.Debug|Win32.Build.0 = Debug|Win32

+		{35961A10-6297-47AA-A6D9-1713389AC5F9}.Release (Unicode)|Win32.ActiveCfg = Release|Win32

+		{35961A10-6297-47AA-A6D9-1713389AC5F9}.Release (Unicode)|Win32.Build.0 = Release|Win32

+		{35961A10-6297-47AA-A6D9-1713389AC5F9}.Release|Win32.ActiveCfg = Release|Win32

+		{35961A10-6297-47AA-A6D9-1713389AC5F9}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/nohtml/nohtml_9.vcproj b/nohtml/nohtml_9.vcproj
new file mode 100644
index 0000000..60d0629
--- /dev/null
+++ b/nohtml/nohtml_9.vcproj
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="nohtml"

+	ProjectGUID="{35961A10-6297-47AA-A6D9-1713389AC5F9}"

+	RootNamespace="nohtml"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../include"

+				PreprocessorDefinitions="_DEBUG;_WINDOWS;_USERDLL"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderThrough="common.h"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4996"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="../../include"

+				PreprocessorDefinitions="NDEBUG;_WINDOWS;_USERDLL"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderThrough="common.h"

+				DisableSpecificWarnings="4996"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				SubSystem="2"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath=".\common.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\conv.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\filter.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\nohtml.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\options.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\strl.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath=".\common.h"

+				>

+			</File>

+			<File

+				RelativePath=".\conv.h"

+				>

+			</File>

+			<File

+				RelativePath=".\filter.h"

+				>

+			</File>

+			<File

+				RelativePath=".\options.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource.h"

+				>

+			</File>

+			<File

+				RelativePath=".\strl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\version.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+			<File

+				RelativePath=".\nohtml.rc"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\resource.rc"

+				>

+			</File>

+			<File

+				RelativePath=".\version.rc"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<File

+			RelativePath=".\readme.txt"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/nohtml/version.h b/nohtml/version.h
index bc033f5..83b6f03 100644
--- a/nohtml/version.h
+++ b/nohtml/version.h
@@ -5,7 +5,7 @@
 #define __MAJOR_VERSION				0

 #define __MINOR_VERSION				0

 #define __RELEASE_NUM				2

-#define __BUILD_NUM					3

+#define __BUILD_NUM					4

 

 #define __FILEVERSION_STRING        __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 #define __FILEVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM