FTPFileYM:

adopted

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

17 files changed, 125 insertions, 376 deletions

diff --git a/plugins/FTPFileYM/common.h b/plugins/FTPFileYM/common.h
index d8d3ec56b4..c48982a66e 100644
--- a/plugins/FTPFileYM/common.h
+++ b/plugins/FTPFileYM/common.h
@@ -37,6 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #endif

 

 #define WIN32_LEAN_AND_MEAN	

+#define _CRT_SECURE_NO_WARNINGS

 #include <stdlib.h>

 #include <windows.h>

 #include <commdlg.h>

@@ -59,7 +60,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <iostream>

 using namespace std;

 

-#define MIRANDA_VER		0x0700

+#define MIRANDA_VER		0x0A00

 #include <newpluginapi.h>

 #include <m_button.h>

 #include <m_clist.h>

@@ -84,11 +85,23 @@ using namespace std;
 

 #include "mir_db.h"

 #include "libcurl.h"

+#include "utils.h"

+#include "dialog.h"

+#include "options.h"

+#include "serverlist.h"

+#include "deletetimer.h"

+#include "dbentry.h"

+#include "manager.h"

+#include "job_delete.h"

+#include "job_packer.h"

+#include "job_upload.h"

+#include "version.h"

+#include "job_generic.h"

 

 #include "resource.h"

-#include "docs/m_ftpfile.h"

-#include "sdk/m_updater.h"

-#include "sdk/m_msg_buttonsbar.h"

+#include "m_ftpfile.h"

+#include "m_updater.h"

+#include "m_msg_buttonsbar.h"

 

 #if defined _WIN64

 #define	MIID_FTPFILE { 0x6453cf27, 0xd111, 0x41f4, { 0xbe, 0xf5, 0xa8, 0xd8, 0x68, 0x8e, 0x44, 0xc6 } }

diff --git a/plugins/FTPFileYM/dbentry.cpp b/plugins/FTPFileYM/dbentry.cpp
index cb11af1944..bb43e120a8 100644
--- a/plugins/FTPFileYM/dbentry.cpp
+++ b/plugins/FTPFileYM/dbentry.cpp
@@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "dbentry.h"

-#include "options.h"

+#include "common.h"

 

 int DBEntry::entryID;

 Mutex DBEntry::mutexDB;

diff --git a/plugins/FTPFileYM/deletetimer.cpp b/plugins/FTPFileYM/deletetimer.cpp
index 480a0a9c3b..2534069a0d 100644
--- a/plugins/FTPFileYM/deletetimer.cpp
+++ b/plugins/FTPFileYM/deletetimer.cpp
@@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "deletetimer.h"

-#include "dbentry.h"

-#include "job_delete.h"

+#include "common.h"

 

 DeleteTimer *DeleteTimer::instance = NULL;

 DeleteTimer &deleteTimer = DeleteTimer::getInstance();

diff --git a/plugins/FTPFileYM/dialog.cpp b/plugins/FTPFileYM/dialog.cpp
index 9cef156189..9553a42dae 100644
--- a/plugins/FTPFileYM/dialog.cpp
+++ b/plugins/FTPFileYM/dialog.cpp
@@ -16,11 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "dialog.h"

-#include "dbentry.h"

-#include "options.h"

-#include "job_upload.h"

-#include "job_packer.h"

+#include "common.h"

 

 UploadDialog *UploadDialog::instance = NULL;

 UploadDialog *uDlg = NULL;

diff --git a/plugins/FTPFileYM/ftpfile.cpp b/plugins/FTPFileYM/ftpfile.cpp
index 18ef6e7acf..461c59b552 100644
--- a/plugins/FTPFileYM/ftpfile.cpp
+++ b/plugins/FTPFileYM/ftpfile.cpp
@@ -17,20 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "common.h"

-#include "deletetimer.h"

-#include "dbentry.h"

-#include "dialog.h"

-#include "libcurl.h"

-#include "manager.h"

-#include "options.h"

-#include "job_delete.h"

-#include "job_packer.h"

-#include "job_upload.h"

-#include "version.h"

 

 HINSTANCE hInst;

-PLUGINLINK *pluginLink;

-MM_INTERFACE mmi = {0};

