AvatarHistory adopted

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

7 files changed, 86 insertions, 474 deletions

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;