From 17f839d0a607c05ae390d6306d81ecea19c7ea45 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 26 May 2012 18:32:51 +0000 Subject: Svc_vi x64 compilation fix, Db_autobackups header returned git-svn-id: http://svn.miranda-ng.org/main/trunk@185 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Db_autobackups/headers.h | 53 +++++++++++++++++++++++++++++++++++ plugins/Quotes/Forex.sln | 31 +------------------- plugins/Svc_vi/CVersionInfo.cpp | 2 ++ plugins/Svc_vi/VersionInfo_10.vcxproj | 13 ++++++++- 4 files changed, 68 insertions(+), 31 deletions(-) create mode 100644 plugins/Db_autobackups/headers.h (limited to 'plugins') diff --git a/plugins/Db_autobackups/headers.h b/plugins/Db_autobackups/headers.h new file mode 100644 index 0000000000..5b79b896fd --- /dev/null +++ b/plugins/Db_autobackups/headers.h @@ -0,0 +1,53 @@ +#ifndef _HEADERS_H +#define _HEADERS_H + +#define _CRT_SECURE_NO_DEPRECATE +#define MIRANDA_VER 0x0900 +#define MIRANDA_CUSTOM_LP + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "m_folders.h" + +#include "options.h" +#include "resource.h" + +#define MS_AB_BACKUP "AB/Backup" +#define MS_AB_BACKUPTRGR "AB/Backuptrg" +#define MS_AB_SAVEAS "AB/SaveAs" + +#ifdef _UNICODE + #define SUB_DIR L"\\AutoBackups" + #define DIR L"%miranda_userdata%" +#else + #define SUB_DIR "\\AutoBackups" + #define DIR "%miranda_userdata%" +#endif + +void ShowPopup(TCHAR* text, TCHAR* header); +INT_PTR DBSaveAs(WPARAM wParam, LPARAM lParam); +INT_PTR ABService(WPARAM wParam, LPARAM lParam); +int CreateDirectoryTree(TCHAR *szDir); +int Backup(TCHAR* backup_filename); +int SetBackupTimer(void); +int OptionsInit(WPARAM wParam, LPARAM lParam); +int LoadOptions(void); +HWND CreateToolTip(HWND hwndParent, LPTSTR ptszText, LPTSTR ptszTitle); + +extern HINSTANCE hInst; +TCHAR* profilePath; + +#endif diff --git a/plugins/Quotes/Forex.sln b/plugins/Quotes/Forex.sln index 5258418884..5f0d619104 100644 --- a/plugins/Quotes/Forex.sln +++ b/plugins/Quotes/Forex.sln @@ -1,26 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Forex", "Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Quotes", "proto_Quotes\proto_Quotes_10.vcxproj", "{5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug Unicode|Win32 = Debug Unicode|Win32 - Debug Unicode|x64 = Debug Unicode|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Relese Unicode|Win32 = Relese Unicode|Win32 - Relese Unicode|x64 = Relese Unicode|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C619A811-8023-4441-B3D7-785388A09DF0}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 - {C619A811-8023-4441-B3D7-785388A09DF0}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 - {C619A811-8023-4441-B3D7-785388A09DF0}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 - {C619A811-8023-4441-B3D7-785388A09DF0}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.ActiveCfg = Debug|Win32 {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.Build.0 = Debug|Win32 {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.ActiveCfg = Debug|x64 @@ -29,27 +19,8 @@ Global {C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.Build.0 = Release|Win32 {C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.ActiveCfg = Release|x64 {C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.Build.0 = Release|x64 - {C619A811-8023-4441-B3D7-785388A09DF0}.Relese Unicode|Win32.ActiveCfg = Release Unicode|Win32 - {C619A811-8023-4441-B3D7-785388A09DF0}.Relese Unicode|Win32.Build.0 = Release Unicode|Win32 - {C619A811-8023-4441-B3D7-785388A09DF0}.Relese Unicode|x64.ActiveCfg = Release Unicode|x64 - {C619A811-8023-4441-B3D7-785388A09DF0}.Relese Unicode|x64.Build.0 = Release Unicode|x64 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Debug Unicode|Win32.ActiveCfg = Debug|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Debug Unicode|Win32.Build.0 = Debug|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Debug Unicode|x64.ActiveCfg = Debug|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Debug|Win32.ActiveCfg = Debug|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Debug|Win32.Build.0 = Debug|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Debug|x64.ActiveCfg = Debug|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Release|Win32.ActiveCfg = Release|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Release|Win32.Build.0 = Release|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Release|x64.ActiveCfg = Release|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Relese Unicode|Win32.ActiveCfg = Release|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Relese Unicode|Win32.Build.0 = Release|Win32 - {5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}.Relese Unicode|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - VisualSVNWorkingCopyRoot = .. - EndGlobalSection EndGlobal diff --git a/plugins/Svc_vi/CVersionInfo.cpp b/plugins/Svc_vi/CVersionInfo.cpp index 9a29a010a4..8d49f8a3dd 100644 --- a/plugins/Svc_vi/CVersionInfo.cpp +++ b/plugins/Svc_vi/CVersionInfo.cpp @@ -263,6 +263,8 @@ end: pop eax } szName[SIZEOF(szName) - 1] = '\0'; + #else + szName[0] = 0; #endif if ( !szName[0] ) diff --git a/plugins/Svc_vi/VersionInfo_10.vcxproj b/plugins/Svc_vi/VersionInfo_10.vcxproj index a7da9f1557..dcf9c17896 100644 --- a/plugins/Svc_vi/VersionInfo_10.vcxproj +++ b/plugins/Svc_vi/VersionInfo_10.vcxproj @@ -72,6 +72,8 @@ $(SolutionDir)$(Configuration)64/Plugins\ $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + true + true @@ -169,13 +171,16 @@ ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Disabled Use common.h + _WIN64;_DEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).lib + comctl32.lib;imagehlp.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + true @@ -187,9 +192,15 @@ false Use common.h + WIN64;NDEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).lib + true + true + comctl32.lib;imagehlp.lib;odbc32.lib;odbccp32.lib;delayimp.lib;%(AdditionalDependencies) + imagehlp.dll;%(DelayLoadDLLs) + true -- cgit v1.2.3