Bonsai: ajusting the project

git-svn-id: http://svn.miranda-ng.org/main/trunk@5 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 498 insertions, 648 deletions

diff --git a/plugins/Bonsai/Bonsai.sln b/plugins/Bonsai/Bonsai.sln
index 0d68331f8d..e644cf4061 100644
--- a/plugins/Bonsai/Bonsai.sln
+++ b/plugins/Bonsai/Bonsai.sln
@@ -1,20 +1,32 @@
 

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bonsai", "FixOptions\FixOptions.vcproj", "{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}"

+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bonsai", "FixOptions\FixOptions.vcxproj", "{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug Unicode|Win32 = Debug Unicode|Win32

+		Debug Unicode|x64 = Debug Unicode|x64

 		Debug|Win32 = Debug|Win32

 		Debug|x64 = Debug|x64

+		Release Unicode|Win32 = Release Unicode|Win32

+		Release Unicode|x64 = Release Unicode|x64

 		Release|Win32 = Release|Win32

 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug Unicode|x64.Build.0 = Debug Unicode|x64

 		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|Win32.ActiveCfg = Debug|Win32

 		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|Win32.Build.0 = Debug|Win32

 		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|x64.ActiveCfg = Debug|x64

 		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|x64.Build.0 = Debug|x64

+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release Unicode|x64.Build.0 = Release Unicode|x64

 		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release|Win32.ActiveCfg = Release|Win32

 		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release|Win32.Build.0 = Release|Win32

 		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release|x64.ActiveCfg = Release|x64

diff --git a/plugins/Bonsai/FixOptions/FixOptions.vcproj b/plugins/Bonsai/FixOptions/FixOptions.vcproj
deleted file mode 100644
index 57ff32ecd4..0000000000
--- a/plugins/Bonsai/FixOptions/FixOptions.vcproj
+++ /dev/null
@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="Bonsai"

-	ProjectGUID="{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}"

-	RootNamespace="Bonsai"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\cvs\test miranda\Plugins"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../include/"

-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../include/"

-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN64;_DEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../include/"

-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="unicows.lib comctl32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				BaseAddress="0x2F080000"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="0"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../include/"

-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN64;NDEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				BaseAddress="0x2F080000"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<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=".\Bonsai.cpp"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						Detect64BitPortabilityProblems="false"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						Detect64BitPortabilityProblems="false"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						Detect64BitPortabilityProblems="false"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						Detect64BitPortabilityProblems="false"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\dlg_handlers.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\hooked_events.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\list.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\mirandaMem.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\services.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\utils.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

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

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

-			>

-			<File

-				RelativePath=".\commonheaders.h"

-				>

-			</File>

-			<File

-				RelativePath=".\dlg_handlers.h"

-				>

-			</File>

-			<File

-				RelativePath=".\hooked_events.h"

-				>

-			</File>

-			<File

-				RelativePath=".\list.h"

-				>

-			</File>

-			<File

-				RelativePath=".\mirandaMem.h"

-				>

-			</File>

-			<File

-				RelativePath=".\resource.h"

-				>

-			</File>

-			<File

-				RelativePath=".\services.h"

-				>

-			</File>

-			<File

-				RelativePath=".\utils.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=".\Bonsai.rc"

-				>

-			</File>

-			<File

-				RelativePath=".\icons\hidden.bmp"

-				>

-			</File>

-			<File

-				RelativePath=".\icon1.ico"

-				>

-			</File>

-			<File

-				RelativePath=".\icons\modified.bmp"

-				>

-			</File>

-			<File

-				RelativePath=".\icons\modified.ico"

-				>

-			</File>

-			<File

-				RelativePath=".\icons\newlymodified.bmp"

-				>

-			</File>

-			<File

-				RelativePath=".\icons\unmodified.bmp"

-				>

-			</File>

-			<File

-				RelativePath=".\icons\unmodified.ico"

-				>

-			</File>

-			<File

-				RelativePath=".\version.rc"

-				>

-			</File>

-		</Filter>

-		<File

-			RelativePath="..\docs\Bonsai_readme.txt"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/plugins/Bonsai/FixOptions/FixOptions.vcxproj b/plugins/Bonsai/FixOptions/FixOptions.vcxproj
new file mode 100644
index 0000000000..aef56b34b0
--- /dev/null
+++ b/plugins/Bonsai/FixOptions/FixOptions.vcxproj
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug Unicode|Win32">

+      <Configuration>Debug Unicode</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug Unicode|x64">

+      <Configuration>Debug Unicode</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release Unicode|Win32">

+      <Configuration>Release Unicode</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release Unicode|x64">

+      <Configuration>Release Unicode</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectName>Bonsai</ProjectName>

+    <ProjectGuid>{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}</ProjectGuid>

+    <RootNamespace>Bonsai</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">false</LinkIncremental>

+  </PropertyGroup>

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

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;_DEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;_DEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <Optimization>Full</Optimization>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>unicows.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x2F080000</BaseAddress>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <Optimization>Full</Optimization>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>unicows.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x2F080000</BaseAddress>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;NDEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <Optimization>Full</Optimization>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x2F080000</BaseAddress>

+      <TargetMachine>MachineX64</TargetMachine>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;NDEBUG;_WINDOWS;_USRDLL;FIXOPTIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <Optimization>Full</Optimization>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x2F080000</BaseAddress>

+      <TargetMachine>MachineX64</TargetMachine>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="Bonsai.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">

+      </PrecompiledHeader>

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

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">

+      </PrecompiledHeader>

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

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="dlg_handlers.cpp" />

+    <ClCompile Include="hooked_events.cpp" />

+    <ClCompile Include="list.cpp" />

+    <ClCompile Include="mirandaMem.cpp" />

+    <ClCompile Include="services.cpp" />

+    <ClCompile Include="utils.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="commonheaders.h" />

+    <ClInclude Include="dlg_handlers.h" />

+    <ClInclude Include="hooked_events.h" />

+    <ClInclude Include="list.h" />

+    <ClInclude Include="mirandaMem.h" />

+    <ClInclude Include="resource.h" />

+    <ClInclude Include="services.h" />

+    <ClInclude Include="utils.h" />

+    <ClInclude Include="version.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="Bonsai.rc" />

+    <ResourceCompile Include="version.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="icons\hidden.bmp" />

+    <None Include="icon1.ico" />

+    <None Include="icons\modified.bmp" />

+    <None Include="icons\modified.ico" />

+    <None Include="icons\newlymodified.bmp" />

+    <None Include="icons\unmodified.bmp" />

+    <None Include="icons\unmodified.ico" />

+    <None Include="..\docs\Bonsai_readme.txt" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/Bonsai/FixOptions/FixOptions.vcxproj.filters b/plugins/Bonsai/FixOptions/FixOptions.vcxproj.filters
new file mode 100644
index 0000000000..263e9a73f1
--- /dev/null
+++ b/plugins/Bonsai/FixOptions/FixOptions.vcxproj.filters
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="Bonsai.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="dlg_handlers.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="hooked_events.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="list.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="mirandaMem.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="services.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="utils.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="commonheaders.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="dlg_handlers.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="hooked_events.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="list.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="mirandaMem.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="services.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="utils.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="Bonsai.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="icons\hidden.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="icon1.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="icons\modified.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="icons\modified.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="icons\newlymodified.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="icons\unmodified.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="icons\unmodified.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="..\docs\Bonsai_readme.txt" />

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/Bonsai/FixOptions/commonheaders.h b/plugins/Bonsai/FixOptions/commonheaders.h
index 718e799801..ab11dcaf2f 100644
--- a/plugins/Bonsai/FixOptions/commonheaders.h
+++ b/plugins/Bonsai/FixOptions/commonheaders.h
@@ -45,7 +45,7 @@ typedef INT_PTR (*MIRANDASERVICE)(WPARAM,LPARAM);
 //#include "sdk/m_hotkeysplus.h"

 #include "m_popup.h"

 #include "m_utils.h"

-#include "sdk/m_updater.h"

+#include "m_updater.h"

 #include "m_system.h"

 

 #include "version.h"

diff --git a/plugins/Bonsai/FixOptions/sdk/m_updater.h b/plugins/Bonsai/FixOptions/sdk/m_updater.h
deleted file mode 100644
index 371b7437a0..0000000000
--- a/plugins/Bonsai/FixOptions/sdk/m_updater.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef _M_UPDATER_H

-#define _M_UPDATER_H

-

-// NOTES:

-// - For langpack updates, include a string of the following format in the langpack text file:

-//    ";FLID: <file listing name> <version>"

-//    version must be four numbers seperated by '.', in the range 0-255 inclusive

-// - Updater will disable plugins that are downloaded but were not active prior to the update (this is so that, if an archive contains e.g. ansi and 

-//    unicode versions, the correct plugin will be the only one active after the new version is installed)...so if you add a support plugin, you may need 

-//    to install an ini file to make the plugin activate when miranda restarts after the update

-// - Updater will replace all dlls that have the same internal shortName as a downloaded update dll (this is so that msn1.dll and msn2.dll, for example,

-//    will both be updated) - so if you have a unicode and a non-unicode version of a plugin in your archive, you should make the internal names different (which will break automatic 

-//    updates from the file listing if there is only one file listing entry for both versions, unless you use the 'MS_UPDATE_REGISTER' service below)

-// - Updater will install all files in the root of the archive into the plugins folder, except for langpack files that contain the FLID string which go into the root folder (same

-//    folder as miranda32.exe)...all folders in the archive will also be copied to miranda's root folder, and their contents transferred into the new folders. The only exception is a 

-//    special folder called 'root_files' - if there is a folder by that name in the archive, it's contents will also be copied into miranda's root folder - this is intended to be used 

-//    to install additional dlls etc that a plugin may require)

-

-// if you set Update.szUpdateURL to the following value when registering, as well as setting your beta site and version data,

-// Updater will ignore szVersionURL and pbVersionPrefix, and attempt to find the file listing URL's from the backend XML data.

-// for this to work, the plugin name in pluginInfo.shortName must match the file listing exactly (except for case)

-#define UPDATER_AUTOREGISTER		"UpdaterAUTOREGISTER"

-// Updater will also use the backend xml data if you provide URL's that reference the miranda file listing for updates (so you can use that method 

-// if e.g. your plugin shortName does not match the file listing) - it will grab the file listing id from the end of these URLs

-

-typedef struct Update_tag {

-  int cbSize;     

-  char *szComponentName;		// component name as it will appear in the UI (will be translated before displaying)

-

-  char *szVersionURL;			// URL where the current version can be found (NULL to disable)

-  BYTE *pbVersionPrefix;		// bytes occuring in VersionURL before the version, used to locate the version information within the URL data

-								// (note that this URL could point at a binary file - dunno why, but it could :)

-  int cpbVersionPrefix;			// number of bytes pointed to by pbVersionPrefix

-  char *szUpdateURL;			// URL where dll/zip is located

-								// set to UPDATER_AUTOREGISTER if you want Updater to find the file listing URLs (ensure plugin shortName matches file listing!)

-

-  char *szBetaVersionURL;		// URL where the beta version can be found (NULL to disable betas)

-  BYTE *pbBetaVersionPrefix;	// bytes occuring in VersionURL before the version, used to locate the version information within the URL data

-  int cpbBetaVersionPrefix;		// number of bytes pointed to by pbVersionPrefix

-  char *szBetaUpdateURL;		// URL where dll/zip is located

-

-  BYTE *pbVersion;				// bytes of current version, used for comparison with those in VersionURL

-  int cpbVersion;				// number of bytes pointed to by pbVersion

-

-  char *szBetaChangelogURL;		// url for displaying changelog for beta versions

-} Update;

-

-// register a comonent with Updater

-//

-// wparam = 0

-// lparam = (LPARAM)&Update

-#define MS_UPDATE_REGISTER      "Update/Register"

-

-// utility functions to create a version string from a DWORD or from pluginInfo

-// point buf at a buffer at least 16 chars wide - but note the version string returned may be shorter

-//

-__inline static char *CreateVersionString(DWORD version, char *buf) {

-	mir_snprintf(buf, 16, "%d.%d.%d.%d", (version >> 24) & 0xFF, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);

-	return buf;

-}

-

-__inline static char *CreateVersionStringPlugin(PLUGININFO *pluginInfo, char *buf) {

-	return CreateVersionString(pluginInfo->version, buf);

-}

-

-

-// register the 'easy' way - use this method if you have no beta URL and the plugin is on the miranda file listing

-// NOTE: the plugin version string on the file listing must be the string version of the version in pluginInfo (i.e. 0.0.0.1,

-// four numbers between 0 and 255 inclusivem, so no letters, brackets, etc.)

-//

-// wParam = (int)fileID				- this is the file ID from the file listing (i.e. the number at the end of the download link)

-// lParam = (PLUGININFO*)&pluginInfo

-#define MS_UPDATE_REGISTERFL	"Update/RegisterFL"

-

-// this function can be used to 'unregister' components - useful for plugins that register non-plugin/langpack components and

-// may need to change those components on the fly

-// lParam = (char *)szComponentName

-#define MS_UPDATE_UNREGISTER	"Update/Unregister"

-

-// this event is fired when the startup process is complete, but NOT if a restart is imminent

-// it is designed for status managment plugins to use as a trigger for beggining their own startup process

-// wParam = lParam = 0 (unused)

-// (added in version 0.1.6.0)

-#define ME_UPDATE_STARTUPDONE	"Update/StartupDone"

-

-// this service can be used to enable/disable Updater's global status control

-// it can be called from the StartupDone event handler

-// wParam = (BOOL)enable

-// lParam = 0

-// (added in version 0.1.6.0)

-#define MS_UPDATE_ENABLESTATUSCONTROL	"Update/EnableStatusControl"

-

-// An description of usage of the above service and event:

-// Say you are a status control plugin that normally sets protocol or global statuses in your ModulesLoaded event handler.

-// In order to make yourself 'Updater compatible', you would move the status control code from ModulesLoaded to another function, 

-// say DoStartup. Then, in ModulesLoaded you would check for the existence of the MS_UPDATE_ENABLESTATUSCONTROL service.

-// If it does not exist, call DoStartup. If it does exist, hook the ME_UPDATE_STARTUPDONE event and call DoStartup from there. You may

-// also wish to call MS_UPDATE_ENABLESTATUSCONTROL with wParam == FALSE at this time, to disable Updater's own status control feature.

-

-// this service can be used to determine whether updates are possible for a component with the given name

-// wParam = 0

-// lParam = (char *)szComponentName

-// returns TRUE if updates are supported, FALSE otherwise

-#define MS_UPDATE_ISUPDATESUPPORTED		"Update/IsUpdateSupported"

-

-#endif

-

-

-/////////////// Usage Example ///////////////

-

-#ifdef EXAMPLE_CODE

-

-// you need to #include "m_updater.h" and HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded) in your Load function...

-

-int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {

-

-	Update update = {0}; // for c you'd use memset or ZeroMemory...

-	char szVersion[16];

-

-	update.cbSize = sizeof(Update);

-

-	update.szComponentName = pluginInfo.shortName;

-	update.pbVersion = (BYTE *)CreateVersionString(&pluginInfo, szVersion);

-	update.cpbVersion = strlen((char *)update.pbVersion);

-

-	// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 

-	// before the version that we use to locate it on the page

-	// (note that if the update URL and the version URL point to standard file listing entries, the backend xml

-	// data will be used to check for updates rather than the actual web page - this is not true for beta urls)

-	update.szUpdateURL = "http://scottellis.com.au:81/test/updater.zip";

-	update.szVersionURL = "http://scottellis.com.au:81/test/updater_test.html";

-	update.pbVersionPrefix = (BYTE *)"Updater version ";

-	

-	update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);

-

-	// do the same for the beta versions of the above struct members if you wish to allow beta updates from another URL

-

-	CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);

-

-	// Alternatively, to register a plugin with e.g. file ID 2254 on the file listing...

-	// CallService(MS_UPDATE_REGISTERFL, (WPARAM)2254, (LPARAM)&pluginInfo);

-

-	return 0;

-}

-

-#endif