+int hLangpack;

 

 HANDLE hModulesLoaded, hEventPreShutdown, hOptionsInit, hPrebuildContactMenu, hTabsrmmButtonPressed;

 HANDLE hServiceUpload, hServiceShowManager, hServiceContactMenu, hServiceMainMenu, hServiceShareFile;

@@ -53,11 +42,7 @@ int UploadFile(HANDLE hContact, int iFtpNum, UploadJob::EMode mode);
 static PLUGININFOEX pluginInfoEx = 

 {

 	sizeof(PLUGININFOEX), 

-#ifdef _WIN64

-	"FTP File YM x64",

-#else

 	"FTP File YM",

-#endif

 	__VERSION_DWORD,

 	"FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.",

 	"yaho",

@@ -78,9 +63,6 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvRe
 

 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

-	if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 8, 0, 0))

-		return NULL;

-

 	return &pluginInfoEx;

 }

 

@@ -132,7 +114,7 @@ static void InitIcolib()
 		mir_snprintf(szDesc, sizeof(szDesc), Translate("FTP Server %d"), i + 1);

 		mir_snprintf(szSettingName, sizeof(szSettingName), "%s_ftp%d", MODULE, i);

 		sid.iDefaultIndex = -(IDI_FTP0 + i);

-		hIconlibItem[i] = (HANDLE)CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);

+		hIconlibItem[i] = Skin_AddIcon(&sid);

 	}

 

 	for (int i = 0; i < SIZEOF(iconList); i++) 

@@ -140,7 +122,7 @@ static void InitIcolib()
 		mir_snprintf(szSettingName, sizeof(szSettingName), "%s_%s", MODULE, iconList[i].szName);

 		sid.pszDescription = Translate(iconList[i].szDescr);

 		sid.iDefaultIndex = -(iconList[i].defIconID);

-		hIconlibItem[i + ServerList::FTP_COUNT] = (HANDLE)CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);

+		hIconlibItem[i + ServerList::FTP_COUNT] = Skin_AddIcon(&sid);

 	}

 }

 

@@ -156,8 +138,8 @@ void InitMenuItems()
 	mi.position = 3000090001;

 	mi.ptszName = LPGENT("FTP File");

 

-	hMainMenu = (HGENMENU)CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi);

-	if (opt.bUseSubmenu) hMenu = (HGENMENU)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi);

+	hMainMenu = Menu_AddMainMenuItem(&mi);

+	if (opt.bUseSubmenu) hMenu = Menu_AddContactMenuItem(&mi);

 

 	memset(&mi, 0, sizeof(mi));

 	mi.cbSize = sizeof(mi);

@@ -182,41 +164,41 @@ void InitMenuItems()
 

 		mi.icolibItem = hIconlibItem[i];

 		mi.popupPosition = i + 1000;

-		hSubMenu[i] = (HGENMENU)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi);

+		hSubMenu[i] = Menu_AddContactMenuItem(&mi);

 

 		mi.flags |= CMIF_CHILDPOPUP | CMIF_ROOTHANDLE;

 		mi.hParentMenu = hMainMenu;

-		hMainSubMenu[i] = (HGENMENU)CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi);

+		hMainSubMenu[i] = Menu_AddMainMenuItem(&mi);

 		

 		mi2.hParentMenu = hSubMenu[i];

 		mi2.pszService = MS_FTPFILE_CONTACTMENU;

 		mi2.popupPosition = mi2.position = i + UploadJob::FTP_RAWFILE;

 		mi2.ptszName = TranslateT("Upload file(s)");		

-		CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi2);

+		Menu_AddContactMenuItem(&mi2);

 

 		mi2.pszService = MS_FTPFILE_MAINMENU;

 		mi2.hParentMenu = hMainSubMenu[i];

-		CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi2);

+		Menu_AddMainMenuItem(&mi2);

 

 		mi2.hParentMenu = hSubMenu[i];

 		mi2.pszService = MS_FTPFILE_CONTACTMENU;

 		mi2.popupPosition = i + UploadJob::FTP_ZIPFILE;

 		mi2.ptszName = TranslateT("Zip and upload file(s)");

-		CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi2);

+		Menu_AddContactMenuItem(&mi2);

 

 		mi2.pszService = MS_FTPFILE_MAINMENU;

 		mi2.hParentMenu = hMainSubMenu[i];

-		CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi2);

