11 files changed, 476 insertions, 2810 deletions
diff --git a/plugins/HistorySweeperLight/historysweeperlight.vcproj b/plugins/HistorySweeperLight/historysweeperlight.vcproj
deleted file mode 100644
index 46b54e5ec9..0000000000
--- a/plugins/HistorySweeperLight/historysweeperlight.vcproj
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="historysweeperlight"
-	ProjectGUID="{9DE1F0B0-B9D1-4681-82E7-13CC3E047445}"
-	RootNamespace="historysweeperlight"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HISTORYSWEEPERLIGHT_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4996"
-			/>
-			<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="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="false"
-				FavorSizeOrSpeed="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HISTORYSWEEPERLIGHT_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<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 Unicode vc6|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HISTORYSWEEPERLIGHT_EXPORTS;VC6BUILD"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				FloatingPointModel="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ..\vc6libs\msvcrt.lib ..\vc6libs\msvcrt_winxp.obj"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<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=".\historysweeperlight.c"
-				>
-			</File>
-			<File
-				RelativePath=".\main.c"
-				>
-			</File>
-			<File
-				RelativePath=".\options.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\historysweeperlight.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.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=".\historysweeperlight.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/IEView/ieview.vcproj b/plugins/IEView/ieview.vcproj
deleted file mode 100644
index ac243de614..0000000000
--- a/plugins/IEView/ieview.vcproj
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="ieview"
-	ProjectGUID="{B988F96C-F87A-484C-AB15-D0674B22F291}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../ExternalAPI"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="0"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="FALSE"
-				AdditionalIncludeDirectories="../../include;../ExternalAPI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../ExternalAPI"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="0"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				GlobalOptimizations="TRUE"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="FALSE"
-				AdditionalIncludeDirectories="../../include;../ExternalAPI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\ChatHTMLBuilder.h">
-			</File>
-			<File
-				RelativePath=".\HistoryHTMLBuilder.h">
-			</File>
-			<File
-				RelativePath=".\HTMLBuilder.h">
-			</File>
-			<File
-				RelativePath=".\IEView.h">
-			</File>
-			<File
-				RelativePath=".\ieview_common.h">
-			</File>
-			<File
-				RelativePath=".\ieview_private.h">
-			</File>
-			<File
-				RelativePath=".\ieview_services.h">
-			</File>
-			<File
-				RelativePath=".\m_avatars.h">
-			</File>
-			<File
-				RelativePath=".\m_ieview.h">
-			</File>
-			<File
-				RelativePath=".\m_MathModule.h">
-			</File>
-			<File
-				RelativePath=".\m_metacontacts.h">
-			</File>
-			<File
-				RelativePath=".\m_smileyadd.h">
-			</File>
-			<File
-				RelativePath=".\mshtmhst.h">
-			</File>
-			<File
-				RelativePath=".\MUCCHTMLBuilder.h">
-			</File>
-			<File
-				RelativePath=".\Options.h">
-			</File>
-			<File
-				RelativePath=".\resource.h">
-			</File>
-			<File
-				RelativePath=".\ScriverHTMLBuilder.h">
-			</File>
-			<File
-				RelativePath=".\TabSRMMHTMLBuilder.h">
-			</File>
-			<File
-				RelativePath=".\Template.h">
-			</File>
-			<File
-				RelativePath=".\TemplateHTMLBuilder.h">
-			</File>
-			<File
-				RelativePath=".\Utils.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-			<File
-				RelativePath=".\ieview.rc">
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\ChatHTMLBuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\HistoryHTMLBuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\HTMLBuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\IEView.cpp">
-			</File>
-			<File
-				RelativePath=".\ieview_main.cpp">
-			</File>
-			<File
-				RelativePath=".\ieview_services.cpp">
-			</File>
-			<File
-				RelativePath=".\MUCCHTMLBuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\Options.cpp">
-			</File>
-			<File
-				RelativePath=".\ScriverHTMLBuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\TabSRMMHTMLBuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\Template.cpp">
-			</File>
-			<File
-				RelativePath=".\TemplateHTMLBuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\Utils.cpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/crshdmp/m_folders.h b/plugins/crshdmp/m_folders.h
deleted file mode 100644
index 82cb1fced4..0000000000
--- a/plugins/crshdmp/m_folders.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
-Custom profile folders plugin for Miranda IM
-
-Copyright � 2005 Cristian Libotean
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef M_CUSTOM_FOLDERS_H
-#define M_CUSTOM_FOLDERS_H
-
-#define FOLDERS_API 501 //dunno why it's here but it is :)
-
-#define PROFILE_PATH "%profile_path%"
-#define CURRENT_PROFILE "%current_profile%"
-#define MIRANDA_PATH "%miranda_path%"
-#define PLUGINS_PATH "%miranda_path%" "\\plugins"
-
-#define TO_WIDE(x)     L ## x
-
-#define PROFILE_PATHW    L"%profile_path%"
-#define CURRENT_PROFILEW L"%current_profile%"
-#define MIRANDA_PATHW    L"%miranda_path%"
-
-#define FOLDER_AVATARS                 PROFILE_PATH "\\" CURRENT_PROFILE "\\avatars"
-#define FOLDER_VCARDS                  PROFILE_PATH "\\" CURRENT_PROFILE "\\vcards"
-#define FOLDER_LOGS                    PROFILE_PATH "\\" CURRENT_PROFILE "\\logs"
-#define FOLDER_RECEIVED_FILES          PROFILE_PATH "\\" CURRENT_PROFILE "\\received files"
-#define FOLDER_DOCS                    MIRANDA_PATH "\\" "docs"
-
-#define FOLDER_CONFIG                  PLUGINS_PATH "\\" "config"
-
-#define FOLDER_SCRIPTS                 MIRANDA_PATH "\\" "scripts"
-
-#define FOLDER_UPDATES                 MIRANDA_PATH "\\" "updates"
-
-#define FOLDER_CUSTOMIZE               MIRANDA_PATH "\\" "customize"
-#define FOLDER_CUSTOMIZE_SOUNDS        FOLDER_CUSTOMIZE "\\sounds"
-#define FOLDER_CUSTOMIZE_ICONS         FOLDER_CUSTOMIZE "\\icons"
-#define FOLDER_CUSTOMIZE_SMILEYS       FOLDER_CUSTOMIZE "\\smileys"
-#define FOLDER_CUSTOMIZE_SKINS         FOLDER_CUSTOMIZE "\\skins"
-#define FOLDER_CUSTOMIZE_THEMES        FOLDER_CUSTOMIZE "\\themes"
-
-
-#define FOLDERS_NAME_MAX_SIZE 64  //maximum name and section size
-
-#define FF_UNICODE 0x00000001
-
-#if defined (UNICODE)
-	#define FF_TCHAR	FF_UNICODE
-#else
-	#define FF_TCHAR	0
-#endif
-
-typedef struct{
-  int cbSize;                                  //size of struct
-  char szSection[FOLDERS_NAME_MAX_SIZE];       //section name, if it doesn't exist it will be created otherwise it will just add this entry to it
-  char szName[FOLDERS_NAME_MAX_SIZE];          //entry name - will be shown in options
-  union{
-    const char *szFormat;                      //default string format. Fallback string in case there's no entry in the database for this folder. This should be the initial value for the path, users will be able to change it later.
-    const wchar_t *szFormatW;                  //String is dup()'d so you can free it later. If you set the unicode string don't forget to set the flag accordingly.
-    const TCHAR *szFormatT;
-  };
-  DWORD flags;                                 //FF_* flags
-} FOLDERSDATA;
-
-/*Folders/Register/Path service
-  wParam - not used, must be 0
-  lParam - (LPARAM) (const FOLDERDATA *) - Data structure filled with 
-  the necessary information.
-  Returns a handle to the registered path or 0 on error. 
-  You need to use this to call the other services.
-*/
-#define MS_FOLDERS_REGISTER_PATH "Folders/Register/Path"
-
-/*Folders/Get/PathSize service
-  wParam - (WPARAM) (int) - handle to registered path
-  lParam - (LPARAM) (int *) - pointer to the variable that receives the size of the path 
-  string (not including the null character). Depending on the flags set when creating the path
-  it will either call strlen() or wcslen() to get the length of the string.
-  Returns the size of the buffer.
-*/
-#define MS_FOLDERS_GET_SIZE "Folders/Get/PathSize"
-
-typedef struct{
-	int cbSize;
-	int nMaxPathSize;                     //maximum size of buffer. This represents the number of characters that can be copied to it (so for unicode strings you don't send the number of bytes but the length of the string).
-	union{
-		char *szPath;                     //pointer to the buffer that receives the path without the last "\\"
-		wchar_t *szPathW;                 //unicode version of the buffer.
-		TCHAR *szPathT;
-	};
-} FOLDERSGETDATA;
-
-/*Folders/Get/Path service
-  wParam - (WPARAM) (int) - handle to registered path
-  lParam - (LPARAM) (FOLDERSGETDATA *) pointer to a FOLDERSGETDATA that has all the relevant fields filled.
-  Should return 0 on success, or nonzero otherwise.
-*/
-#define MS_FOLDERS_GET_PATH "Folders/Get/Path"
-
-typedef struct{
-  int cbSize;
-  union{
-    char **szPath;                    //address of a string variable (char *) or (wchar_t*) where the path should be stored (the last \ won't be copied).
-    wchar_t **szPathW;                //unicode version of string.
-    TCHAR **szPathT;
-	};
-} FOLDERSGETALLOCDATA;
-
-/*Folders/GetRelativePath/Alloc service
-  wParam - (WPARAM) (int) - Handle to registered path
-  lParam - (LPARAM) (FOLDERSALLOCDATA *) data
-  This service is the same as MS_FOLDERS_GET_PATH with the difference that this service
-  allocates the needed space for the buffer. It uses miranda's memory functions for that and you need
-  to use those to free the resulting buffer.
-  Should return 0 on success, or nonzero otherwise. Currently it only returns 0.
-*/
-#define MS_FOLDERS_GET_PATH_ALLOC "Folders/Get/Path/Alloc"
-
-
-/*Folders/On/Path/Changed
-	wParam - (WPARAM) 0
-	lParam - (LPARAM) 0
-	Triggered when the folders change, you should reget the paths you registered.
-*/
-#define ME_FOLDERS_PATH_CHANGED "Folders/On/Path/Changed"
-
-#ifndef FOLDERS_NO_HELPER_FUNCTIONS
-
-#ifndef M_UTILS_H__
-#error The helper functions require that m_utils.h be included in the project. Please include that file if you want to use the helper functions. If you don''t want to use the functions just define FOLDERS_NO_HELPER_FUNCTIONS.
-#endif
-//#include "../../../include/newpluginapi.h"
-
-__inline static HANDLE FoldersRegisterCustomPath(const char *section, const char *name, const char *defaultPath)
-{
-	FOLDERSDATA fd = {0};
-	if (!ServiceExists(MS_FOLDERS_REGISTER_PATH)) return 0;
-	fd.cbSize = sizeof(FOLDERSDATA);
-	strncpy(fd.szSection, section, FOLDERS_NAME_MAX_SIZE);
-	fd.szSection[FOLDERS_NAME_MAX_SIZE - 1] = '\0';
-	strncpy(fd.szName, name, FOLDERS_NAME_MAX_SIZE);
-	fd.szName[FOLDERS_NAME_MAX_SIZE - 1] = '\0';
-	fd.szFormat = defaultPath;
-	return (HANDLE) CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM) &fd);
-}
-
-__inline static HANDLE FoldersRegisterCustomPathW(const char *section, const char *name, const wchar_t *defaultPathW)
-{
-	FOLDERSDATA fd = {0};
-	if (!ServiceExists(MS_FOLDERS_REGISTER_PATH)) return 0;
-	fd.cbSize = sizeof(FOLDERSDATA);
-	strncpy(fd.szSection, section, FOLDERS_NAME_MAX_SIZE);
-	fd.szSection[FOLDERS_NAME_MAX_SIZE - 1] = '\0'; //make sure it's NULL terminated
-	strncpy(fd.szName, name, FOLDERS_NAME_MAX_SIZE);
-	fd.szName[FOLDERS_NAME_MAX_SIZE - 1] = '\0'; //make sure it's NULL terminated
-	fd.szFormatW = defaultPathW;
-	fd.flags = FF_UNICODE;
-	return (HANDLE) CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM) &fd);
-}
-
-__inline static INT_PTR FoldersGetCustomPath(HANDLE hFolderEntry, char *path, const int size, char *notFound)
-{
-	FOLDERSGETDATA fgd = {0};
-	INT_PTR res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = size;
-	fgd.szPath = path;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		char buffer[MAX_PATH];
-		CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) notFound, (LPARAM) buffer);
-		mir_snprintf(path, size, "%s", buffer);
-	}
-		
-	return res;
-}
-
-__inline static INT_PTR FoldersGetCustomPathW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW)
-{
-	FOLDERSGETDATA fgd = {0};
-	INT_PTR res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = count;
-	fgd.szPathW = pathW;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		wcsncpy(pathW, notFoundW, count);
-		pathW[count - 1] = '\0';
-	}
-		
-	return res;
-}
-
-__inline static INT_PTR FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, const int size, char *notFound, char *fileName)
-{
-	FOLDERSGETDATA fgd = {0};
-	INT_PTR res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = size;
-	fgd.szPath = path;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		char buffer[MAX_PATH];
-		CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) notFound, (LPARAM) buffer);
-		mir_snprintf(path, size, "%s", buffer);
-	}
-	if (strlen(path) > 0)
-	{
-		strcat(path, "\\");
-	}
-	else{
-		path[0] = '\0';
-	}
-	
-	if (fileName)
-	{
-		strcat(path, fileName);
-	}
-	
-	return res;
-}
-
-__inline static INT_PTR FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW, wchar_t *fileNameW)
-{
-	FOLDERSGETDATA fgd = {0};
-	INT_PTR res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = count;
-	fgd.szPathW = pathW;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		wcsncpy(pathW, notFoundW, count);
-		pathW[count - 1] = '\0';
-	}
-	
-	if (wcslen(pathW) > 0)
-	{
-		wcscat(pathW, L"\\");
-	}
-	else{
-		pathW[0] = L'\0';
-	}
-	
-	if (fileNameW)
-	{
-		wcscat(pathW, fileNameW);
-	}
-	
-	return res;
-}
-
-# ifdef _UNICODE
-#  define FoldersGetCustomPathT FoldersGetCustomPathW
-#  define FoldersGetCustomPathExT FoldersGetCustomPathExW
-#  define FoldersRegisterCustomPathT FoldersRegisterCustomPathW
-#else
-#  define FoldersGetCustomPathT FoldersGetCustomPath
-#  define FoldersGetCustomPathExT FoldersGetCustomPath
-#  define FoldersRegisterCustomPathT FoldersRegisterCustomPath
-#endif
-
-#endif
-
-#endif //M_CUSTOM_FOLDERS_H
diff --git a/plugins/crshdmp/m_toolbar.h b/plugins/crshdmp/m_toolbar.h
deleted file mode 100644
index fc417cf873..0000000000
--- a/plugins/crshdmp/m_toolbar.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef M_TOOLBAR_H
-#define M_TOOLBAR_H
-
-#define TOOLBARBUTTON_ICONIDPREFIX "MTB_"
-#define TOOLBARBUTTON_ICONIDPRIMARYSUFFIX "_Primary"
-#define TOOLBARBUTTON_ICONIDSECONDARYSUFFIX "_Secondary"
-#define TOOLBARBUTTON_ICONNAMEPRESSEDSUFFIX "Pressed"
-
-//button flags
-#define TBBF_DISABLED			(1<<0)
-#define TBBF_VISIBLE			(1<<1) 
-#define TBBF_PUSHED				(1<<2)
-#define TBBF_SHOWTOOLTIP		(1<<3)
-#define TBBF_ISSEPARATOR		(1<<5)
-#define TBBF_ISLBUTTON			(1<<6)
-#define TBBF_FLEXSIZESEPARATOR  (TBBF_ISSEPARATOR|TBBF_PUSHED) 
-typedef struct _tagTBButton
-{
-	int cbSize;				 // size of structure
-	char * pszButtonID;		 // char id of button used to store button info in DB and know about icon 
-	char * pszButtonName;    // name of button (not translated)
-	char * pszServiceName;	 // service name to be executed
-	LPARAM lParam;			 // param of service to be called
-	char * pszTooltipUp, *pszTooltipDn;	
-	DWORD defPos;			 // default order pos of button (less values are nearer to edge).. please use values greater that 100. the default buttons has pos: 10,20..90
-	DWORD tbbFlags;			 // combine of TBBF_ flags above
-	void (*ParamDestructor)(void *); //will be called on parameters deletion
-	HANDLE hPrimaryIconHandle;
-	HANDLE hSecondaryIconHandle;
-}TBButton;
-
-//////////////////////////////////////////////////////////////////////////
-// Events
-// Only after this event module subscribers should register their buttons
-// wparam=lparam=0
-// don't forget to return 0 to continue processing
-#define ME_TB_MODULELOADED	 "ToolBar/ModuleLoaded"
-
-//////////////////////////////////////////////////////////////////////////
-// Services
-//
-//////////////////////////////////////////////////////////////////////////
-// Adding a button
-// WPARAM  = 0
-// LPARAM  = (TBButton *) &description
-// LRESULT = (HANDLE) hButton
-// in order to correctly process default icons via iconlib it should be
-// registered icolib icon with id named:
-// 'TBButton_'+pszButtonID+ 'Up' or +'Down' for Push (2-state) buttons
-#define MS_TB_ADDBUTTON "ToolBar/AddButton"
-
-//////////////////////////////////////////////////////////////////////////
-// Remove button
-// WPARAM = (HANDLE) hButton;
-// LPARAM = 0;
-#define MS_TB_REMOVEBUTTON "ToolBar/RemoveButton"
-
-//////////////////////////////////////////////////////////////////////////
-// SetState
-// WPARAM = (HANDLE) hButton;
-// LPARAM = one of below TBST_ states 
-// LRESULT= old state
-#define TBST_PUSHED			1
-#define TBST_RELEASED		0
-#define MS_TB_SETBUTTONSTATE "ToolBar/SetButtonState"
-
-//////////////////////////////////////////////////////////////////////////
-// SetStatebyId
-// WPARAM = (char *) szButtonID;
-// LPARAM = one of below TBST_ states 
-// LRESULT= old state
-#define MS_TB_SETBUTTONSTATEBYID "ToolBar/SetButtonStateId"
-//////////////////////////////////////////////////////////////////////////
-// GetState
-// WPARAM = (HANLDE) hButton;
-// LPARAM = 0
-// LRESULT= current state
-#define MS_TB_GETBUTTONSTATE "ToolBar/GetButtonState"
-
-//////////////////////////////////////////////////////////////////////////
-// GetState
-// WPARAM = (char *) szButtonID;;
-// LPARAM = 0
-// LRESULT= current state
-#define MS_TB_GETBUTTONSTATEBYID "ToolBar/GetButtonStateId"
-
-
-#endif
-\ No newline at end of file
diff --git a/plugins/crshdmp/m_updater.h b/plugins/crshdmp/m_updater.h
deleted file mode 100644
index 488d3722ce..0000000000
--- a/plugins/crshdmp/m_updater.h
+++ /dev/null
@@ -1,150 +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);
-}
-
-__inline static char *CreateVersionStringPluginEx(PLUGININFOEX *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
diff --git a/plugins/folders/folders/folders.vcproj b/plugins/folders/folders/folders.vcproj
deleted file mode 100644
index fc62cb1496..0000000000
--- a/plugins/folders/folders/folders.vcproj
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="folders"
-	ProjectGUID="{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}"
-	RootNamespace="folders"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\..\..\cvs\test miranda\Plugins"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<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;FOLDERS_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				BrowseInformation="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="unicows.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				GenerateMapFile="false"
-				SubSystem="2"
-				BaseAddress="0x2F000000"
-				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="1"
-			>
-			<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;FOLDERS_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				BrowseInformation="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				GenerateMapFile="false"
-				SubSystem="2"
-				BaseAddress="0x2F000000"
-				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="$(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"
-				Optimization="3"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="../../../include/"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				BrowseInformation="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="unicows.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				BaseAddress="0x2F000000"
-				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"
-				Optimization="3"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="../../../include/"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN64;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				BrowseInformation="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				BaseAddress="0x2F000000"
-				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=".\dlg_handlers.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\events.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\folderItem.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\folders.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\foldersList.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\hooked_events.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=".\events.h"
-				>
-			</File>
-			<File
-				RelativePath=".\folderItem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\foldersList.h"
-				>
-			</File>
-			<File
-				RelativePath=".\hooked_events.h"
-				>
-			</File>
-			<File
-				RelativePath=".\m_folders.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=".\folders.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\variablesHelp.inc"
-				>
-			</File>
-			<File
-				RelativePath=".\version.rc"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\docs\folders_readme.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/folders/folders/folders.vcxproj b/plugins/folders/folders/folders.vcxproj
new file mode 100644
index 0000000000..e2cd0143c8
--- /dev/null
+++ b/plugins/folders/folders/folders.vcxproj
@@ -0,0 +1,384 @@
+<?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">
+    <ProjectGuid>{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}</ProjectGuid>
+    <RootNamespace>folders</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>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</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>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</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'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">false</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'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">false</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;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>unicows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>false</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x2F000000</BaseAddress>
+      <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;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>unicows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>false</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x2F000000</BaseAddress>
+      <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;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>false</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x2F000000</BaseAddress>
+      <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;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>false</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x2F000000</BaseAddress>
+      <TargetMachine>MachineX64</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>unicows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x2F000000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>unicows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x2F000000</BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x2F000000</BaseAddress>
+      <TargetMachine>MachineX64</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>0x2F000000</BaseAddress>
+      <TargetMachine>MachineX64</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="dlg_handlers.cpp" />
+    <ClCompile Include="events.cpp" />
+    <ClCompile Include="folderItem.cpp" />
+    <ClCompile Include="folders.cpp" />
+    <ClCompile Include="foldersList.cpp" />
+    <ClCompile Include="hooked_events.cpp" />
+    <ClCompile Include="services.cpp" />
+    <ClCompile Include="utils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="commonheaders.h" />
+    <ClInclude Include="dlg_handlers.h" />
+    <ClInclude Include="events.h" />
+    <ClInclude Include="folderItem.h" />
+    <ClInclude Include="foldersList.h" />
+    <ClInclude Include="hooked_events.h" />
+    <ClInclude Include="m_folders.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="services.h" />
+    <ClInclude Include="utils.h" />
+    <ClInclude Include="version.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="folders.rc" />
+    <ResourceCompile Include="version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="variablesHelp.inc" />
+    <None Include="..\docs\folders_readme.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/folders/folders/folders.vcxproj.filters b/plugins/folders/folders/folders.vcxproj.filters
new file mode 100644
index 0000000000..fae51320c3
--- /dev/null
+++ b/plugins/folders/folders/folders.vcxproj.filters
@@ -0,0 +1,92 @@
+<?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="dlg_handlers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="events.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="folderItem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="folders.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="foldersList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hooked_events.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="events.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="folderItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="foldersList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="hooked_events.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="m_folders.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="folders.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="variablesHelp.inc">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\docs\folders_readme.txt" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/folders/folders/m_folders.h b/plugins/folders/folders/m_folders.h
deleted file mode 100644
index 02d4d3564e..0000000000
--- a/plugins/folders/folders/m_folders.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
-Custom profile folders plugin for Miranda IM
-
-Copyright � 2005 Cristian Libotean
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef M_CUSTOM_FOLDERS_H
-#define M_CUSTOM_FOLDERS_H
-
-#define FOLDERS_API 501 //dunno why it's here but it is :)
-
-#define PROFILE_PATH "%profile_path%"
-#define CURRENT_PROFILE "%current_profile%"
-#define MIRANDA_PATH "%miranda_path%"
-#define PLUGINS_PATH "%miranda_path%" "\\plugins"
-#define MIRANDA_USERDATA "%miranda_userdata%"
-
-#define PROFILE_PATHW    L"%profile_path%"
-#define CURRENT_PROFILEW L"%current_profile%"
-#define MIRANDA_PATHW    L"%miranda_path%"
-#define MIRANDA_USERDATAW L"%miranda_userdata%"
-
-#ifdef _UNICODE	
-	#define PROFILE_PATHT		PROFILE_PATHW
-	#define CURRENT_PROFILET	CURRENT_PROFILEW
-	#define MIRANDA_PATHT		MIRANDA_PATHW
-	#define MIRANDA_USERDATAT	MIRANDA_USERDATAW
-#else
-	#define PROFILE_PATHT		PROFILE_PATH
-	#define CURRENT_PROFILET	CURRENT_PROFILE
-	#define MIRANDA_PATHT		MIRANDA_PATH
-	#define MIRANDA_USERDATAT	MIRANDA_USERDATA
-#endif
-
-#define FOLDER_AVATARS                 PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\avatars")
-#define FOLDER_VCARDS                  PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\vcards")
-#define FOLDER_LOGS                    PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\logs")
-#define FOLDER_RECEIVED_FILES          PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\received files")
-#define FOLDER_DOCS                    MIRANDA_PATHT _T("\\") _T("docs")
-#define FOLDER_CONFIG                  PLUGINS_PATHT _T("\\") _T("config")
-#define FOLDER_SCRIPTS                 MIRANDA_PATHT _T("\\") _T("scripts")
-#define FOLDER_UPDATES                 MIRANDA_PATHT _T("\\") _T("updates")
-
-#define FOLDER_CUSTOMIZE               MIRANDA_PATHT _T("\\") _T("customize")
-#define FOLDER_CUSTOMIZE_SOUNDS        FOLDER_CUSTOMIZE _T("\\sounds")
-#define FOLDER_CUSTOMIZE_ICONS         FOLDER_CUSTOMIZE _T("\\icons")
-#define FOLDER_CUSTOMIZE_SMILEYS       FOLDER_CUSTOMIZE _T("\\smileys")
-#define FOLDER_CUSTOMIZE_SKINS         FOLDER_CUSTOMIZE _T("\\skins")
-#define FOLDER_CUSTOMIZE_THEMES        FOLDER_CUSTOMIZE _T("\\themes")
-
-#define TO_WIDE(x)     L ## x
-
-#define FOLDERS_NAME_MAX_SIZE 64  //maximum name and section size
-
-#define FF_UNICODE 0x00000001
-
-#if defined (UNICODE)
-	#define FF_TCHAR	FF_UNICODE
-#else
-	#define FF_TCHAR	0
-#endif
-
-typedef struct{
-  int cbSize;                                  //size of struct
-  char szSection[FOLDERS_NAME_MAX_SIZE];       //section name, if it doesn't exist it will be created otherwise it will just add this entry to it
-  char szName[FOLDERS_NAME_MAX_SIZE];          //entry name - will be shown in options
-  union{
-    const char *szFormat;                      //default string format. Fallback string in case there's no entry in the database for this folder. This should be the initial value for the path, users will be able to change it later.
-    const wchar_t *szFormatW;                  //String is dup()'d so you can free it later. If you set the unicode string don't forget to set the flag accordingly.
-    const TCHAR *szFormatT;
-  };
-  DWORD flags;                                 //FF_* flags
-} FOLDERSDATA;
-
-/*Folders/Register/Path service
-  wParam - not used, must be 0
-  lParam - (LPARAM) (const FOLDERDATA *) - Data structure filled with
-  the necessary information.
-  Returns a handle to the registered path or 0 on error.
-  You need to use this to call the other services.
-*/
-#define MS_FOLDERS_REGISTER_PATH "Folders/Register/Path"
-
-/*Folders/Get/PathSize service
-  wParam - (WPARAM) (int) - handle to registered path
-  lParam - (LPARAM) (int *) - pointer to the variable that receives the size of the path
-  string (not including the null character). Depending on the flags set when creating the path
-  it will either call strlen() or wcslen() to get the length of the string.
-  Returns the size of the buffer.
-*/
-#define MS_FOLDERS_GET_SIZE "Folders/Get/PathSize"
-
-typedef struct{
-	int cbSize;
-	int nMaxPathSize;                     //maximum size of buffer. This represents the number of characters that can be copied to it (so for unicode strings you don't send the number of bytes but the length of the string).
-	union{
-		char *szPath;                     //pointer to the buffer that receives the path without the last "\\"
-		wchar_t *szPathW;                 //unicode version of the buffer.
-		TCHAR *szPathT;
-	};
-} FOLDERSGETDATA;
-
-/*Folders/Get/Path service
-  wParam - (WPARAM) (int) - handle to registered path
-  lParam - (LPARAM) (FOLDERSGETDATA *) pointer to a FOLDERSGETDATA that has all the relevant fields filled.
-  Should return 0 on success, or nonzero otherwise.
-*/
-#define MS_FOLDERS_GET_PATH "Folders/Get/Path"
-
-typedef struct{
-  int cbSize;
-  union{
-    char **szPath;                    //address of a string variable (char *) or (wchar_t*) where the path should be stored (the last \ won't be copied).
-    wchar_t **szPathW;                //unicode version of string.
-    TCHAR **szPathT;
-	};
-} FOLDERSGETALLOCDATA;
-
-/*Folders/GetRelativePath/Alloc service
-  wParam - (WPARAM) (int) - Handle to registered path
-  lParam - (LPARAM) (FOLDERSALLOCDATA *) data
-  This service is the same as MS_FOLDERS_GET_PATH with the difference that this service
-  allocates the needed space for the buffer. It uses miranda's memory functions for that and you need
-  to use those to free the resulting buffer.
-  Should return 0 on success, or nonzero otherwise. Currently it only returns 0.
-*/
-#define MS_FOLDERS_GET_PATH_ALLOC "Folders/Get/Path/Alloc"
-
-
-/*Folders/On/Path/Changed
-	wParam - (WPARAM) 0
-	lParam - (LPARAM) 0
-	Triggered when the folders change, you should reget the paths you registered.
-*/
-#define ME_FOLDERS_PATH_CHANGED "Folders/On/Path/Changed"
-
-#ifndef FOLDERS_NO_HELPER_FUNCTIONS
-
-#ifndef M_UTILS_H__
-#error The helper functions require that m_utils.h be included in the project. Please include that file if you want to use the helper functions. If you don''t want to use the functions just define FOLDERS_NO_HELPER_FUNCTIONS.
-#endif
-//#include "../../../include/newpluginapi.h"
-
-__inline static HANDLE FoldersRegisterCustomPath(const char *section, const char *name, const char *defaultPath)
-{
-	FOLDERSDATA fd = {0};
-	if (!ServiceExists(MS_FOLDERS_REGISTER_PATH)) return 0;
-	fd.cbSize = sizeof(FOLDERSDATA);
-	strncpy(fd.szSection, section, FOLDERS_NAME_MAX_SIZE);
-	fd.szSection[FOLDERS_NAME_MAX_SIZE - 1] = '\0';
-	strncpy(fd.szName, name, FOLDERS_NAME_MAX_SIZE);
-	fd.szName[FOLDERS_NAME_MAX_SIZE - 1] = '\0';
-	fd.szFormat = defaultPath;
-	return (HANDLE) CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM) &fd);
-}
-
-__inline static HANDLE FoldersRegisterCustomPathW(const char *section, const char *name, const wchar_t *defaultPathW)
-{
-	FOLDERSDATA fd = {0};
-	if (!ServiceExists(MS_FOLDERS_REGISTER_PATH)) return 0;
-	fd.cbSize = sizeof(FOLDERSDATA);
-	strncpy(fd.szSection, section, FOLDERS_NAME_MAX_SIZE);
-	fd.szSection[FOLDERS_NAME_MAX_SIZE - 1] = '\0'; //make sure it's NULL terminated
-	strncpy(fd.szName, name, FOLDERS_NAME_MAX_SIZE);
-	fd.szName[FOLDERS_NAME_MAX_SIZE - 1] = '\0'; //make sure it's NULL terminated
-	fd.szFormatW = defaultPathW;
-	fd.flags = FF_UNICODE;
-	return (HANDLE) CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM) &fd);
-}
-
-__inline static INT_PTR FoldersGetCustomPath(HANDLE hFolderEntry, char *path, const int size, const char *notFound)
-{
-	FOLDERSGETDATA fgd = {0};
-	INT_PTR res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = size;
-	fgd.szPath = path;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		char buffer[MAX_PATH];
-		CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) notFound, (LPARAM) buffer);
-		mir_snprintf(path, size, "%s", buffer);
-	}
-
-	return res;
-}
-
-__inline static INT_PTR FoldersGetCustomPathW(HANDLE hFolderEntry, wchar_t *pathW, const int count, const wchar_t *notFoundW)
-{
-	FOLDERSGETDATA fgd = {0};
-	INT_PTR res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = count;
-	fgd.szPathW = pathW;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		wcsncpy(pathW, notFoundW, count);
-		pathW[count - 1] = '\0';
-	}
-
-	return res;
-}
-
-__inline static INT_PTR FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, const int size, char *notFound, char *fileName)
-{
-	FOLDERSGETDATA fgd = {0};
-	INT_PTR res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = size;
-	fgd.szPath = path;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		char buffer[MAX_PATH];
-		CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) notFound, (LPARAM) buffer);
-		mir_snprintf(path, size, "%s", buffer);
-	}
-	if (strlen(path) > 0)
-	{
-		strcat(path, "\\");
-	}
-	else{
-		path[0] = '\0';
-	}
-
-	if (fileName)
-	{
-		strcat(path, fileName);
-	}
-
-	return res;
-}
-
-__inline static INT_PTR FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW, wchar_t *fileNameW)
-{
-	FOLDERSGETDATA fgd = {0};
-	INT_PTR res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = count;
-	fgd.szPathW = pathW;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		wcsncpy(pathW, notFoundW, count);
-		pathW[count - 1] = '\0';
-	}
-
-	if (wcslen(pathW) > 0)
-	{
-		wcscat(pathW, L"\\");
-	}
-	else{
-		pathW[0] = L'\0';
-	}
-
-	if (fileNameW)
-	{
-		wcscat(pathW, fileNameW);
-	}
-
-	return res;
-}
-
-# ifdef _UNICODE
-#  define FoldersGetCustomPathT FoldersGetCustomPathW
-#  define FoldersGetCustomPathExT FoldersGetCustomPathExW
-#  define FoldersRegisterCustomPathT FoldersRegisterCustomPathW
-#else
-#  define FoldersGetCustomPathT FoldersGetCustomPath
-#  define FoldersGetCustomPathExT FoldersGetCustomPath
-#  define FoldersRegisterCustomPathT FoldersRegisterCustomPath
-#endif
-
-#endif
-
-#endif //M_CUSTOM_FOLDERS_H
-\ No newline at end of file
diff --git a/plugins/folders/folders/sdk/m_updater.h b/plugins/folders/folders/sdk/m_updater.h
deleted file mode 100644
index 371b7437a0..0000000000
--- a/plugins/folders/folders/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
diff --git a/plugins/folders/folders/sdk/m_variables.h b/plugins/folders/folders/sdk/m_variables.h
deleted file mode 100644
index 5ac463fe4b..0000000000
--- a/plugins/folders/folders/sdk/m_variables.h
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
-    Variables Plugin for Miranda-IM (www.miranda-im.org)
-    Copyright 2003-2006 P. Boon
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __M_VARS
-#define __M_VARS
-
-#if !defined(_TCHAR_DEFINED)
-#include <tchar.h>
-#endif
-
-#ifndef VARIABLES_NOHELPER
-#include "../../../include/m_button.h"
-#endif
-
-#ifndef SIZEOF
-#include "../../../include/win2k.h"
-#endif
-
-// --------------------------------------------------------------------------
-// Memory management
-// --------------------------------------------------------------------------
-
-// Release memory that was allocated by the Variables plugin, e.g. returned
-// strings.
-
-#define MS_VARS_FREEMEMORY  "Vars/FreeMemory"
-
-// Parameters:
-// ------------------------
-// wParam = (WPARAM)(void *)pntr
-//   Pointer to memory that was allocated by the Variables plugin (e.g. a
-//   returned string) (can be NULL).
-// lParam = 0
-
-// Return Value:
-// ------------------------
-// Does return 0 on success, nozero otherwise.
-
-// Note: Do only use this service to free memory that was *explicitliy*
-// stated that it should be free with this service.
-
-
-
-#define MS_VARS_GET_MMI "Vars/GetMMI"
-
-// Get Variable's RTL/CRT function poiners to malloc(), free() and
-// realloc().
-
-// Parameters:
-// ------------------------
-// wParam = 0
-// lParam = (LPARAM) &MM_INTERFACE
-//   Pointer to a memory manager interface struct (see m_system.h).
-
-// Return Value:
-// ------------------------
-// Returns 0 on success, nozero otherwise
-
-// Note: Works exactly the same as the MS_SYSTEM_GET_MMI service
-// service of m_system.h.
-
-// Helper function for easy using:
-#ifndef VARIABLES_NOHELPER
-__inline static void variables_free(void *pntr) {
-
-  CallService(MS_VARS_FREEMEMORY, (WPARAM)pntr, 0);
-}
-#endif
-
-
-
-// --------------------------------------------------------------------------
-// String formatting
-// --------------------------------------------------------------------------
-
-#define MS_VARS_FORMATSTRING    "Vars/FormatString"
-
-// This service can be used to parse tokens in a text. The tokens will be
-// replaced by their resolved values. A token can either be a field or a
-// function. A field takes no arguments and is represented between
-// %-characters, e.g. "%winampsong%". A function can take any number of
-// arguments and is represented by a ? or !-character followed by the name
-// of the function and a list of arguments, e.g. "?add(1,2)".
-
-// Parameters:
-// ------------------------
-// wParam = (WPARAM)(FORMATINFO *)&fi
-//   See below.
-// lParam = 0
-
-// Return Value:
-// ------------------------
-// Returns a pointer to the resolved string or NULL in case of an error.
-
-// Note: The returned pointer needs to be freed using MS_VARS_FREEMEMORY.
-
-typedef struct {
-  int cbSize;  // Set this to sizeof(FORMATINFO).
-  int flags;  // Flags to use (see FIF_* below).
-  union {
-    char *szFormat;  // Text in which the tokens will be replaced (can't be
-                     // NULL).
-    WCHAR *wszFormat;
-    TCHAR *tszFormat;
-  };
-  union {
-    char *szExtraText;  // Extra, context-specific string (can be NULL) ->
-                        // The field "extratext" will be replaced by this
-                        // string. (Previously szSource).
-    WCHAR *wszExtraText;
-    TCHAR *tszExtraText;
-  };
-  HANDLE hContact;  // Handle to contact (can be NULL) -> The field "subject"
-                    // represents this contact.
-  int pCount;  // (output) Number of succesful parsed tokens, needs to be set
-               // to 0 before the call
-  int eCount;  // (output) Number of failed tokens, needs to be set to 0
-               // before the call
-  union {
-     char **szaTemporaryVars;	// Temporary variables valid only in the duration of the format call
-     TCHAR **tszaTemporaryVars;	// By pos: [i] is var name, [i + 1] is var value
-     WCHAR **wszaTemporaryVars;
-  };
-  int cbTemporaryVarsSize;		// Number of elements in szaTemporaryVars array
-
-} FORMATINFO;
-
-#define FORMATINFOV2_SIZE 28
-
-// Possible flags:
-#define FIF_UNICODE 0x01  // Expects and returns unicode text (WCHAR*).
-
-#if defined(UNICODE) || defined(_UNICODE)
-#define FIF_TCHAR   FIF_UNICODE // Strings in structure are TCHAR*.
-#else
-#define FIF_TCHAR   0
-#endif
-
-// Helper functions for easy using:
-
-// Helper #1: variables_parse
-// ------------------------
-// The returned string needs to be freed using MS_VARS_FREEMEMORY.
-
-#ifndef VARIABLES_NOHELPER
-__inline static TCHAR *variables_parse(TCHAR *tszFormat, TCHAR *tszExtraText, HANDLE hContact) {
-
-  FORMATINFO fi;
-
-  ZeroMemory(&fi, sizeof(fi));
-  fi.cbSize = sizeof(fi);
-  fi.tszFormat = tszFormat;
-  fi.tszExtraText = tszExtraText;
-  fi.hContact = hContact;
-  fi.flags = FIF_TCHAR;
-
-  return (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);
-}
-
-__inline static char *variables_parse_char(char *szFormat, char *szExtraText, HANDLE hContact)
-{
-  FORMATINFO fi = {0};
-
-  fi.cbSize = sizeof(fi);
-  fi.szFormat = szFormat;
-  fi.szExtraText = szExtraText;
-  fi.hContact = hContact;
-  fi.flags = 0;
-
-  return (char *) CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);
-}
-__inline static wchar_t *variables_parse_wchar(wchar_t *wszFormat, wchar_t *wszExtraText, HANDLE hContact)
-{
-  FORMATINFO fi = {0};
-
-  fi.cbSize = sizeof(fi);
-  fi.wszFormat = wszFormat;
-  fi.wszExtraText = wszExtraText;
-  fi.hContact = hContact;
-  fi.flags = FIF_UNICODE;
-
-  return (wchar_t *) CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);
-}
-
-#endif
-
-__inline static TCHAR *variables_parse_ex(TCHAR *tszFormat, TCHAR *tszExtraText, HANDLE hContact,
- 										  TCHAR **tszaTemporaryVars, int cbTemporaryVarsSize) {
-
-  FORMATINFO fi;
-
-  ZeroMemory(&fi, sizeof(fi));
-  fi.cbSize = sizeof(fi);
-  fi.tszFormat = tszFormat;
-  fi.tszExtraText = tszExtraText;
-  fi.hContact = hContact;
-  fi.flags = FIF_TCHAR;
-  fi.tszaTemporaryVars = tszaTemporaryVars;
-  fi.cbTemporaryVarsSize = cbTemporaryVarsSize;
-
-  return (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);
-}
-// Helper #2: variables_parsedup
-// ------------------------
-// Returns a _strdup()'ed copy of the unparsed string when Variables is not
-// installed, returns a strdup()'ed copy of the parsed result otherwise.
-
-// Note: The returned pointer needs to be released using your own free().
-
-#ifndef VARIABLES_NOHELPER
-__inline static TCHAR *variables_parsedup(TCHAR *tszFormat, TCHAR *tszExtraText, HANDLE hContact) {
-
-  if (ServiceExists(MS_VARS_FORMATSTRING)) {
-    FORMATINFO fi;
-    TCHAR *tszParsed, *tszResult;
-
-    ZeroMemory(&fi, sizeof(fi));
-    fi.cbSize = sizeof(fi);
-    fi.tszFormat = tszFormat;
-    fi.tszExtraText = tszExtraText;
-    fi.hContact = hContact;
-    fi.flags |= FIF_TCHAR;
-    tszParsed = (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);
-    if (tszParsed) {
-      tszResult = _tcsdup(tszParsed);
-      CallService(MS_VARS_FREEMEMORY, (WPARAM)tszParsed, 0);
-      return tszResult;
-    }
-  }
-  return tszFormat?_tcsdup(tszFormat):tszFormat;
-}
-
-__inline static TCHAR *variables_parsedup_ex(TCHAR *tszFormat, TCHAR *tszExtraText, HANDLE hContact,
-										  TCHAR **tszaTemporaryVars, int cbTemporaryVarsSize) {
-
-  if (ServiceExists(MS_VARS_FORMATSTRING)) {
-    FORMATINFO fi;
-    TCHAR *tszParsed, *tszResult;
-
-    ZeroMemory(&fi, sizeof(fi));
-    fi.cbSize = sizeof(fi);
-    fi.tszFormat = tszFormat;
-    fi.tszExtraText = tszExtraText;
-    fi.hContact = hContact;
-    fi.flags |= FIF_TCHAR;
-    fi.tszaTemporaryVars = tszaTemporaryVars;
-    fi.cbTemporaryVarsSize = cbTemporaryVarsSize;
-    tszParsed = (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);
-    if (tszParsed) {
-      tszResult = _tcsdup(tszParsed);
-      CallService(MS_VARS_FREEMEMORY, (WPARAM)tszParsed, 0);
-      return tszResult;
-    }
-  }
-  return tszFormat?_tcsdup(tszFormat):tszFormat;
-}
-#endif
-
-
-
-// --------------------------------------------------------------------------
-// Register tokens
-// --------------------------------------------------------------------------
-
-// Plugins can define tokens which will be parsed by the Variables plugin.
-
-#define MS_VARS_REGISTERTOKEN "Vars/RegisterToken"
-
-// With this service you can define your own token. The newly added tokens
-// using this service are taken into account on every call to
-// MS_VARS_FORMATSTRING.
-
-// Parameters:
-// ------------------------
-// wParam = 0
-// lParam = (LPARAM)(TOKENREGISTER*)&tr
-//   See below.
-
-// Return Value:
-// ------------------------
-// Returns 0 on success, nonzero otherwise. Existing tokens will be
-// 'overwritten' if registered twice.
-
-// Needed for szService and parseFunction:
-typedef struct {
-  int cbSize;  // You need to check if this is >=sizeof(ARGUMENTSINFO)
-               // (already filled in).
-  FORMATINFO *fi;  // Arguments passed to MS_VARS_FORMATSTRING.
-  unsigned int argc;  // Number of elements in the argv array.
-  union {
-    char **argv; // Argv[0] will be the token name, the following elements
-                 // are the additional arguments.
-    WCHAR **wargv;  // If the registered token was registered as a unicode
-                    // token, wargv should be accessed.
-    TCHAR **targv;
-  };
-  int flags;  // (output) You can set flags here (initially 0), use the
-              // AIF_* flags (see below).
-} ARGUMENTSINFO;
-
-// Available flags for ARGUMENTSINFO:
-// Set the flags of the ARGUMENTSINFO struct to any of these to influence
-// further parsing.
-#define AIF_DONTPARSE   0x01    // Don't parse the result of this function,
-                                // usually the result of a token is parsed
-                                // again, if the `?` is used as a function
-                                // character.
-#define AIF_FALSE       0x02    // The function returned logical false.
-
-// Definition of parse/cleanup functions:
-typedef char* (*VARPARSEFUNCA)(ARGUMENTSINFO *ai);
-typedef WCHAR* (*VARPARSEFUNCW)(ARGUMENTSINFO *ai);
-typedef void (*VARCLEANUPFUNCA)(char *szReturn);
-typedef void (*VARCLEANUPFUNCW)(WCHAR *wszReturn);
-
-#if defined(UNICODE) || defined(_UNICODE)
-#define VARPARSEFUNC    VARPARSEFUNCW
-#define VARCLEANUPFUNC  VARCLEANUPFUNCW
-#else
-#define VARPARSEFUNC    VARPARSEFUNCA
-#define VARCLEANUPFUNC  VARCLEANUPFUNCA
-#endif
-
-typedef struct {
-  int cbSize;  // Set this to sizeof(TOKENREGISTER).
-  union {
-    char *szTokenString;  // Name of the new token to be created, without %,
-                          // ?, ! etc. signs (can't be NULL).
-    WCHAR *wszTokenString;
-    TCHAR *tszTokenString;
-  };
-  union {
-    char *szService;  // Name of a service that is used to request the
-                      // token's value, if no service is used, a function
-                      // and TRF_PARSEFUNC must be used.
-    VARPARSEFUNCA parseFunction;  // See above, use with TRF_PARSEFUNC.
-    VARPARSEFUNCW parseFunctionW;
-    VARPARSEFUNC parseFunctionT;
-  };
-  union {
-    char *szCleanupService;  // Name of a service to be called when the
-                             // memory allocated in szService can be freed
-                             // (only used when flag VRF_CLEANUP is set,
-                             // else set this to NULL).
-    VARCLEANUPFUNCA cleanupFunction;  // See above, use with TRF_CLEANUPFUNC.
-    VARCLEANUPFUNCW cleanupFunctionW;
-    VARCLEANUPFUNC cleanupFunctionT;
-  };
-  char *szHelpText;  // Help info shown in help dialog (can be NULL). Has to
-                     // be in the following format:
-                     // "subject\targuments\tdescription"
-                     // (Example: "math\t(x, y ,...)\tx + y + ..."), or:
-                     // "subject\tdescription"
-                     // (Example: "miranda\tPath to the Miranda-IM
-                     // executable").
-                     // Note: subject and description are translated by
-                     // Variables.
-  int memType;  // Describes which method Varibale's plugin needs to use to
-                // free the returned buffer, use one of the VR_MEM_* values
-                // (see below). Only valid if the flag VRF_FREEMEM is set,
-                // use TR_MEM_OWNER otherwise).
-  int flags; // Flags to use (see below), one of TRF_* (see below).
-} TOKENREGISTER;
-
-// Available Memory Storage Types:
-// These values describe which method Variables Plugin will use to free the
-// buffer returned by the parse function or service
-#define TR_MEM_VARIABLES    1  // Memory is allocated using the functions
-                               // retrieved by MS_VARS_GET_MMI.
-#define TR_MEM_MIRANDA      2  // Memory is allocated using Miranda's Memory
-                               // Manager Interface (using the functions
-                               // returned by MS_SYSTEM_GET_MMI), if
-                               // VRF_FREEMEM is set, the memory will be
-                               // freed by Variables.
-#define TR_MEM_OWNER        3  // Memory is owned by the calling plugin
-                               // (can't be freed by Variables Plugin
-                               // automatically). This should be used if
-                               // VRF_FREEMEM is not specified in the flags.
-
-// Available Flags for TOKENREGISTER:
-#define TRF_FREEMEM     0x01  // Variables Plugin will automatically free the
-                              // pointer returned by the parse function or
-                              // service (which method it will us is
-                              // specified in memType -> see above).
-#define TRF_CLEANUP     0x02  // Call cleanup service or function, notifying
-                              // that the returned buffer can be freed.
-                              // Normally you should use either TRF_FREEMEM
-                              // or TRF_CLEANUP.
-#define TRF_PARSEFUNC   0x40  // parseFunction will be used instead of a
-                              // service.
-#define TRF_CLEANUPFUNC 0x80  // cleanupFunction will be used instead of a
-                              // service.
-#define TRF_USEFUNCS    TRF_PARSEFUNC|TRF_CLEANUPFUNC
-#define TRF_UNPARSEDARGS    0x04  // Provide the arguments for the parse
-                                  // function in their raw (unparsed) form.
-                                  // By default, arguments are parsed before
-                                  // presenting them to the parse function.
-#define TRF_FIELD       0x08  // The token can be used as a %field%.
-#define TRF_FUNCTION    0x10  // The token can be used as a ?function().
-                              // Normally you should use either TRF_FIELD or
-                              // TRF_FUNCTION.
-#define TRF_UNICODE     0x20  // Strings in structure are unicode (WCHAR*).
-                              // In this case, the strings pointing to the
-                              // arguments in the ARGUMENTS struct are
-                              // unicode also. The returned buffer is
-                              // expected to be unicode also, and the
-                              // unicode parse and cleanup functions are
-                              // called.
-
-#if defined(UNICODE) || defined(_UNICODE)
-#define TRF_TCHAR   TRF_UNICODE // Strings in structure are TCHAR*.
-#else
-#define TRF_TCHAR   0
-#endif
-
-// Deprecated:
-#define TRF_CALLSVC     TRF_CLEANUP
-
-// Callback Service (szService) / parseFunction:
-// ------------------------
-// Service that is called automatically by the Variable's Plugin to resolve a
-// registered variable.
-
-// Parameters:
-// wParam = 0
-// lParam = (LPARAM)(ARGUMENTSINFO *)&ai
-//   see above
-
-// Return Value:
-// Needs to return the pointer to a dynamically allocacated string or NULL.
-// A return value of NULL is regarded as an error (eCount will be increaded).
-// Flags in the ARGUMENTSINFO struct can be set (see above).
-
-// Callback Service (szCallbackService) / cleanupFunction:
-// ------------------------
-// This service is called when the memory that was allocated by the parse
-// function or service can be freed. Note: It will only be called when the
-// flag VRF_CLEANUP of TOKENREGISTER is set.
-
-// Parameters:
-// wParam = 0
-// lParam = (LPARAM)(char *)&res
-//   Result from parse function or service (pointer to a string).
-
-// Return Value:
-// Should return 0 on success.
-
-
-
-// --------------------------------------------------------------------------
-// Show the help dialog
-// --------------------------------------------------------------------------
-
-// Plugins can invoke Variables' help dialog which can be used for easy input
-// by users.
-
-#define MS_VARS_SHOWHELPEX    "Vars/ShowHelpEx"
-
-// This service can be used to open the help dialog of Variables. This dialog
-// provides easy input for the user and/or information about the available
-// tokens.
-
-// Parameters:
-// ------------------------
-// wParam = (WPARAM)(HWND)hwndParent
-// lParam = (LPARAM)(VARHELPINFO)&vhi
-//   See below.
-
-// Return Value:
-// ------------------------
-// Returns 0 on succes, any other value on error.
-
-typedef struct {
-  int cbSize;  // Set to sizeof(VARHELPINFO).
-  FORMATINFO *fi;  // Used for both input and output. If this pointer is not
-                   // NULL, the information is used as the initial values for
-                   // the dialog.
-  HWND hwndCtrl;  // Used for both input and output. The window text of this
-                  // window will be read and used as the initial input of the
-                  // input dialog. If the user presses the OK button the window
-                  // text of this window will be set to the text of the input
-                  // field and a EN_CHANGE message via WM_COMMAND is send to
-                  // this window. (Can be NULL).
-  char *szSubjectDesc;  // The description of the %subject% token will be set
-                        // to this text, if not NULL. This is translated
-                        // automatically.
-  char *szExtraTextDesc;  // The description of the %extratext% token will be
-                          // set to this text, if not NULL. This is translated
-                          // automatically.
-  int flags;  // Flags, see below.
-} VARHELPINFO;
-
-
-// Flags for VARHELPINFO
-#define VHF_TOKENS              0x00000001  // Create a dialog with the list of
-                                            // tokens
-#define VHF_INPUT               0x00000002  // Create a dialog with an input
-                                            // field (this contains the list of
-                                            // tokens as well).
-#define VHF_SUBJECT             0x00000004  // Create a dialog to select a
-                                            // contact for the %subject% token.
-#define VHF_EXTRATEXT           0x00000008  // Create a dialog to enter a text
-                                            // for the %extratext% token.
-#define VHF_HELP                0x00000010  // Create a dialog with help info.
-#define VHF_HIDESUBJECTTOKEN    0x00000020  // Hide the %subject% token in the
-                                            // list of tokens.
-#define VHF_HIDEEXTRATEXTTOKEN  0x00000040  // Hide the %extratext% token in
-                                            // the list of tokens.
-#define VHF_DONTFILLSTRUCT      0x00000080  // Don't fill the struct with the
-                                            // new information if OK is pressed
-#define VHF_FULLFILLSTRUCT      0x00000100  // Fill all members of the struct
-                                            // when OK is pressed. By default
-                                            // only szFormat is set. With this
-                                            // flag on, hContact and
-                                            // szExtraText are also set.
-#define VHF_SETLASTSUBJECT      0x00000200  // Set the last contact that was
-                                            // used in the %subject% dialog in
-                                            // case fi.hContact is NULL.
-
-// Predefined flags
-#define VHF_FULLDLG             VHF_INPUT|VHF_SUBJECT|VHF_EXTRATEXT|VHF_HELP
-#define VHF_SIMPLEDLG           VHF_INPUT|VHF_HELP
-#define VHF_NOINPUTDLG          VHF_TOKENS|VHF_HELP
-
-// If the service fills information in the struct for szFormat or szExtraText,
-// these members must be free'd using the free function of Variables.
-// If wParam==NULL, the dialog is created modeless. Only one dialog can be
-// shown at the time.
-// If both hwndCtrl and fi are NULL, the user input will not be retrievable.
-// In this case, the dialog is created with only a "Close" button, instead of
-// the "OK" and "Cancel" buttons.
-// In case of modeless dialog and fi != NULL, please make sure this pointer
-// stays valid while the dialog is open.
-
-// Helper function for easy use in standard case:
-#ifndef VARIABLES_NOHELPER
-__inline static int variables_showhelp(HWND hwndDlg, UINT uIDEdit, int flags, char *szSubjectDesc, char *szExtraDesc) {
-
-  VARHELPINFO vhi;
-
-  ZeroMemory(&vhi, sizeof(VARHELPINFO));
-  vhi.cbSize = sizeof(VARHELPINFO);
-  if (flags == 0) {
-    flags = VHF_SIMPLEDLG;
-  }
-  vhi.flags = flags;
-  vhi.hwndCtrl = GetDlgItem(hwndDlg, uIDEdit);
-  vhi.szSubjectDesc = szSubjectDesc;
-  vhi.szExtraTextDesc = szExtraDesc;
-
-  return CallService(MS_VARS_SHOWHELPEX, (WPARAM)hwndDlg, (LPARAM)&vhi);
-}
-#endif
-
-
-#define MS_VARS_GETSKINITEM	  "Vars/GetSkinItem"
-
-// This service can be used to get the icon you can use for example on the
-// Variables help button in your options screen. You can also get the tooltip
-// text to use with such a button. If icon library is available the icon will
-// be retrieved from icon library manager, otherwise the default is returned.
-
-// Parameters:
-// ------------------------
-// wParam = (WPARAM)0
-// lParam = (LPARAM)VSI_* (see below)
-
-// Return Value:
-// ------------------------
-// Depends on the information to retrieve (see below).
-
-// VSI_ constants
-#define VSI_HELPICON    1  // Can be used on the button accessing the
-                           // Variables help dialog. Returns (HICON)hIcon on
-                           // success or NULL on failure;
-#define VSI_HELPTIPTEXT 2  // Returns the tooltip text you can use for the
-                           // help button. Returns (char *)szTipText, a
-                           // static, translated buffer containing the help
-                           // text or NULL on error.
-
-// Helper to set the icon on a button accessing the help dialog.
-// Preferably a 16x14 MButtonClass control, but it works on a standard
-// button control as well. If no icon is availble (because of old version of
-// Variables) the string "V" is shown on the button. If Variables is not
-// available, the button will be hidden.
-#ifndef VARIABLES_NOHELPER
-__inline static int variables_skin_helpbutton(HWND hwndDlg, UINT uIDButton) {
-
-	int res;
-	HICON hIcon;
-	TCHAR tszClass[32];
-
-	hIcon = NULL;
-	res = 0;
-	if (ServiceExists(MS_VARS_GETSKINITEM))
-		hIcon = (HICON)CallService(MS_VARS_GETSKINITEM, 0, (LPARAM)VSI_HELPICON);
-
-	GetClassName(GetDlgItem(hwndDlg, uIDButton), tszClass, SIZEOF(tszClass));
-	if (!_tcscmp(tszClass, _T("Button"))) {
-		if (hIcon != NULL) {
-			SetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE)|BS_ICON);
-			SendMessage(GetDlgItem(hwndDlg, uIDButton), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon);
-		}
-		else {
-			SetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE)&~BS_ICON);
-			SetDlgItemText(hwndDlg, uIDButton, _T("V"));
-		}
-	}
-	else if (!_tcscmp(tszClass, MIRANDABUTTONCLASS)) {
-		if (hIcon != NULL) {
-			char *szTipInfo = NULL;
-
-			SendMessage(GetDlgItem(hwndDlg, uIDButton), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon);
-			if (ServiceExists(MS_VARS_GETSKINITEM))
-				szTipInfo = (char *)CallService(MS_VARS_GETSKINITEM, 0, (LPARAM)VSI_HELPTIPTEXT);
-
-			if (szTipInfo == NULL)
-				szTipInfo = Translate("Open String Formatting Help");
-
-			SendMessage(GetDlgItem(hwndDlg, uIDButton), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0);
-			SendDlgItemMessage(hwndDlg, uIDButton, BUTTONSETASFLATBTN, 0, 0);
-		}
-		else SetDlgItemText(hwndDlg, uIDButton, _T("V"));
-	}
-	else res = -1;
-
-	ShowWindow(GetDlgItem(hwndDlg, uIDButton), ServiceExists(MS_VARS_FORMATSTRING));
-
-	return res;
-}
-#endif
-
-
-#define MS_VARS_SHOWHELP    "Vars/ShowHelp"
-
-// WARNING: This service is obsolete, please use MS_VARS_SHOWHELPEX
-
-// Shows a help dialog where all possible tokens are displayed. The tokens
-// are explained on the dialog, too. The user can edit the initial string and
-// insert as many tokens as he likes.
-
-// Parameters:
-// ------------------------
-// wParam = (HWND)hwndEdit
-//   Handle to an edit control in which the modified string
-//   should be inserted (When the user clicks OK in the dialog the edited
-//   string will be set to hwndEdit) (can be NULL).
-// lParam = (char *)pszInitialString
-//   String that the user is provided with initially when
-//   the dialog gets opened (If this is NULL then the current text in the
-//   hwndEdit edit control will be used) (can be NULL).
-
-// Return Value:
-// ------------------------
-// Returns the handle to the help dialog (HWND).
-
-// Note: Only one help dialog can be opened at a time. When the dialog gets
-// closed an EN_CHANGE of the edit controll will be triggered because the
-// contents were updated. (Only when user selected OK).
-
-// Example:
-// CallService(MS_VARS_SHOWHELP, (WPARAM)hwndEdit, (LPARAM)"some initial text");
-
-// --------------------------------------------------------------------------
-// Retrieve a contact's HANDLE given a string
-// --------------------------------------------------------------------------
-
-#define MS_VARS_GETCONTACTFROMSTRING    "Vars/GetContactFromString"
-
-// Searching for contacts in the database. You can find contacts in db by
-// searching for their name, e.g first name.
-
-// Parameters:
-// ------------------------
-// wParam = (WPARAM)(CONTACTSINFO *)&ci
-//   See below.
-// lParam = 0
-
-// Return Value:
-// ------------------------
-// Returns number of contacts found matching the given string representation.
-// The hContacts array of CONTACTSINFO struct contains these hContacts after
-// the call.
-
-// Note: The hContacts array needs to be freed after use using
-// MS_VARS_FREEMEMORY.
-
-typedef struct {
-  int cbSize;  // Set this to sizeof(CONTACTSINFO).
-  union {
-    char *szContact;  // String to search for, e.g. last name (can't be NULL).
-    WCHAR *wszContact;
-    TCHAR *tszContact;
-  };
-  HANDLE *hContacts;  // (output) Array of contacts found.
-  DWORD flags;  // Contact details that will be matched with the search
-                // string (flags can be combined).
-} CONTACTSINFO;
-
-// Possible flags:
-#define CI_PROTOID      0x00000001  // The contact in the string is encoded
-                                    // in the format <PROTOID:UNIQUEID>, e.g.
-                                    // <ICQ:12345678>.
-#define CI_NICK         0x00000002  // Search nick names.
-#define CI_LISTNAME     0x00000004  // Search custom names shown in contact
-                                    // list.
-#define CI_FIRSTNAME    0x00000008  // Search contact's first names (contact
-                                    // details).
-#define CI_LASTNAME     0x00000010  // Search contact's last names (contact
-                                    // details).
-#define CI_EMAIL        0x00000020  // Search contact's email adresses
-                                    // (contact details).
-#define CI_UNIQUEID     0x00000040  // Search unique ids of the contac, e.g.
-                                    // UIN.
-#define CI_CNFINFO	    0x40000000  // Searches one of the CNF_* flags (set
-                                    // flags to CI_CNFINFO|CNF_X), only one
-                                    // CNF_ type possible
-#define CI_UNICODE      0x80000000  // tszContact is a unicode string
-                                    // (WCHAR*).
-
-#if defined(UNICODE) || defined(_UNICODE)
-#define CI_TCHAR    CI_UNICODE  // Strings in structure are TCHAR*.
-#else
-#define CI_TCHAR    0
-#endif
-
-
-
-#endif //__M_VARS