summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin10/mir_full.sln32
-rw-r--r--plugins/AvatarHistory/AvatarDlg.cpp2
-rw-r--r--plugins/AvatarHistory/AvatarHistory.cpp44
-rw-r--r--plugins/AvatarHistory/AvatarHistory.h23
-rw-r--r--plugins/AvatarHistory/AvatarHistory.vcxproj480
-rw-r--r--plugins/AvatarHistory/AvatarHistory.vcxproj.filters3
-rw-r--r--plugins/AvatarHistory/icolib.cpp4
-rw-r--r--plugins/AvatarHistory/options.cpp4
-rw-r--r--plugins/CryptoPP/crypto/cryptlib_10.vcxproj6
-rw-r--r--plugins/ExternalAPI/m_hotkey.h67
-rw-r--r--plugins/ExternalAPI/m_hotkeysplus.h22
-rw-r--r--plugins/ExternalAPI/m_hotkeysservice.h213
-rw-r--r--plugins/ExternalAPI/m_mwclc.h44
-rw-r--r--plugins/ExternalAPI/m_shutdown.h196
-rw-r--r--plugins/ExternalAPI/m_snappingwindows.h25
-rw-r--r--plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj2
-rw-r--r--plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj2
17 files changed, 686 insertions, 483 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index fbf88590d5..72187ed962 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -230,9 +230,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_mw", "..\plugins\Clis
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\EkHtml.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotr", "..\plugins\MirOTR\libotr-3.2.0\libotr320.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libotr", "..\plugins\MirOTR\libotr-3.2.0\libotr320.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR\MirOTR.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"
EndProject
@@ -251,9 +251,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CryptoPP", "..\plugins\Cryp
{290C5ED4-71A7-4040-AD26-4820CF7A9E60} = {290C5ED4-71A7-4040-AD26-4820CF7A9E60}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\plugins\CryptoPP\crypto\cryptlib_10.vcxproj", "{290C5ED4-71A7-4040-AD26-4820CF7A9E60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cryptlib", "..\plugins\CryptoPP\crypto\cryptlib_10.vcxproj", "{290C5ED4-71A7-4040-AD26-4820CF7A9E60}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoShutdown", "..\plugins\AutoShutdown\shutdown.vcxproj", "{F8776664-EFE8-CDD6-ACFD-3136E7FE2724}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory.vcxproj", "{7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}"
EndProject
Global
+ GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+ DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
@@ -1256,11 +1263,24 @@ Global
{290C5ED4-71A7-4040-AD26-4820CF7A9E60}.Release|Win32.Build.0 = Release|Win32
{290C5ED4-71A7-4040-AD26-4820CF7A9E60}.Release|x64.ActiveCfg = Release|x64
{290C5ED4-71A7-4040-AD26-4820CF7A9E60}.Release|x64.Build.0 = Release|x64
+ {F8776664-EFE8-CDD6-ACFD-3136E7FE2724}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F8776664-EFE8-CDD6-ACFD-3136E7FE2724}.Debug|Win32.Build.0 = Debug|Win32
+ {F8776664-EFE8-CDD6-ACFD-3136E7FE2724}.Debug|x64.ActiveCfg = Debug|x64
+ {F8776664-EFE8-CDD6-ACFD-3136E7FE2724}.Debug|x64.Build.0 = Debug|x64
+ {F8776664-EFE8-CDD6-ACFD-3136E7FE2724}.Release|Win32.ActiveCfg = Release|Win32
+ {F8776664-EFE8-CDD6-ACFD-3136E7FE2724}.Release|Win32.Build.0 = Release|Win32
+ {F8776664-EFE8-CDD6-ACFD-3136E7FE2724}.Release|x64.ActiveCfg = Release|x64
+ {F8776664-EFE8-CDD6-ACFD-3136E7FE2724}.Release|x64.Build.0 = Release|x64
+ {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}.Debug|Win32.Build.0 = Debug|Win32
+ {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}.Debug|x64.ActiveCfg = Debug|x64
+ {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}.Debug|x64.Build.0 = Debug|x64
+ {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}.Release|Win32.ActiveCfg = Release|Win32
+ {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}.Release|Win32.Build.0 = Release|Win32
+ {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}.Release|x64.ActiveCfg = Release|x64
+ {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(DPCodeReviewSolutionGUID) = preSolution
- DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
- EndGlobalSection
EndGlobal
diff --git a/plugins/AvatarHistory/AvatarDlg.cpp b/plugins/AvatarHistory/AvatarDlg.cpp
index 4abe154016..0e829b4d9c 100644
--- a/plugins/AvatarHistory/AvatarDlg.cpp
+++ b/plugins/AvatarHistory/AvatarDlg.cpp
@@ -551,7 +551,7 @@ void InitMenuItem()
mi.position = 1000090010;
mi.hIcon = createDefaultOverlayedIcon(FALSE);
mi.pszService = MS_AVATARHISTORY_SHOWDIALOG;
- hMenu = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi);
+ hMenu = Menu_AddContactMenuItem(&mi);
DestroyIcon(mi.hIcon);
}
diff --git a/plugins/AvatarHistory/AvatarHistory.cpp b/plugins/AvatarHistory/AvatarHistory.cpp
index 8dca674f77..9b6eb6c774 100644
--- a/plugins/AvatarHistory/AvatarHistory.cpp
+++ b/plugins/AvatarHistory/AvatarHistory.cpp
@@ -36,8 +36,6 @@ char *metacontacts_proto = NULL;
TCHAR profilePath[MAX_PATH]; // database profile path (read at startup only)
TCHAR basedir[MAX_PATH];
-MM_INTERFACE mmi;
-UTF8_INTERFACE utfi;
int hLangpack = 0;
HANDLE hAvatarWindowsList = NULL;
@@ -60,32 +58,18 @@ static INT_PTR GetCachedAvatar(WPARAM wParam, LPARAM lParam);
TCHAR * GetCachedAvatar(char *proto, TCHAR *hash);
BOOL CreateShortcut(TCHAR *file, TCHAR *shortcut);
-
-
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
-#ifdef _WIN64
- "Avatar History (x64)",
-#elif _UNICODE
- "Avatar History (Unicode)",
-#else
- "Avatar History (Ansi)",
-#endif
+ "Avatar History",
PLUGIN_MAKE_VERSION(0,0,3,3),
- "This plugin keeps backups of all your contacts' avatar changes and/or shows popups",
+ "This plugin keeps backups of all your contacts' avatar changes and/or shows popups.",
"Matthew Wild (MattJ), Ricardo Pescuma Domenecci",
"mwild1@gmail.com",
"© 2006-2012 Matthew Wild, Ricardo Pescuma Domenecci",
"http://pescuma.org/miranda/avatarhist",
UNICODE_AWARE,
0, //doesn't replace anything built-in
-#ifdef _WIN64
- { 0xe04702a2, 0x379, 0x4c69, { 0xbf, 0x8a, 0x84, 0xd5, 0xd0, 0xc9, 0x19, 0xcc } } // {E04702A2-0379-4C69-BF8A-84D5D0C919CC}
-#elif _UNICODE
{ 0xdbe8c990, 0x7aa0, 0x458d, { 0xba, 0xb7, 0x33, 0xeb, 0x7, 0x23, 0x8e, 0x71 } } // {DBE8C990-7AA0-458d-BAB7-33EB07238E71}
-#else
- { 0x4079923c, 0x8aa1, 0x4a2e, { 0x95, 0x8b, 0x9d, 0xc, 0xd0, 0xe8, 0x2e, 0xb2 } } // {4079923C-8AA1-4a2e-958B-9D0CD0E82EB2}
-#endif
};
extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -96,16 +80,11 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese
extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
- if(mirandaVersion < PLUGIN_MAKE_VERSION(0,9,50,3))
- {
- MessageBox(NULL,_T("AvatarHistory requires Miranda IM 0.9.50 or later."),_T("Avatar History"),MB_OK);
- return NULL;
- }
- mirVer = mirandaVersion;
return &pluginInfo;
}
static const MUUID interfaces[] = { MIID_AVATAR_CHANGE_LOGGER, MIID_AVATAR_CHANGE_NOTIFIER, MIID_LAST };
+
extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
{
return interfaces;
@@ -159,20 +138,8 @@ static INT_PTR CALLBACK FirstRunDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM
return FALSE;
}
-extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
+extern "C" __declspec(dllexport) int Load(void)
{
- pluginLink=link;
-
- if(mir_getMMI(&mmi))
- {
- MessageBox(NULL,_T("Avatar History"),_T("Miranda Memory manager not initialized, plugin cannot load.\nPlease update Miranda IM to the latest version."),MB_OK | MB_TOPMOST);
- return 1;
- }
- if(mir_getUTFI(&utfi))
- {
- MessageBox(NULL,_T("Avatar History"),_T("Miranda UTF8 interface not initialized, plugin cannot load.\nPlease update Miranda IM to the latest version."),MB_OK | MB_TOPMOST);
- return 1;
- }
mir_getLP(&pluginInfo);
// Is first run?
@@ -319,7 +286,6 @@ BOOL ProtocolEnabled(const char *proto)
return (BOOL) DBGetContactSettingByte(NULL, MODULE_NAME, setting, TRUE);
}
-
BOOL ContactEnabled(HANDLE hContact, char *setting, int def)
{
if (hContact == NULL)
@@ -621,7 +587,7 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam)
return 0;
}
-extern "C" int __declspec(dllexport) Unload(void)
+extern "C" __declspec(dllexport) int Unload(void)
{
return 0;
}
diff --git a/plugins/AvatarHistory/AvatarHistory.h b/plugins/AvatarHistory/AvatarHistory.h
index 25ec454de2..e6d7c185d5 100644
--- a/plugins/AvatarHistory/AvatarHistory.h
+++ b/plugins/AvatarHistory/AvatarHistory.h
@@ -1,3 +1,5 @@
+#define _CRT_SECURE_NO_WARNINGS
+#define MIRANDA_VER 0x0A00
#include <tchar.h>
#include <windows.h>
#include <stdio.h>
@@ -8,8 +10,6 @@
#include <ShObjIdl.h>
#include <ShlGuid.h>
-
-#define MIRANDA_VER 0x0900
#include <newpluginapi.h>
#include <m_clist.h>
#include <m_skin.h>
@@ -21,27 +21,26 @@
#include <m_popup.h>
#include <m_options.h>
#include <m_utils.h>
-#include <m_folders.h>
#include <m_langpack.h>
-#include <m_metacontacts.h>
#include <m_history.h>
-#include <m_updater.h>
#include <m_imgsrvc.h>
#include <m_icolib.h>
+#include <m_folders.h>
+#include <m_metacontacts.h>
+#include <m_updater.h>
+#include "m_avatarhist.h"
+#include "m_historyevents.h"
+
+#include "resource.h"
+#include "../utils/mir_buffer.h"
+
// Globals
extern HINSTANCE hInst;
extern HANDLE hMenu;
extern DWORD mirVer;
extern HANDLE hAvatarWindowsList;
-#include "resource.h"
-#include "m_avatarhist.h"
-
-#include "../utils/mir_buffer.h"
-
-#include "../historyevents/m_historyevents.h"
-
#define MODULE_NAME "AvatarHistory"
#define AVH_DEF_POPUPFG 0
diff --git a/plugins/AvatarHistory/AvatarHistory.vcxproj b/plugins/AvatarHistory/AvatarHistory.vcxproj
index e5b0fb0b25..5cfac18ca4 100644
--- a/plugins/AvatarHistory/AvatarHistory.vcxproj
+++ b/plugins/AvatarHistory/AvatarHistory.vcxproj
@@ -17,532 +17,182 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Unicode Debug|Win32">
- <Configuration>Unicode Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Unicode Debug|x64">
- <Configuration>Unicode Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Unicode Release|Win32">
- <Configuration>Unicode Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Unicode Release|x64">
- <Configuration>Unicode Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <SccProjectName />
- <SccLocalPath />
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
- </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" />
- <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</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" />
- <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</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" />
- <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</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" />
- <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- <TargetName>avatarhistW</TargetName>
- <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
- <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- <TargetName>avatarhistW</TargetName>
- <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
- <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- <TargetName>avatarhistW</TargetName>
- <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
- <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- <TargetName>avatarhistW</TargetName>
- <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
- <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- <TargetName>avatarhistW</TargetName>
- <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
- <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- <TargetName>avatarhistW</TargetName>
- <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
- <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- <TargetName>avatarhistW</TargetName>
- <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
- <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- <TargetName>avatarhistW</TargetName>
- <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\</IntDir>
- <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <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)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|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>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+ <IgnoreImportLibrary>true</IgnoreImportLibrary>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DBGPOPUPS;WIN32;_DEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BrowseInformation>false</BrowseInformation>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeaderFile>AvatarHistory.h</PrecompiledHeaderFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
- <Midl>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <TypeLibraryName>.\Debug\AvatarHistory.tlb</TypeLibraryName>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <TargetEnvironment>Win32</TargetEnvironment>
- </Midl>
<ResourceCompile>
- <Culture>0x0809</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
<Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<LinkDLL>true</LinkDLL>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <ImportLibrary>.\Debug\avatarhist.lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+ <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <PostBuildEvent>
- <Command>if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\"
-copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\"</Command>
- </PostBuildEvent>
- <PostBuildEvent>
- <Message>Preparing Release</Message>
- </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DBGPOPUPS;_WIN64;_DEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BrowseInformation>false</BrowseInformation>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeaderFile>AvatarHistory.h</PrecompiledHeaderFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
- <Midl>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <TypeLibraryName>.\Debug\AvatarHistory.tlb</TypeLibraryName>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- </Midl>
<ResourceCompile>
- <Culture>0x0809</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
<Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<LinkDLL>true</LinkDLL>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <ImportLibrary>.\Debug\avatarhist.lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+ <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <PostBuildEvent>
- <Command>if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\"
-copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\"</Command>
- </PostBuildEvent>
- <PostBuildEvent>
- <Message>Preparing Release</Message>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
- <ClCompile>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <Optimization>Disabled</Optimization>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <WarningLevel>Level3</WarningLevel>
- <MinimalRebuild>true</MinimalRebuild>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DBGPOPUPS;WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BrowseInformation>false</BrowseInformation>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <PrecompiledHeaderFile>AvatarHistory.h</PrecompiledHeaderFile>
- </ClCompile>
- <Midl>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <TypeLibraryName>.\Unicode_Debug\AvatarHistory.tlb</TypeLibraryName>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <TargetEnvironment>Win32</TargetEnvironment>
- </Midl>
- <ResourceCompile>
- <Culture>0x0809</Culture>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
- <Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <LinkDLL>true</LinkDLL>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
- </Link>
- <PostBuildEvent>
- <Command>if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\"
-copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\"</Command>
- </PostBuildEvent>
- <PostBuildEvent>
- <Message>Preparing Release</Message>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
- <ClCompile>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <Optimization>Disabled</Optimization>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DBGPOPUPS;_WIN64;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BrowseInformation>false</BrowseInformation>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <PrecompiledHeaderFile>AvatarHistory.h</PrecompiledHeaderFile>
- </ClCompile>
- <Midl>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <TypeLibraryName>.\Unicode_Debug\AvatarHistory.tlb</TypeLibraryName>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- </Midl>
- <ResourceCompile>
- <Culture>0x0809</Culture>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
- <Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <LinkDLL>true</LinkDLL>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
- </Link>
- <PostBuildEvent>
- <Command>if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\"
-copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\"</Command>
- </PostBuildEvent>
- <PostBuildEvent>
- <Message>Preparing Release</Message>
- </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <Optimization>MinSpace</Optimization>
- <SuppressStartupBanner>true</SuppressStartupBanner>
+ <Optimization>Full</Optimization>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BrowseInformation>false</BrowseInformation>
<PrecompiledHeaderFile>AvatarHistory.h</PrecompiledHeaderFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
- <Midl>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <TypeLibraryName>.\Release\AvatarHistory.tlb</TypeLibraryName>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <TargetEnvironment>Win32</TargetEnvironment>
- </Midl>
<ResourceCompile>
- <Culture>0x0809</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
<Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<LinkDLL>true</LinkDLL>
- <SubSystem>Console</SubSystem>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <SubSystem>Windows</SubSystem>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <PostBuildEvent>
- <Command>if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\"
-copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\"</Command>
- </PostBuildEvent>
- <PostBuildEvent>
- <Message>Preparing Release</Message>
- </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <Optimization>MinSpace</Optimization>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BrowseInformation>false</BrowseInformation>
- <PrecompiledHeaderFile>AvatarHistory.h</PrecompiledHeaderFile>
- </ClCompile>
- <Midl>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <TypeLibraryName>.\Release\AvatarHistory.tlb</TypeLibraryName>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- </Midl>
- <ResourceCompile>
- <Culture>0x0809</Culture>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
- <Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <LinkDLL>true</LinkDLL>
- <SubSystem>Console</SubSystem>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ImportLibrary>.\Release\avatarhist.lib</ImportLibrary>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
- </Link>
- <PostBuildEvent>
- <Command>if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\"
-copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\"</Command>
- </PostBuildEvent>
- <PostBuildEvent>
- <Message>Preparing Release</Message>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
- <ClCompile>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <Optimization>MinSpace</Optimization>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BrowseInformation>false</BrowseInformation>
- <PrecompiledHeaderFile>AvatarHistory.h</PrecompiledHeaderFile>
- </ClCompile>
- <Midl>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <TypeLibraryName>.\Unicode_Release\AvatarHistory.tlb</TypeLibraryName>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <TargetEnvironment>Win32</TargetEnvironment>
- </Midl>
- <ResourceCompile>
- <Culture>0x0809</Culture>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
- <Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <LinkDLL>true</LinkDLL>
- <SubSystem>Console</SubSystem>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
- </Link>
- <PostBuildEvent>
- <Command>if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\"
-copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\"</Command>
- </PostBuildEvent>
- <PostBuildEvent>
- <Message>Preparing Release</Message>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
- <ClCompile>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <Optimization>MinSpace</Optimization>
- <SuppressStartupBanner>true</SuppressStartupBanner>
+ <Optimization>Full</Optimization>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BrowseInformation>false</BrowseInformation>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>AvatarHistory.h</PrecompiledHeaderFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
- <Midl>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <TypeLibraryName>.\Unicode_Release\AvatarHistory.tlb</TypeLibraryName>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- </Midl>
<ResourceCompile>
- <Culture>0x0809</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
<Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<LinkDLL>true</LinkDLL>
- <SubSystem>Console</SubSystem>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <SubSystem>Windows</SubSystem>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <PostBuildEvent>
- <Command>if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\"
-copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\"</Command>
- </PostBuildEvent>
- <PostBuildEvent>
- <Message>Preparing Release</Message>
- </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="AvatarDlg.cpp" />
- <ClCompile Include="AvatarHistory.cpp" />
+ <ClCompile Include="AvatarHistory.cpp">
+ <PrecompiledHeader>Create</PrecompiledHeader>
+ </ClCompile>
<ClCompile Include="icolib.cpp" />
- <ClCompile Include="..\utils\mir_options.cpp" />
+ <ClCompile Include="..\utils\mir_options.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ </ClCompile>
<ClCompile Include="options.cpp" />
<ClCompile Include="popup.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AvatarHistory.h" />
- <ClInclude Include="m_avatarhist.h" />
<ClInclude Include="..\utils\mir_buffer.h" />
<ClInclude Include="..\utils\mir_memory.h" />
<ClInclude Include="..\utils\mir_options.h" />
diff --git a/plugins/AvatarHistory/AvatarHistory.vcxproj.filters b/plugins/AvatarHistory/AvatarHistory.vcxproj.filters
index b405a21122..01f2a4ea0a 100644
--- a/plugins/AvatarHistory/AvatarHistory.vcxproj.filters
+++ b/plugins/AvatarHistory/AvatarHistory.vcxproj.filters
@@ -41,9 +41,6 @@
<ClInclude Include="AvatarHistory.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="m_avatarhist.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\utils\mir_buffer.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/plugins/AvatarHistory/icolib.cpp b/plugins/AvatarHistory/icolib.cpp
index b8e54b0807..a4105eef3c 100644
--- a/plugins/AvatarHistory/icolib.cpp
+++ b/plugins/AvatarHistory/icolib.cpp
@@ -70,7 +70,7 @@ void SetupIcoLib()
GetModuleFileName(hInst, path, sizeof(path));
- sid.cbSize = SKINICONDESC_SIZE;
+ sid.cbSize = sizeof(sid);
sid.ptszSection = LPGENT("Avatar History");
sid.ptszDefaultFile = path;
sid.flags = SIDF_ALL_TCHAR;
@@ -82,7 +82,7 @@ void SetupIcoLib()
sid.ptszDescription = iconList[i].szDescr;
sid.pszName = iconList[i].szName;
sid.iDefaultIndex = -iconList[i].defIconID;
- CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
+ Skin_AddIcon(&sid);
}
}
}
diff --git a/plugins/AvatarHistory/options.cpp b/plugins/AvatarHistory/options.cpp
index 2d1a75116a..bd4da44d7f 100644
--- a/plugins/AvatarHistory/options.cpp
+++ b/plugins/AvatarHistory/options.cpp
@@ -79,7 +79,7 @@ int OptInit(WPARAM wParam,LPARAM lParam)
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_EXPERTONLY;
- CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
+ Options_AddPage(wParam, &odp);
if(ServiceExists(MS_POPUP_ADDPOPUPT))
{
@@ -96,7 +96,7 @@ int OptInit(WPARAM wParam,LPARAM lParam)
odp.nExpertOnlyControls = MAX_REGS(popupsExpertControls);
odp.nIDBottomSimpleControl = IDC_POPUPS;
odp.nIDRightSimpleControl = IDC_POPUPS;
- CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
+ Options_AddPage(wParam, &odp);
}
return 0;
diff --git a/plugins/CryptoPP/crypto/cryptlib_10.vcxproj b/plugins/CryptoPP/crypto/cryptlib_10.vcxproj
index 27914e484c..d45fe25291 100644
--- a/plugins/CryptoPP/crypto/cryptlib_10.vcxproj
+++ b/plugins/CryptoPP/crypto/cryptlib_10.vcxproj
@@ -19,23 +19,27 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>cryptlib</ProjectName>
+ <ProjectName>Cryptlib</ProjectName>
<ProjectGuid>{290C5ED4-71A7-4040-AD26-4820CF7A9E60}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/plugins/ExternalAPI/m_hotkey.h b/plugins/ExternalAPI/m_hotkey.h
new file mode 100644
index 0000000000..1af34b4342
--- /dev/null
+++ b/plugins/ExternalAPI/m_hotkey.h
@@ -0,0 +1,67 @@
+#ifndef H_HOTKEY_H
+#define H_HOTKEY_H
+
+//hotkey struct
+ typedef struct{
+ BOOL isShift; //determines if hotkey uses shift
+ BOOL isCtrl; //determines if hotkey uses control
+ BOOL isAlt; //determines if hotkey uses alt
+ UINT vkCode;
+
+ }KEYHASH,*PKEYHASH;
+
+ //struct passed to HKS_GET_NAME_BYHASH the result of calling it will be stored in char* name
+ typedef struct{
+ char* name; //pointer to buffer where the result will be stored
+ size_t bufferlen; //size of the buffer
+ }GETNAMEWPARAM;
+
+ /*this below are registred miranda services and should be called by CallService */
+
+ /* this funtion registers new hot key function, function must be registred as miranda service
+ lParam = (KEYHASH*) hotKeyDefinition
+ wParam = (const char*)ServiceName
+ returns true on success and false if fails */
+ #define HKS_REGISTERFUNCTION "mhotkeyregister"
+ /* unregisters function as hot key function
+ lParam = (KEYHASH*) hotKeyDefinition /search function by it's hotkey combination
+ wParam = NULL
+ and if
+ lParam = NULL
+ wParam = (const char*) functionName //search function by it's name
+ returns if function was propertly deleted returns true else returns false */
+ #define HKS_UNREGISTERFUNCTION "mhotkeyunregister"
+
+ /*
+ Updates hotkey to the specific function (if another function use this hot key it'll be assigned to this
+ and that function will be unregistred as hotkey function)
+ wParam = (const char*) FunctoinName // name of the function you want to update
+ lParam = (KEYHASH*)newHotKey
+
+ returns: true on success and false on failure
+ */
+ #define HKS_UPDATEHOTKEY "mhotkeyupdate"
+
+ /* gets function hash by function name, the result is stored in lParam(KEYHASH*)
+ wParam = (const char*)functionName
+ lParam = (KEYHASH*) - here the result is stored
+ */
+ #define HKS_GET_HASH_BYNAME "mhgethashbyname"
+ /* gets functoin name by it's hash the GETNAMEPARAM struct must be filled before calling this
+ it has to be passed as wParam, and there will be result stored.
+ wParam=(GETNAMEPARAM*)Result
+ lParam=(KEYHASH*)keyHash
+ */
+ #define HKS_GET_NAME_BYHASH "mhgetnamebyhash"
+ /* converts keyHash to windows hotkey
+ wParam=(DWORD*)result
+ lParam=(KEYHASH*)hotKey
+ */
+ #define HKS_HASH_TO_HOTKEY "mhhashtohotkey"
+ /*converts windows hotkey to keyHash
+ wParam=(DWORD*)hotkey
+ lParam=(KEYHASH*)result
+ */
+ #define MKS_HOTKEY_TO_HASH "mhhotkeytohash"
+
+#endif \ No newline at end of file
diff --git a/plugins/ExternalAPI/m_hotkeysplus.h b/plugins/ExternalAPI/m_hotkeysplus.h
new file mode 100644
index 0000000000..3da357f109
--- /dev/null
+++ b/plugins/ExternalAPI/m_hotkeysplus.h
@@ -0,0 +1,22 @@
+#define MS_HOTKEYSPLUS_ADDKEY "HotkeysPlus/Add"
+
+/*
+This service registers hotkey for
+WPARAM - service to perform
+LPARAM - decription of the service
+Returned values:
+ 0 - success,
+ 1 - hotkey for this function is already existing,
+ 2 - the service, that you try to register the hotkey for, not exists
+*/
+
+#define MS_HOTKEYSPLUS_EXISTKEY "HotkeysPlus/Exist"
+/*
+This service checks whether hotkey for service (WPARAM) exists
+LPARAM - not used
+Returned values:
+ 0 - failed,
+ 1 - the hotkey for this function exists,
+ 2 - the service not exists
+*/
+
diff --git a/plugins/ExternalAPI/m_hotkeysservice.h b/plugins/ExternalAPI/m_hotkeysservice.h
new file mode 100644
index 0000000000..6e777b1876
--- /dev/null
+++ b/plugins/ExternalAPI/m_hotkeysservice.h
@@ -0,0 +1,213 @@
+#ifndef __M_HOTKEYSSERVICE__
+# define __M_HOTKEYSSERVICE__
+
+
+#define HKS_SERVICE_NAME "HotkeysService"
+
+// Modifiers for hotkeys
+//#define MOD_ALT 0x0001
+//#define MOD_CONTROL 0x0002
+//#define MOD_SHIFT 0x0004
+//#define MOD_WIN 0x0008
+#define MOD_GLOBAL 0x0010
+
+// FLAGS
+// inherit modifiers from group (specified modifiers ignored)
+#define HKS_ACTION_SHAREMODIFIERS 1
+// register item, but disable
+#define HKS_INITIALLY_DISABLED 2
+
+#if defined(_MSC_VER)
+#pragma warning(push) /* save warning settings */
+#pragma warning(disable:4201) /* nonstandard extension used : nameless struct/union */
+#endif
+
+// Structure of hotkey
+typedef union
+{
+ struct
+ {
+ WORD key;
+ WORD modifiers;
+ };
+ DWORD hotkey;
+
+} THKSHotkey, *PHKSHotkey;
+
+#if defined(_MSC_VER)
+#pragma warning(pop) /* restore warning settings */
+#endif
+
+// ITEM TYPES
+#define HKS_ITEM_MODULE 1
+#define HKS_ITEM_GROUP 2
+#define HKS_ITEM_ACTION 3
+#define HKS_ITEM_MACRO 4
+
+
+// Structure passed to RegisterItem service.
+// Used only for registration pursposes, so free it after call.
+// name, owner and itemType field is mandatory.
+// owner is item ID or must be 0 for 1st level items (module, single action or macro)
+// itemType can be one of ITEM TYPES constants.
+// flags can be combined from FLAGS constants.
+// Group can contain other groups and items and optionally
+// set group modifiers. Only item can be tree leaf.
+// If creating group, hotkey.modifiers will be used
+// as group modifiers (if nonzero)
+// If creating action, hotkey is optional. If hotkey.key is filled, then
+// hotkey will be assigned to item (if unused).
+// If creating macro, hotkey is mandatory.
+
+typedef struct
+{
+ int owner;
+ char *name;
+ int itemType;
+ THKSHotkey hotkey;
+ int flags;
+
+} THKSItem, *PHKSItem;
+
+
+// Register item
+// wParam: item data in PKHSItem format
+// lParam: 0
+// Returns HANDLE called "ID" in loWord.
+// For actions and macros, hiWord returns state: 0 if ok, other if passed hotkey
+// can't be registered (for example already used)
+// In other cases hiWord is useless
+#define MS_HKS_REGISTER_ITEM HKS_SERVICE_NAME "/RegisterItem"
+
+// Unregister item
+// If item is Group, then all subItems will be unregistered.
+// wParam: item ID
+// lParam: 0
+// Returns: 0 on success, other on fail
+#define MS_HKS_UNREGISTER_ITEM HKS_SERVICE_NAME "/UnregisterItem"
+
+// Assign hotkey to item. If item is group, then only
+// modifiers are taken as group modifiers. Do not call on modules.
+// Hotkey consists of modifiers in hiWord and key in loWord.
+// wParam: item ID
+// lParam: hotkey as PHKS_Hotkey to register
+// Returns:
+// on success: hotkey
+// on error: 0
+#define MS_HKS_ASSIGN_HOTKEY HKS_SERVICE_NAME "/AssignHotkey"
+
+// Get hotkey assigned to item. Don't apply to modules.
+// wParam: item ID
+// lParam: 0
+// Returns: hotkey assigned, 0 otherwise.
+#define MS_HKS_GET_HOTKEY HKS_SERVICE_NAME "/GetAssignedHotkey"
+
+// Unassign hotkey from item. Only valid on action and macro items.
+// wParam: item ID
+// lParam: 0
+// Returns: 0 on success, other on fail
+#define MS_HKS_UNASSIGN_HOTKEY HKS_SERVICE_NAME "/UnassignHotkey"
+
+// Enable/Disable item.
+// If item is group or module, then all subItems will be affected.
+// wParam: item ID
+// lParam: 1 to enable, anything else to disable
+// Returns: 0 on success, other on fail
+#define MS_HKS_ENABLE_ITEM HKS_SERVICE_NAME "/EnableItem"
+
+// Hotkey to text
+// wParam: hotkey to textify
+// lParam: address to place string, space must be allocated
+// Returns: 0
+#define MS_HKS_TO_TEXT HKS_SERVICE_NAME "/HotkeyToText"
+
+// Get hotkey from text
+// wParam: text to convert to hotkey
+// lParam: 0
+// Returns: hotkey
+#define MS_HKS_FROM_TEXT HKS_SERVICE_NAME "/HotkeyFromText"
+
+
+typedef struct
+{
+ int itemId;
+ int moduleId;
+ char *name;
+ int itemType;
+ THKSHotkey hotkey;
+
+} THKSEvent, *PHKSEvent;
+
+// Event when hotkey is pressed
+// wParam: PHKSEvent
+// lParam: 0
+#define ME_HKS_KEY_PRESSED HKS_SERVICE_NAME "/HotkeyPressed"
+
+
+
+
+// Util functions ////////////////////////////////////////////////////////////////////////
+
+
+__inline static int HKS_RegisterModule(char *name)
+{
+ THKSItem item = {0};
+
+ if (!ServiceExists(MS_HKS_REGISTER_ITEM))
+ return -1;
+
+ item.name = name;
+ item.itemType = HKS_ITEM_MODULE;
+
+ return LOWORD(CallService(MS_HKS_REGISTER_ITEM, (WPARAM) &item, 0));
+}
+
+
+__inline static int HKS_RegisterAction(int owner, char *name, int modifiers, char key, int flags)
+{
+ THKSItem item = {0};
+
+ if (!ServiceExists(MS_HKS_REGISTER_ITEM))
+ return -1;
+
+ item.owner = owner;
+ item.name = name;
+ item.itemType = HKS_ITEM_ACTION;
+ item.flags = flags;
+
+ if(key != 0)
+ {
+ item.hotkey.key = (WORD) key;
+ item.hotkey.modifiers = (WORD)modifiers;
+ }
+
+ return LOWORD(CallService(MS_HKS_REGISTER_ITEM, (WPARAM) &item, 0));
+}
+
+
+__inline static int HKS_RegisterGroup(int owner, char *name, int modifiers, int flags)
+{
+ THKSItem item = {0};
+
+ if (!ServiceExists(MS_HKS_REGISTER_ITEM))
+ return -1;
+
+ item.owner = owner;
+ item.name = name;
+ item.itemType = HKS_ITEM_GROUP;
+ item.flags = flags;
+ item.hotkey.modifiers = (WORD)modifiers;
+
+ return LOWORD(CallService(MS_HKS_REGISTER_ITEM, (WPARAM) &item, 0));
+}
+
+__inline static int HKS_Unregister(int id)
+{
+ if (!ServiceExists(MS_HKS_UNREGISTER_ITEM))
+ return -1;
+
+ return CallService(MS_HKS_UNREGISTER_ITEM, (WPARAM) id, 0);
+}
+
+
+#endif
diff --git a/plugins/ExternalAPI/m_mwclc.h b/plugins/ExternalAPI/m_mwclc.h
new file mode 100644
index 0000000000..e72ce29904
--- /dev/null
+++ b/plugins/ExternalAPI/m_mwclc.h
@@ -0,0 +1,44 @@
+/*
+
+Miranda IM: the free IM client for Microsoft* Windows*
+
+Copyright 2000-2003 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+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_MWCLC_
+#define _M_MWCLC_
+
+//add a new hotkey so it has a default and can be changed in the options dialog
+//wParam=0
+//lParam=(LPARAM)(SKINHOTKEYDESC*)ssd;
+//returns 0 on success, nonzero otherwise
+typedef struct {
+ int cbSize;
+ const char *pszName; //name to refer to sound when playing and in db
+ const char *pszDescription; //description for options dialog
+// const char *pszDefaultFile; //default sound file to use
+ const char *pszSection; //section name used to group sounds (NULL is acceptable)
+ const char *pszService; //Service to call when HotKey Pressed
+
+ int DefHotKey; //default hot key for action
+} SKINHOTKEYDESCEX;
+
+#define MS_SKIN_ADDHOTKEY "Skin/HotKeys/AddNew"
+#define MS_SKIN_PLAYHOTKEY "Skin/HotKeys/Run"
+
+#endif \ No newline at end of file
diff --git a/plugins/ExternalAPI/m_shutdown.h b/plugins/ExternalAPI/m_shutdown.h
new file mode 100644
index 0000000000..87e25e8851
--- /dev/null
+++ b/plugins/ExternalAPI/m_shutdown.h
@@ -0,0 +1,196 @@
+/*
+
+'AutoShutdown'-Plugin for
+Miranda IM: the free IM client for Microsoft* Windows*
+
+Copyright (C) 2004-2007 H. Herkenrath
+
+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 (Shutdown-License.txt); if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef M_SHUTDOWN_H__
+#define M_SHUTDOWN_H__
+
+#if defined (_MSC_VER) && (_MSC_VER >= 1020)
+ #pragma once
+#endif
+
+/*
+ AutoShutdown v1.4.0.2
+*/
+
+/* interface id */
+#if !defined(MIID_SHUTDOWN)
+ #define MIID_SHUTDOWN {0x142982a8,0x88cf,0x4c65,{0x87,0x21,0x6d,0xe2,0x7d,0x5c,0xe7,0xb5}}
+#endif
+
+/******************************************************************/
+/************************* SERVICES *******************************/
+/******************************************************************/
+
+/* Show settings dialog v1.3.0.0+
+Shows the dialog by which the shutdown watcher can be started.
+If the dialog is already opened this brings it to foreground.
+ wParam=lParam=0
+Returns 0 on success, nonzero otherwise.
+*/
+#define MS_AUTOSHUTDOWN_SHOWSETTINGSDIALOG "AutoShutdown/ShowSettingsDialog"
+
+/* Initiate shutdown process v1.3.0.0+
+Initiates the shutdown process for a given shutdown type.
+If another shutdown process is already pending it will return error.
+Associated events: ME_AUTOSHUTDOWN_OKTOSHUTDOWN, ME_AUTOSHUTDOWN_SHUTDOWN
+ wParam=shutdownType
+ lParam=(LPARAM)(BOOL)fShowConfirmDlg (whether to show the warning dialog or not)
+Returns 0 on success, nonzero otherwise.
+*/
+#define MS_AUTOSHUTDOWN_SHUTDOWN "AutoShutdown/Shutdown"
+
+/* shutdown types */
+#define SDSDT_CLOSEMIRANDA 1 // close miranda process
+#define SDSDT_SETMIRANDAOFFLINE 2 // set all protocols to offline
+#define SDSDT_LOGOFF 3 // logoff from Windows
+#define SDSDT_REBOOT 4 // reboot computer
+#define SDSDT_SHUTDOWN 5 // shutdown Windows and power off
+#define SDSDT_STANDBY 6 // standby mode
+#define SDSDT_HIBERNATE 7 // hibernate mode
+#define SDSDT_LOCKWORKSTATION 8 // lock the workstation
+#define SDSDT_CLOSERASCONNECTIONS 9 // close all dialup connections
+#define SDSDT_MAX 9
+
+/* Get shutdown type description v1.4.0.0+
+Gets a textual description of the given shutdown type.
+ wParam=shutdownType
+ lParam=flags (see GSTDF_* below)
+Returns a static buffer of the description of the given shutdown type.
+It does not need to be freed in any way.
+The returned text is already translated.
+Returns a pointer to a string on success, NULL on error.
+*/
+#define MS_AUTOSHUTDOWN_GETTYPEDESCRIPTION "AutoShutdown/GetTypeDescription"
+
+#define GSTDF_LONGDESC 0x0001 // returns a long description
+#define GSTDF_UNICODE 0x0002 // returns a Unicode string
+#define GSTDF_UNTRANSLATED 0x0004 // returns an untranslated string
+#if defined(_UNICODE)
+ #define GSTDF_TCHAR GSTDF_UNICODE // will return WCHAR*
+#else
+ #define GSTDF_TCHAR 0 // will return char*, as usual
+#endif
+
+/* Check if shutdown type is enabled v1.4.0.0+
+Tests if a specific shutdown type is activated and its use is possible
+on the system. For example hibernate and stand-by modes are not available on
+older versions of Windows (needs Windows ME/2000+).
+Shutdown might also be prohibited by security restrictions.
+This services checks it all.
+However, there is no need to call this before calling MS_AUTOSHUTDOWN_SHUTDOWN.
+MS_AUTOSHUTDOWN_SHUTDOWN will fail if the given shutdown type is not enabled.
+ wParam=shutdownType
+ lParam=0
+Returns TRUE if the given shutdown type is enabled, FALSE otherwise.
+*/
+#define MS_AUTOSHUTDOWN_ISTYPEENABLED "AutoShutdown/IsTypeEnabled"
+
+/* Start shutdown watcher v1.4.0.0+
+Starts the watcher using the last settings specified on the dialog
+shown by MS_AUTOSHUTDOWN_SHOWSETTINGSDIALOG.
+Call MS_AUTOSHUTDOWN_SHOWSETTINGSDIALOG instead to offer
+options about what watcher to use.
+Associated event: ME_AUTOSHUTDOWN_WATCHERCHANGED
+ wParam=lParam=0
+Returns 0 on success, nonzero otherwise.
+*/
+#define MS_AUTOSHUTDOWN_STARTWATCHER "AutoShutdown/StartWatcher"
+
+/* Stop shutdown watcher v1.4.0.0+
+Stops the currently running watcher.
+If the watcher is not running, it returns error.
+Associated event: ME_AUTOSHUTDOWN_WATCHERCHANGED
+ wParam=lParam=0
+Returns 0 on success, nonzero otherwise.
+*/
+#define MS_AUTOSHUTDOWN_STOPWATCHER "AutoShutdown/StopWatcher"
+
+/* Check if watcher is running v1.4.0.0+
+Checks if the watcher is currently active or not.
+ wParam=lParam=0
+Returns TRUE if the watcher is enabled, FALSE otherwise.
+*/
+#define MS_AUTOSHUTDOWN_ISWATCHERENABLED "AutoShutdown/IsWatcherEnabled"
+
+/******************************************************************/
+/************************** EVENTS ********************************/
+/******************************************************************/
+
+/* Disallow shutdown process (event) v1.3.0.0+
+Gets fired when MS_AUTOSHUTDOWN_SHUTDOWN is called.
+Parmeters are the same as specified at the call to MS_AUTOSHUTDOWN_SHUTDOWN.
+ wParam=shutdownType
+ lParam=(LPARAM)(BOOL)fShowConfirmDlg
+Return 0 to allow shutdown, 1 to disallow.
+*/
+#define ME_AUTOSHUTDOWN_OKTOSHUTDOWN "AutoShutdown/OkToShutdown"
+
+/* Shutdown process started (event) v1.3.0.1+
+Gets fired when ME_AUTOSHUTDOWN_OKTOSHUTDOWN was confirmed.
+Parmeters are the same as specified at the call
+to MS_AUTOSHUTDOWN_SHUTDOWN.
+ wParam=shutdownType
+ lParam=(LPARAM)(BOOL)fShowConfirmDlg
+Unused, return always 0 here.
+*/
+#define ME_AUTOSHUTDOWN_SHUTDOWN "AutoShutdown/ShutdownEvent"
+
+/* Watcher changed (event) v1.3.0.0+
+Fired when MS_AUTOSHUTDOWN_STARTWATCHER or MS_AUTOSHUTDOWN_STOPWATCHER
+is called.
+ wParam=(WPARAM)(BOOL)fIsStarted (whether whe watcher is running now)
+ lParam=0
+Unused, return always 0 here.
+*/
+#define ME_AUTOSHUTDOWN_WATCHERCHANGED "AutoShutdown/Watcher/Changed"
+
+
+#ifndef SHUTDOWN_NOSETTINGS
+#define SETTING_REMEMBERONRESTART_DEFAULT 0 // SDROR_RUNNING
+#define SETTING_SHOWCONFIRMDLG_DEFAULT 1
+#define SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT 30 // seconds
+#define SETTING_WEATHERSHUTDOWN_DEFAULT 0
+#define SETTING_HDDOVERHEATSHUTDOWN_DEFAULT 1
+#define SETTING_SMARTOFFLINECHECK_DEFAULT 1
+
+#define SETTING_SHUTDOWNTYPE_DEFAULT SDSDT_SHUTDOWN
+#define SETTING_WATCHERFLAGS_DEFAULT (SDWTF_SPECIFICTIME|SDWTF_ST_COUNTDOWN)
+#define SETTING_COUNTDOWN_DEFAULT 30
+#define SETTING_COUNTDOWNUNIT_DEFAULT 60 // x times countdown seconds
+#define SETTING_TIMESTAMP_DEFAULT (DWORD)(time(NULL)+(SETTING_COUNTDOWN_DEFAULT*SETTING_COUNTDOWNUNIT_DEFAULT))
+#define SETTING_CPUUSAGETHRESHOLD_DEFAULT 90 // percent
+
+#define SDWTF_SPECIFICTIME 0x0001
+#define SDWTF_ST_TIME 0x0002
+#define SDWTF_ST_COUNTDOWN 0x0004
+#define SDWTF_ST_MASK 0x0006 /* bitmask for SDWTF_ST_* bits */
+#define SDWTF_MESSAGE 0x0008
+#define SDWTF_FILETRANSFER 0x0010
+#define SDWTF_IDLE 0x0020
+#define SDWTF_STATUS 0x0040
+#define SDWTF_CPUUSAGE 0x0080
+#define SDWTF_MASK 0x00FF /* bitmask for all SDWTF_* bits */
+
+#define SDROR_RUNNING 3
+#endif
+
+#endif // M_SHUTDOWN_H
diff --git a/plugins/ExternalAPI/m_snappingwindows.h b/plugins/ExternalAPI/m_snappingwindows.h
new file mode 100644
index 0000000000..fcfd679913
--- /dev/null
+++ b/plugins/ExternalAPI/m_snappingwindows.h
@@ -0,0 +1,25 @@
+#ifndef SNAPPING_WINDOWS_H
+#define SNAPPING_WINDOWS_H
+
+struct SnapWindowProc_t
+{
+ HWND hWnd;
+ //
+ SIZE m_szMoveOffset;
+ WPARAM wParam;
+ LPARAM lParam;
+ //
+ int Reserved1;
+ int Reserved2;
+ int Reserved3;
+};
+
+#define CallSnappingWindowProc(hwnd,nMessage,wParam,lParam) {static struct SnapWindowProc_t SnapInfo; \
+ if ((nMessage == WM_MOVING) || (nMessage == WM_NCLBUTTONDOWN) || (nMessage == WM_SYSCOMMAND) || (nMessage == WM_SIZING)){ \
+ SnapInfo.hWnd = hwnd; \
+ SnapInfo.wParam = wParam; \
+ SnapInfo.lParam = lParam; \
+ CallService("Utils/SnapWindowProc",(WPARAM)&SnapInfo,nMessage); \
+ if (nMessage == WM_SIZING) return 1;}}
+
+#endif //SNAPPING_WINDOWS_H \ No newline at end of file
diff --git a/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj b/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj
index 18d39ec330..af65e9f87f 100644
--- a/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj
+++ b/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{40FE7861-E54E-4DA9-BE4D-A5178014E477}</ProjectGuid>
- <ProjectName>libgcrypt</ProjectName>
+ <ProjectName>Libgcrypt</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj b/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj
index 001c1bdbc3..426394b10b 100644
--- a/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj
+++ b/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{1423FC8F-AA52-4562-8275-4BF0838CA378}</ProjectGuid>
- <ProjectName>libotr</ProjectName>
+ <ProjectName>Libotr</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 08:14:59 +0000