+		Menu_AddMainMenuItem(&mi2);

 

 		mi2.hParentMenu = hSubMenu[i];

 		mi2.pszService = MS_FTPFILE_CONTACTMENU;

 		mi2.popupPosition = i + UploadJob::FTP_ZIPFOLDER;

 		mi2.ptszName = TranslateT("Zip and upload folder");

-		CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi2);

+		Menu_AddContactMenuItem(&mi2);

 

 		mi2.pszService = MS_FTPFILE_MAINMENU;

 		mi2.hParentMenu = hMainSubMenu[i];

-		CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi2);

+		Menu_AddMainMenuItem(&mi2);

 	}

 

 	memset(&mi, 0, sizeof(mi));

@@ -227,7 +209,7 @@ void InitMenuItems()
 	mi.ptszName = LPGENT("FTP File manager");

 	mi.pszService = MS_FTPFILE_SHOWMANAGER;

 	mi.hParentMenu = hMainMenu;

-	CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi);

+	Menu_AddMainMenuItem(&mi);

 

 	PrebuildMainMenu();

 

@@ -242,32 +224,7 @@ void InitHotkeys()
 	hk.pszName = LPGEN("FTP_ShowManager");

 	hk.pszSection = MODULE;

 	hk.pszService = MS_FTPFILE_SHOWMANAGER;

-	CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&hk);

-}

-

-void InitUpdater()

-{

-#ifndef _WIN64

-	if (ServiceExists(MS_UPDATE_REGISTER)) 

-	{

-		Update update = {0};

-		char szVersion[16];

-		update.cbSize = sizeof(Update);

-		update.szComponentName = pluginInfoEx.shortName;

-		update.pbVersion = (BYTE *)CreateVersionString(pluginInfoEx.version, szVersion);

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

-

-#ifdef _UNICODE

-		update.szUpdateURL = "http://miranda-easy.net/addons/updater/ftpfile-ym.zip";

-#else

-		update.szUpdateURL = "http://miranda-easy.net/addons/updater/ftpfile-ym_ansi.zip";

-#endif

-		update.szVersionURL = "http://miranda-easy.net/addons/updater/ftpfile_version.txt";

-		update.pbVersionPrefix = (BYTE *)"FTP File YM ";

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

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

-	}

-#endif

+	Hotkey_Register(&hk);

 }

 

 void InitTabsrmmButton()

@@ -542,7 +499,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	InitIcolib();

 	InitMenuItems();

 	InitHotkeys();

-	InitUpdater();

 	InitTabsrmmButton();

 

 	SkinAddNewSoundEx(SOUND_UPCOMPLETE, Translate("FTP File"), Translate("File upload complete"));

@@ -573,10 +529,9 @@ int Shutdown(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)

+extern "C" int __declspec(dllexport) Load(void)

 {

-	pluginLink = link;

-

+	mir_getLP(&pluginInfoEx);

 	if (!curl.init())

 	{

 		Utils::msgBox(TranslateT("FTP File YM won't be loaded because libcurl.dll is missing or wrong version!"), MB_OK | MB_ICONERROR);

@@ -587,8 +542,6 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);

 #endif

 

-	mir_getMMI(&mmi);

-	

 	CoInitialize(NULL);

 

 	hModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

diff --git a/plugins/FTPFileYM/ftpfile_10.vcxproj b/plugins/FTPFileYM/ftpfile_10.vcxproj
index b50cdd5535..7414068c26 100644
--- a/plugins/FTPFileYM/ftpfile_10.vcxproj
+++ b/plugins/FTPFileYM/ftpfile_10.vcxproj
@@ -1,14 +1,6 @@
 <?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>

@@ -17,14 +9,6 @@
       <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>

@@ -35,349 +19,168 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>ftpfile</ProjectName>

+    <ProjectName>FTPFile</ProjectName>

     <ProjectGuid>{73482497-9F57-4819-A9AB-5D841A9F072D}</ProjectGuid>

-    <RootNamespace>ftpfile</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

   </PropertyGroup>

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

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

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

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

   </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 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|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|x64'" Label="PropertySheets">

+  <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|x64'" Label="PropertySheets">

+  <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)'=='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)'=='Debug|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.30319.1</_ProjectFileVersion>

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)64\</IntDir>

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)64\</IntDir>

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(Configuration)\</IntDir>

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(Configuration)64\</IntDir>

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(Configuration)\</IntDir>

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(Configuration)64\</IntDir>

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

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

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

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

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

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

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

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

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

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

