From adab25b574bb359bf11dbc175e5bf983f7b388cd Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 8 Jul 2012 16:05:43 +0000 Subject: FTPFileYM: adopted git-svn-id: http://svn.miranda-ng.org/main/trunk@851 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FTPFileYM/common.h | 21 +- plugins/FTPFileYM/dbentry.cpp | 3 +- plugins/FTPFileYM/deletetimer.cpp | 4 +- plugins/FTPFileYM/dialog.cpp | 6 +- plugins/FTPFileYM/ftpfile.cpp | 81 ++----- plugins/FTPFileYM/ftpfile_10.vcxproj | 346 ++++++--------------------- plugins/FTPFileYM/ftpfile_10.vcxproj.filters | 3 - plugins/FTPFileYM/job_generic.cpp | 4 +- plugins/FTPFileYM/job_packer.cpp | 6 +- plugins/FTPFileYM/job_upload.cpp | 4 +- plugins/FTPFileYM/lib/zlib.lib | Bin 0 -> 10532 bytes plugins/FTPFileYM/lib/zlib64.lib | Bin 0 -> 10278 bytes plugins/FTPFileYM/libcurl.cpp | 2 +- plugins/FTPFileYM/mir_db.cpp | 5 +- plugins/FTPFileYM/options.cpp | 7 +- plugins/FTPFileYM/serverlist.cpp | 5 +- plugins/FTPFileYM/utils.cpp | 4 +- 17 files changed, 125 insertions(+), 376 deletions(-) create mode 100644 plugins/FTPFileYM/lib/zlib.lib create mode 100644 plugins/FTPFileYM/lib/zlib64.lib (limited to 'plugins') 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 . #endif #define WIN32_LEAN_AND_MEAN +#define _CRT_SECURE_NO_WARNINGS #include #include #include @@ -59,7 +60,7 @@ along with this program. If not, see . #include using namespace std; -#define MIRANDA_VER 0x0700 +#define MIRANDA_VER 0x0A00 #include #include #include @@ -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 . */ -#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 . */ -#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 . */ -#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 . */ #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 @@  - - Debug Unicode - Win32 - - - Debug Unicode - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release Unicode - Win32 - - - Release Unicode - x64 - Release Win32 @@ -35,349 +19,168 @@ - ftpfile + FTPFile {73482497-9F57-4819-A9AB-5D841A9F072D} - ftpfile - Win32Proj - - DynamicLibrary - Unicode - - + DynamicLibrary Unicode - true - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - DynamicLibrary Unicode + true - + DynamicLibrary Unicode - true DynamicLibrary - MultiByte + Unicode true - - DynamicLibrary - MultiByte - - - - - - - - - - - + - + - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)64\ - $(Configuration)64\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Configuration)64\ - $(Configuration)64\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Configuration)64\ - $(Configuration)64\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)64\ - $(Configuration)64\ - true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true - - - Disabled - ..\..\include;curl;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - common.h - Level3 - EditAndContinue - - - wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - lib;%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - ..\..\include;curl;%(AdditionalIncludeDirectories) - _WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - common.h - Level3 - false - ProgramDatabase - - - wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - lib;%(AdditionalLibraryDirectories) - true - Windows - MachineX64 - - Full true - ..\..\include;curl;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded + curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - - + Use Level3 - ProgramDatabase + common.h + Size - wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - lib;%(AdditionalLibraryDirectories) - false - %(IgnoreSpecificDefaultLibraries) + comctl32.lib;zlib.lib;%(AdditionalDependencies) + lib;$(SolutionDir)\lib true Windows true true - true - MachineX86 + false + $(IntDir)$(TargetName).lib + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + - - X64 - - - Full - true - ..\..\include;curl;%(AdditionalIncludeDirectories) - _WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - lib;%(AdditionalLibraryDirectories) - false - %(IgnoreSpecificDefaultLibraries) - true - Windows - true - true - true - MachineX64 - - - Full true - ..\..\include;curl;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded + curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - - + Use Level3 - false - ProgramDatabase - - - wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - lib;%(AdditionalLibraryDirectories) - false - %(IgnoreSpecificDefaultLibraries) - true - Windows - true - true - true - MachineX86 - - - - - X64 - - - Full - true - ..\..\include;curl;%(AdditionalIncludeDirectories) - _WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - false - ProgramDatabase + common.h + Size - wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - lib;%(AdditionalLibraryDirectories) - false - %(IgnoreSpecificDefaultLibraries) + comctl32.lib;zlib64.lib;%(AdditionalDependencies) + lib;$(SolutionDir)\lib true Windows true true - true - MachineX64 + false + $(IntDir)$(TargetName).lib + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + - + Disabled - ..\..\include;curl;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug - - + MultiThreadedDebugDLL + Use common.h Level3 EditAndContinue - wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies) - d:\Development\TEST\miranda-im-v0.9.3-unicode\plugins\ftpfile.dll - lib;%(AdditionalLibraryDirectories) - %(DelayLoadDLLs) + comctl32.lib;zlib.lib;%(AdditionalDependencies) + lib;$(SolutionDir)\lib true Windows - MachineX86 + false + $(IntDir)$(TargetName).lib + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + - - - X64 - + Disabled - ..\..\include;curl;%(AdditionalIncludeDirectories) - _WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL - - + Use common.h Level3 - ProgramDatabase - wininet.lib;uxtheme.lib;comctl32.lib;zlib.lib;%(AdditionalDependencies) - d:\Development\YMP\4.6\Light\Miranda IM\plugins\ftpfile.dll - lib;%(AdditionalLibraryDirectories) - %(DelayLoadDLLs) + comctl32.lib;zlib64.lib;%(AdditionalDependencies) + lib;$(SolutionDir)\lib true Windows - MachineX64 + $(IntDir)$(TargetName).lib + false + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + - + + Create + @@ -388,8 +191,12 @@ - - + + NotUsing + + + NotUsing + @@ -401,7 +208,6 @@ - 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 @@ Header Files - - Header Files - Header Files 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 . */ -#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 . */ -#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 . */ -#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 Binary files /dev/null and b/plugins/FTPFileYM/lib/zlib.lib differ diff --git a/plugins/FTPFileYM/lib/zlib64.lib b/plugins/FTPFileYM/lib/zlib64.lib new file mode 100644 index 0000000000..3bb413f686 Binary files /dev/null and b/plugins/FTPFileYM/lib/zlib64.lib differ 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 . */ -#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 . */ -#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 . */ -#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 . */ -#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 . */ -#include "utils.h" -#include "dialog.h" -#include "options.h" +#include "common.h" extern Options &opt; extern UploadDialog *uDlg; -- cgit v1.2.3