+    <IgnoreImportLibrary>true</IgnoreImportLibrary>

   </PropertyGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;curl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

-      <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;curl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <TreatWarningAsError>false</TreatWarningAsError>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

-      <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

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

     <ClCompile>

       <Optimization>Full</Optimization>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\..\include;curl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

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

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

+      <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

-      <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

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

+      <AdditionalLibraryDirectories>lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <TargetMachine>MachineX86</TargetMachine>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

     </Link>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\..\include;curl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

-      <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

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

     <ClCompile>

       <Optimization>Full</Optimization>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\..\include;curl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

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

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

+      <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <TreatWarningAsError>false</TreatWarningAsError>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

-      <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\..\include;curl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <TreatWarningAsError>false</TreatWarningAsError>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

-      <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

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

+      <AdditionalLibraryDirectories>lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <TargetMachine>MachineX64</TargetMachine>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

     </Link>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;curl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>d:\Development\TEST\miranda-im-v0.9.3-unicode\plugins\ftpfile.dll</OutputFile>

-      <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>

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

+      <AdditionalLibraryDirectories>lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

     </Link>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;curl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

+      <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>d:\Development\YMP\4.6\Light\Miranda IM\plugins\ftpfile.dll</OutputFile>

-      <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>

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

+      <AdditionalLibraryDirectories>lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

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

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="dbentry.cpp" />

     <ClCompile Include="deletetimer.cpp" />

     <ClCompile Include="dialog.cpp" />

-    <ClCompile Include="ftpfile.cpp" />

+    <ClCompile Include="ftpfile.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

     <ClCompile Include="job_delete.cpp" />

     <ClCompile Include="job_generic.cpp" />

     <ClCompile Include="job_packer.cpp" />

@@ -388,8 +191,12 @@
     <ClCompile Include="options.cpp" />

     <ClCompile Include="serverlist.cpp" />

     <ClCompile Include="utils.cpp" />

-    <ClCompile Include="zip\ioapi.c" />

-    <ClCompile Include="zip\zip.c" />

+    <ClCompile Include="zip\ioapi.c">

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="zip\zip.c">

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="common.h" />

@@ -401,7 +208,6 @@
     <ClInclude Include="job_packer.h" />

     <ClInclude Include="job_upload.h" />

     <ClInclude Include="libcurl.h" />

-    <ClInclude Include="docs\m_ftpfile.h" />

     <ClInclude Include="manager.h" />

     <ClInclude Include="mir_db.h" />

     <ClInclude Include="options.h" />

diff --git a/plugins/FTPFileYM/ftpfile_10.vcxproj.filters b/plugins/FTPFileYM/ftpfile_10.vcxproj.filters
index 7f21cc8ad4..a97add9543 100644
--- a/plugins/FTPFileYM/ftpfile_10.vcxproj.filters
+++ b/plugins/FTPFileYM/ftpfile_10.vcxproj.filters
@@ -98,9 +98,6 @@
     <ClInclude Include="libcurl.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="docs\m_ftpfile.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="manager.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/plugins/FTPFileYM/job_generic.cpp b/plugins/FTPFileYM/job_generic.cpp
index 2a126b2190..ea199ea4db 100644
--- a/plugins/FTPFileYM/job_generic.cpp
+++ b/plugins/FTPFileYM/job_generic.cpp
@@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "job_generic.h"

-#include "dbentry.h"

-#include "utils.h"

+#include "common.h"

 

 extern UploadDialog *uDlg;

 extern ServerList &ftpList;

diff --git a/plugins/FTPFileYM/job_packer.cpp b/plugins/FTPFileYM/job_packer.cpp
index 4d5c9ce4d5..bcc8ab02dc 100644
--- a/plugins/FTPFileYM/job_packer.cpp
+++ b/plugins/FTPFileYM/job_packer.cpp
@@ -16,11 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "job_packer.h"

-#include "job_upload.h"

-#include "dialog.h"

-#include "options.h"

-#include "utils.h"

+#include "common.h"

 

 Event PackerJob::jobDone;

 Mutex PackerJob::mutexJobCount;

diff --git a/plugins/FTPFileYM/job_upload.cpp b/plugins/FTPFileYM/job_upload.cpp
index 36b4e628b5..bdc31fc61e 100644
--- a/plugins/FTPFileYM/job_upload.cpp
+++ b/plugins/FTPFileYM/job_upload.cpp
@@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "job_upload.h"

-#include "dbentry.h"

-#include "job_packer.h"

+#include "common.h"

 

 Event UploadJob::jobDone;

 Mutex UploadJob::mutexJobCount;

diff --git a/plugins/FTPFileYM/lib/zlib.lib b/plugins/FTPFileYM/lib/zlib.lib
new file mode 100644
index 0000000000..33f583fb5f
--- /dev/null
+++ b/plugins/FTPFileYM/lib/zlib.lib
diff --git a/plugins/FTPFileYM/lib/zlib64.lib b/plugins/FTPFileYM/lib/zlib64.lib
new file mode 100644
index 0000000000..3bb413f686
--- /dev/null
+++ b/plugins/FTPFileYM/lib/zlib64.lib
diff --git a/plugins/FTPFileYM/libcurl.cpp b/plugins/FTPFileYM/libcurl.cpp
index 59f95b6de6..2017556c3e 100644
--- a/plugins/FTPFileYM/libcurl.cpp
+++ b/plugins/FTPFileYM/libcurl.cpp
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "libcurl.h"

+#include "common.h"

 

 LibCurl *LibCurl::instance = NULL;

 LibCurl &curl = LibCurl::getInstance();

diff --git a/plugins/FTPFileYM/mir_db.cpp b/plugins/FTPFileYM/mir_db.cpp
index 1a466f7863..f5745d9f24 100644
--- a/plugins/FTPFileYM/mir_db.cpp
+++ b/plugins/FTPFileYM/mir_db.cpp
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "mir_db.h"

+#include "common.h"

 

 int DB::setByte(HANDLE hContact, char *szModule, char *szSetting, int iValue)

 {

@@ -194,5 +194,4 @@ char *DB::getProto(HANDLE hContact)
 {

 	char *szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

 	return ((INT_PTR)szProto != CALLSERVICE_NOTFOUND) ? szProto : NULL;

-}

-

+}
\ No newline at end of file
diff --git a/plugins/FTPFileYM/options.cpp b/plugins/FTPFileYM/options.cpp
index 65700e1744..b1dfdb0c62 100644
--- a/plugins/FTPFileYM/options.cpp
+++ b/plugins/FTPFileYM/options.cpp
@@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "deletetimer.h"

-#include "options.h"

+#include "common.h"

 

 Options *Options::instance = NULL;

 Options &opt = Options::getInstance();

@@ -299,12 +298,12 @@ int Options::InitOptions(WPARAM wParam, LPARAM lParam)
 	odp.ptszTab = LPGENT("Accounts");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FTPFILE);

 	odp.pfnDlgProc = Options::DlgProcOptsAccounts;

-	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp);

+	Options_AddPage(wParam, &odp);

 

 	odp.ptszTab = LPGENT("Advanced");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);

 	odp.pfnDlgProc = Options::DlgProcOptsAdvanced;

-	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp);

+	Options_AddPage(wParam, &odp);

 

 	return 0;

 }
\ No newline at end of file
diff --git a/plugins/FTPFileYM/serverlist.cpp b/plugins/FTPFileYM/serverlist.cpp
index 9d94c33b7c..1d1c67b145 100644
--- a/plugins/FTPFileYM/serverlist.cpp
+++ b/plugins/FTPFileYM/serverlist.cpp
@@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "serverlist.h"

-#include "options.h"

+#include "common.h"

 

 ServerList *ServerList::instance = NULL;

 ServerList &ftpList = ServerList::getInstance();

@@ -110,4 +109,4 @@ char *ServerList::FTP::getProtoString() const
 	}

 

 	return NULL;

-}

+}
\ No newline at end of file
diff --git a/plugins/FTPFileYM/utils.cpp b/plugins/FTPFileYM/utils.cpp
index 8b0acd14da..4757a4d183 100644
--- a/plugins/FTPFileYM/utils.cpp
+++ b/plugins/FTPFileYM/utils.cpp
@@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "utils.h"

-#include "dialog.h"

-#include "options.h"

+#include "common.h"

 

 extern Options &opt;

 extern UploadDialog *uDlg;