summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin10/mir_dev.sln2
-rw-r--r--bin10/mir_full.sln2
-rw-r--r--bin10/mir_full_pro.sln2
-rw-r--r--bin12/mir_dev.sln2
-rw-r--r--bin12/mir_full.sln2
-rw-r--r--bin14/mir_dev.sln2
-rw-r--r--bin14/mir_full.sln2
-rw-r--r--build/vc.common/common.props2
-rw-r--r--protocols/WhatsApp/WhatsApp.vcxproj44
-rw-r--r--protocols/WhatsApp/WhatsApp.vcxproj.filters4
-rw-r--r--protocols/WhatsApp/WhatsApp_10.vcxproj293
-rw-r--r--protocols/WhatsApp/WhatsApp_10.vcxproj.filters240
-rw-r--r--protocols/WhatsApp/WhatsApp_12.vcxproj294
-rw-r--r--protocols/WhatsApp/WhatsApp_12.vcxproj.filters240
-rw-r--r--protocols/WhatsApp/WhatsApp_14.vcxproj294
-rw-r--r--protocols/WhatsApp/WhatsApp_14.vcxproj.filters240
-rw-r--r--protocols/WhatsApp/src/WASocketConnection.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/KeyStream.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/MediaUploader.cpp7
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/PhoneNumber.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp2
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/utilities.cpp9
-rw-r--r--protocols/WhatsApp/src/avatars.cpp2
-rw-r--r--protocols/WhatsApp/src/chat.cpp2
-rw-r--r--protocols/WhatsApp/src/connection.cpp2
-rw-r--r--protocols/WhatsApp/src/contacts.cpp2
-rw-r--r--protocols/WhatsApp/src/dialogs.cpp2
-rw-r--r--protocols/WhatsApp/src/main.cpp2
-rw-r--r--protocols/WhatsApp/src/media.cpp2
-rw-r--r--protocols/WhatsApp/src/messages.cpp2
-rw-r--r--protocols/WhatsApp/src/proto.cpp2
-rw-r--r--protocols/WhatsApp/src/stdafx.cxx (renamed from protocols/WhatsApp/src/stdafx.cpp)2
-rw-r--r--protocols/WhatsApp/src/stdafx.h (renamed from protocols/WhatsApp/src/common.h)2
-rw-r--r--protocols/WhatsApp/src/theme.cpp2
-rw-r--r--protocols/WhatsApp/src/utils.cpp2
42 files changed, 85 insertions, 1644 deletions
diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln
index fc0943334e..6167c211b3 100644
--- a/bin10/mir_dev.sln
+++ b/bin10/mir_dev.sln
@@ -405,7 +405,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp_10.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dummy", "..\protocols\Dummy\dummy.vcxproj", "{D3B4DDFF-D3A5-4452-AE9D-B43B3C97C821}"
EndProject
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 3f94e1544c..bacea75220 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -405,7 +405,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp_10.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dummy", "..\protocols\Dummy\dummy.vcxproj", "{D3B4DDFF-D3A5-4452-AE9D-B43B3C97C821}"
EndProject
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 49955fd2af..fe91efe0db 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -437,7 +437,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp_10.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dummy", "..\protocols\Dummy\dummy.vcxproj", "{D3B4DDFF-D3A5-4452-AE9D-B43B3C97C821}"
EndProject
diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln
index e885631748..8373a73bef 100644
--- a/bin12/mir_dev.sln
+++ b/bin12/mir_dev.sln
@@ -407,7 +407,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp_12.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dummy", "..\protocols\Dummy\dummy.vcxproj", "{D3B4DDFF-D3A5-4452-AE9D-B43B3C97C821}"
EndProject
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index 8c4af3378a..0a78c787ed 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -407,7 +407,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp_12.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dummy", "..\protocols\Dummy\dummy.vcxproj", "{D3B4DDFF-D3A5-4452-AE9D-B43B3C97C821}"
EndProject
diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln
index 2a340daf60..3185610c2f 100644
--- a/bin14/mir_dev.sln
+++ b/bin14/mir_dev.sln
@@ -407,7 +407,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp_14.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dummy", "..\protocols\Dummy\dummy.vcxproj", "{D3B4DDFF-D3A5-4452-AE9D-B43B3C97C821}"
EndProject
diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln
index ca72433384..602c760cd9 100644
--- a/bin14/mir_full.sln
+++ b/bin14/mir_full.sln
@@ -407,7 +407,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp_14.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsApp", "..\protocols\WhatsApp\WhatsApp.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dummy", "..\protocols\Dummy\dummy.vcxproj", "{D3B4DDFF-D3A5-4452-AE9D-B43B3C97C821}"
EndProject
diff --git a/build/vc.common/common.props b/build/vc.common/common.props
index 294831325f..0fc98e17a2 100644
--- a/build/vc.common/common.props
+++ b/build/vc.common/common.props
@@ -24,7 +24,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\plugins\ExternalAPI;$(ProjectDir)..\..\..\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4995;4996;4312;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
diff --git a/protocols/WhatsApp/WhatsApp.vcxproj b/protocols/WhatsApp/WhatsApp.vcxproj
new file mode 100644
index 0000000000..ee43a66701
--- /dev/null
+++ b/protocols/WhatsApp/WhatsApp.vcxproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{13E796AD-BEA4-4213-A1B8-E18E2397E544}</ProjectGuid>
+ <ProjectName>WhatsApp</ProjectName>
+ </PropertyGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
+ </ImportGroup>
+ <ItemGroup>
+ <ClCompile Include="src\OpenSSL\*.c">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="src\WhatsAPI++\*.cpp">
+ <PrecompiledHeaderFile>../stdafx.h</PrecompiledHeaderFile>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="src\WhatsAPI++\*.h" />
+ </ItemGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ </ClCompile>
+ </ItemDefinitionGroup>
+</Project> \ No newline at end of file
diff --git a/protocols/WhatsApp/WhatsApp.vcxproj.filters b/protocols/WhatsApp/WhatsApp.vcxproj.filters
new file mode 100644
index 0000000000..de5ad9f66c
--- /dev/null
+++ b/protocols/WhatsApp/WhatsApp.vcxproj.filters
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+</Project> \ No newline at end of file
diff --git a/protocols/WhatsApp/WhatsApp_10.vcxproj b/protocols/WhatsApp/WhatsApp_10.vcxproj
deleted file mode 100644
index b9328e1a79..0000000000
--- a/protocols/WhatsApp/WhatsApp_10.vcxproj
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{13E796AD-BEA4-4213-A1B8-E18E2397E544}</ProjectGuid>
- <ProjectName>WhatsApp</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <Optimization>Full</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <Optimization>Full</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\avatars.cpp" />
- <ClCompile Include="src\chat.cpp" />
- <ClCompile Include="src\connection.cpp" />
- <ClCompile Include="src\contacts.cpp" />
- <ClCompile Include="src\dialogs.cpp" />
- <ClCompile Include="src\main.cpp" />
- <ClCompile Include="src\media.cpp" />
- <ClCompile Include="src\messages.cpp" />
- <ClCompile Include="src\OpenSSL\digest.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\evp_lib.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\hmac.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\m_sha1.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\p5_crpt2.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_enc.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_skey.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rsa_sign.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\proto.cpp" />
- <ClCompile Include="src\stdafx.cpp">
- <PrecompiledHeader>Create</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\theme.cpp" />
- <ClCompile Include="src\utils.cpp" />
- <ClCompile Include="src\WASocketConnection.cpp" />
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeReader.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeWriter.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ByteArray.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\FMessage.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\KeyStream.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\MediaUploader.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\PhoneNumber.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ProtocolTreeNode.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\utilities.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WAConnection.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WALogin.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WARegister.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\common.h" />
- <ClInclude Include="src\constants.h" />
- <ClInclude Include="src\db.h" />
- <ClInclude Include="src\definitions.h" />
- <ClInclude Include="src\dialogs.h" />
- <ClInclude Include="src\entities.h" />
- <ClInclude Include="src\OpenSSL\hmac.h" />
- <ClInclude Include="src\OpenSSL\rc4.h" />
- <ClInclude Include="src\proto.h" />
- <ClInclude Include="src\resource.h" />
- <ClInclude Include="src\theme.h" />
- <ClInclude Include="src\utils.h" />
- <ClInclude Include="src\version.h" />
- <ClInclude Include="src\WASocketConnection.h" />
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeReader.h" />
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeWriter.h" />
- <ClInclude Include="src\WhatsAPI++\ByteArray.h" />
- <ClInclude Include="src\WhatsAPI++\FMessage.h" />
- <ClInclude Include="src\WhatsAPI++\IMutex.h" />
- <ClInclude Include="src\WhatsAPI++\ISocketConnection.h" />
- <ClInclude Include="src\WhatsAPI++\MediaUploader.h" />
- <ClInclude Include="src\WhatsAPI++\PhoneNumber.h" />
- <ClInclude Include="src\WhatsAPI++\ProtocolTreeNode.h" />
- <ClInclude Include="src\WhatsAPI++\targetver.h" />
- <ClInclude Include="src\WhatsAPI++\utilities.h" />
- <ClInclude Include="src\WhatsAPI++\WAConnection.h" />
- <ClInclude Include="src\WhatsAPI++\WAException.h" />
- <ClInclude Include="src\WhatsAPI++\WALogin.h" />
- <ClInclude Include="src\WhatsAPI++\WARegister.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\version.rc" />
- <ResourceCompile Include="res\whatsapp.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="res\add-group.ico" />
- <None Include="res\whatsapp.ico" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/protocols/WhatsApp/WhatsApp_10.vcxproj.filters b/protocols/WhatsApp/WhatsApp_10.vcxproj.filters
deleted file mode 100644
index fd17f946a2..0000000000
--- a/protocols/WhatsApp/WhatsApp_10.vcxproj.filters
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Miranda Plugin">
- <UniqueIdentifier>{5474a2fc-7d36-4e0d-af1a-702c1c615e0f}</UniqueIdentifier>
- </Filter>
- <Filter Include="Miranda Plugin\Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Miranda Plugin\Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Resources">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++">
- <UniqueIdentifier>{12ef3068-b7c1-4b48-a868-98a846fad1cd}</UniqueIdentifier>
- </Filter>
- <Filter Include="WhatsAPI++\Header Files">
- <UniqueIdentifier>{e4575657-22c5-4cad-a1ab-15b422682e8f}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++\Source Files">
- <UniqueIdentifier>{294e7046-0757-4b99-8855-c8d2864c6303}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++\OpenSSL">
- <UniqueIdentifier>{eaedb8f8-8e43-4360-9007-b1a3448d2d16}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\chat.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\connection.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\contacts.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\dialogs.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\main.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\messages.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\proto.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\theme.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\utils.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WASocketConnection.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeReader.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeWriter.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ByteArray.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\FMessage.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ProtocolTreeNode.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\utilities.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WAConnection.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WALogin.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\stdafx.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_enc.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_skey.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\hmac.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\evp_lib.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\digest.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\p5_crpt2.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\m_sha1.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rsa_sign.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\PhoneNumber.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WARegister.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\KeyStream.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\avatars.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\media.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\MediaUploader.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\common.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\constants.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\db.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\definitions.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\dialogs.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\entities.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\proto.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\theme.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\utils.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WASocketConnection.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeReader.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeWriter.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ByteArray.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\FMessage.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\IMutex.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ISocketConnection.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ProtocolTreeNode.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\targetver.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\utilities.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WAConnection.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WAException.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WALogin.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\OpenSSL\hmac.h">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClInclude>
- <ClInclude Include="src\OpenSSL\rc4.h">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClInclude>
- <ClInclude Include="src\version.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WARegister.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\PhoneNumber.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\resource.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\MediaUploader.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\whatsapp.rc">
- <Filter>Resources</Filter>
- </ResourceCompile>
- <ResourceCompile Include="res\version.rc">
- <Filter>Resources</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="res\whatsapp.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\add-group.ico">
- <Filter>Resources</Filter>
- </None>
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/protocols/WhatsApp/WhatsApp_12.vcxproj b/protocols/WhatsApp/WhatsApp_12.vcxproj
deleted file mode 100644
index b39a2a5923..0000000000
--- a/protocols/WhatsApp/WhatsApp_12.vcxproj
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{13E796AD-BEA4-4213-A1B8-E18E2397E544}</ProjectGuid>
- <ProjectName>WhatsApp</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <Optimization>Full</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <Optimization>Full</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\avatars.cpp" />
- <ClCompile Include="src\chat.cpp" />
- <ClCompile Include="src\connection.cpp" />
- <ClCompile Include="src\contacts.cpp" />
- <ClCompile Include="src\dialogs.cpp" />
- <ClCompile Include="src\main.cpp" />
- <ClCompile Include="src\media.cpp" />
- <ClCompile Include="src\messages.cpp" />
- <ClCompile Include="src\OpenSSL\digest.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\evp_lib.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\hmac.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\m_sha1.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\p5_crpt2.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_enc.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_skey.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rsa_sign.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\proto.cpp" />
- <ClCompile Include="src\stdafx.cpp">
- <PrecompiledHeader>Create</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\theme.cpp" />
- <ClCompile Include="src\utils.cpp" />
- <ClCompile Include="src\WASocketConnection.cpp" />
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeReader.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeWriter.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ByteArray.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\FMessage.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\KeyStream.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\MediaUploader.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\PhoneNumber.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ProtocolTreeNode.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\utilities.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WAConnection.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WALogin.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WARegister.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\common.h" />
- <ClInclude Include="src\constants.h" />
- <ClInclude Include="src\db.h" />
- <ClInclude Include="src\definitions.h" />
- <ClInclude Include="src\dialogs.h" />
- <ClInclude Include="src\entities.h" />
- <ClInclude Include="src\OpenSSL\hmac.h" />
- <ClInclude Include="src\OpenSSL\rc4.h" />
- <ClInclude Include="src\proto.h" />
- <ClInclude Include="src\resource.h" />
- <ClInclude Include="src\theme.h" />
- <ClInclude Include="src\utils.h" />
- <ClInclude Include="src\WASocketConnection.h" />
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeReader.h" />
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeWriter.h" />
- <ClInclude Include="src\WhatsAPI++\ByteArray.h" />
- <ClInclude Include="src\WhatsAPI++\FMessage.h" />
- <ClInclude Include="src\WhatsAPI++\IMutex.h" />
- <ClInclude Include="src\WhatsAPI++\ISocketConnection.h" />
- <ClInclude Include="src\WhatsAPI++\MediaUploader.h" />
- <ClInclude Include="src\WhatsAPI++\PhoneNumber.h" />
- <ClInclude Include="src\WhatsAPI++\ProtocolTreeNode.h" />
- <ClInclude Include="src\WhatsAPI++\targetver.h" />
- <ClInclude Include="src\WhatsAPI++\utilities.h" />
- <ClInclude Include="src\WhatsAPI++\WAConnection.h" />
- <ClInclude Include="src\WhatsAPI++\WAException.h" />
- <ClInclude Include="src\WhatsAPI++\WALogin.h" />
- <ClInclude Include="src\WhatsAPI++\WARegister.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\version.rc" />
- <ResourceCompile Include="res\whatsapp.rc" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="res\add-group.ico" />
- <Image Include="res\whatsapp.ico" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/protocols/WhatsApp/WhatsApp_12.vcxproj.filters b/protocols/WhatsApp/WhatsApp_12.vcxproj.filters
deleted file mode 100644
index 5d66b2a650..0000000000
--- a/protocols/WhatsApp/WhatsApp_12.vcxproj.filters
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Miranda Plugin">
- <UniqueIdentifier>{5474a2fc-7d36-4e0d-af1a-702c1c615e0f}</UniqueIdentifier>
- </Filter>
- <Filter Include="Miranda Plugin\Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Miranda Plugin\Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Resources">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++">
- <UniqueIdentifier>{12ef3068-b7c1-4b48-a868-98a846fad1cd}</UniqueIdentifier>
- </Filter>
- <Filter Include="WhatsAPI++\Header Files">
- <UniqueIdentifier>{e4575657-22c5-4cad-a1ab-15b422682e8f}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++\Source Files">
- <UniqueIdentifier>{294e7046-0757-4b99-8855-c8d2864c6303}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++\OpenSSL">
- <UniqueIdentifier>{eaedb8f8-8e43-4360-9007-b1a3448d2d16}</UniqueIdentifier>
- </Filter>
- <Filter Include="Resources\Icons">
- <UniqueIdentifier>{06318065-d7dc-4678-b6d0-8c5feca76d8f}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\chat.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\connection.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\contacts.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\dialogs.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\main.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\messages.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\proto.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\theme.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\utils.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WASocketConnection.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeReader.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeWriter.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ByteArray.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\FMessage.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ProtocolTreeNode.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\utilities.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WAConnection.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WALogin.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\stdafx.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_enc.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_skey.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\hmac.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\evp_lib.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\digest.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\p5_crpt2.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\m_sha1.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rsa_sign.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WARegister.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\PhoneNumber.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\KeyStream.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\avatars.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\media.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\MediaUploader.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\common.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\constants.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\db.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\definitions.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\dialogs.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\entities.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\proto.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\resource.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\theme.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\utils.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WASocketConnection.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeReader.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeWriter.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ByteArray.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\FMessage.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\IMutex.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ISocketConnection.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ProtocolTreeNode.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\targetver.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\utilities.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WAConnection.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WAException.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WALogin.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\OpenSSL\hmac.h">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClInclude>
- <ClInclude Include="src\OpenSSL\rc4.h">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WARegister.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\PhoneNumber.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\MediaUploader.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\whatsapp.rc">
- <Filter>Resources</Filter>
- </ResourceCompile>
- <ResourceCompile Include="res\version.rc">
- <Filter>Resources</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <Image Include="res\add-group.ico">
- <Filter>Resources\Icons</Filter>
- </Image>
- <Image Include="res\whatsapp.ico">
- <Filter>Resources\Icons</Filter>
- </Image>
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/protocols/WhatsApp/WhatsApp_14.vcxproj b/protocols/WhatsApp/WhatsApp_14.vcxproj
deleted file mode 100644
index bfe1416d27..0000000000
--- a/protocols/WhatsApp/WhatsApp_14.vcxproj
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{13E796AD-BEA4-4213-A1B8-E18E2397E544}</ProjectGuid>
- <ProjectName>WhatsApp</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <Optimization>Full</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <Optimization>Full</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- </Link>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\avatars.cpp" />
- <ClCompile Include="src\chat.cpp" />
- <ClCompile Include="src\connection.cpp" />
- <ClCompile Include="src\contacts.cpp" />
- <ClCompile Include="src\dialogs.cpp" />
- <ClCompile Include="src\main.cpp" />
- <ClCompile Include="src\media.cpp" />
- <ClCompile Include="src\messages.cpp" />
- <ClCompile Include="src\OpenSSL\digest.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\evp_lib.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\hmac.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\m_sha1.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\p5_crpt2.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_enc.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_skey.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rsa_sign.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\proto.cpp" />
- <ClCompile Include="src\stdafx.cpp">
- <PrecompiledHeader>Create</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\theme.cpp" />
- <ClCompile Include="src\utils.cpp" />
- <ClCompile Include="src\WASocketConnection.cpp" />
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeReader.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeWriter.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ByteArray.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\FMessage.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\KeyStream.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\MediaUploader.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\PhoneNumber.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ProtocolTreeNode.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\utilities.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WAConnection.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WALogin.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WARegister.cpp">
- <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\common.h" />
- <ClInclude Include="src\constants.h" />
- <ClInclude Include="src\db.h" />
- <ClInclude Include="src\definitions.h" />
- <ClInclude Include="src\dialogs.h" />
- <ClInclude Include="src\entities.h" />
- <ClInclude Include="src\OpenSSL\hmac.h" />
- <ClInclude Include="src\OpenSSL\rc4.h" />
- <ClInclude Include="src\proto.h" />
- <ClInclude Include="src\resource.h" />
- <ClInclude Include="src\theme.h" />
- <ClInclude Include="src\utils.h" />
- <ClInclude Include="src\WASocketConnection.h" />
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeReader.h" />
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeWriter.h" />
- <ClInclude Include="src\WhatsAPI++\ByteArray.h" />
- <ClInclude Include="src\WhatsAPI++\FMessage.h" />
- <ClInclude Include="src\WhatsAPI++\IMutex.h" />
- <ClInclude Include="src\WhatsAPI++\ISocketConnection.h" />
- <ClInclude Include="src\WhatsAPI++\MediaUploader.h" />
- <ClInclude Include="src\WhatsAPI++\PhoneNumber.h" />
- <ClInclude Include="src\WhatsAPI++\ProtocolTreeNode.h" />
- <ClInclude Include="src\WhatsAPI++\targetver.h" />
- <ClInclude Include="src\WhatsAPI++\utilities.h" />
- <ClInclude Include="src\WhatsAPI++\WAConnection.h" />
- <ClInclude Include="src\WhatsAPI++\WAException.h" />
- <ClInclude Include="src\WhatsAPI++\WALogin.h" />
- <ClInclude Include="src\WhatsAPI++\WARegister.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\version.rc" />
- <ResourceCompile Include="res\whatsapp.rc" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="res\add-group.ico" />
- <Image Include="res\whatsapp.ico" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/protocols/WhatsApp/WhatsApp_14.vcxproj.filters b/protocols/WhatsApp/WhatsApp_14.vcxproj.filters
deleted file mode 100644
index 79a42103cd..0000000000
--- a/protocols/WhatsApp/WhatsApp_14.vcxproj.filters
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Miranda Plugin">
- <UniqueIdentifier>{5474a2fc-7d36-4e0d-af1a-702c1c615e0f}</UniqueIdentifier>
- </Filter>
- <Filter Include="Miranda Plugin\Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Miranda Plugin\Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Resources">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++">
- <UniqueIdentifier>{12ef3068-b7c1-4b48-a868-98a846fad1cd}</UniqueIdentifier>
- </Filter>
- <Filter Include="WhatsAPI++\Header Files">
- <UniqueIdentifier>{e4575657-22c5-4cad-a1ab-15b422682e8f}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++\Source Files">
- <UniqueIdentifier>{294e7046-0757-4b99-8855-c8d2864c6303}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="WhatsAPI++\OpenSSL">
- <UniqueIdentifier>{eaedb8f8-8e43-4360-9007-b1a3448d2d16}</UniqueIdentifier>
- </Filter>
- <Filter Include="Resources\Icons">
- <UniqueIdentifier>{06318065-d7dc-4678-b6d0-8c5feca76d8f}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\chat.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\connection.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\contacts.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\dialogs.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\main.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\messages.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\proto.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\theme.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\utils.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WASocketConnection.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeReader.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\BinTreeNodeWriter.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ByteArray.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\FMessage.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\ProtocolTreeNode.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\utilities.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WAConnection.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WALogin.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\stdafx.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_enc.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rc4_skey.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\hmac.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\evp_lib.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\digest.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\p5_crpt2.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\m_sha1.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\OpenSSL\rsa_sign.c">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\WARegister.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\PhoneNumber.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\KeyStream.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\avatars.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\WhatsAPI++\MediaUploader.cpp">
- <Filter>WhatsAPI++\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\media.cpp">
- <Filter>Miranda Plugin\Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\common.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\constants.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\db.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\definitions.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\dialogs.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\entities.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\proto.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\resource.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\theme.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\utils.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WASocketConnection.h">
- <Filter>Miranda Plugin\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeReader.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\BinTreeNodeWriter.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ByteArray.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\FMessage.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\IMutex.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ISocketConnection.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\ProtocolTreeNode.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\targetver.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\utilities.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WAConnection.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WAException.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WALogin.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\OpenSSL\hmac.h">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClInclude>
- <ClInclude Include="src\OpenSSL\rc4.h">
- <Filter>WhatsAPI++\OpenSSL</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\WARegister.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\PhoneNumber.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\WhatsAPI++\MediaUploader.h">
- <Filter>WhatsAPI++\Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\whatsapp.rc">
- <Filter>Resources</Filter>
- </ResourceCompile>
- <ResourceCompile Include="res\version.rc">
- <Filter>Resources</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <Image Include="res\add-group.ico">
- <Filter>Resources\Icons</Filter>
- </Image>
- <Image Include="res\whatsapp.ico">
- <Filter>Resources\Icons</Filter>
- </Image>
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/protocols/WhatsApp/src/WASocketConnection.cpp b/protocols/WhatsApp/src/WASocketConnection.cpp
index 188bc023be..0de6be5884 100644
--- a/protocols/WhatsApp/src/WASocketConnection.cpp
+++ b/protocols/WhatsApp/src/WASocketConnection.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
#include "WASocketConnection.h"
HANDLE WASocketConnection::hNetlibUser = NULL;
diff --git a/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp b/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp
index 0dfa824738..b3ed6aa3f5 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp
@@ -5,7 +5,7 @@
* Author: Antonio
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "BinTreeNodeReader.h"
#include "WAException.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp b/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp
index a0137e5180..19bf6a466f 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp
@@ -5,7 +5,7 @@
* Author: Antonio
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "BinTreeNodeWriter.h"
#include "utilities.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp b/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
index 5df55f97ab..8dbc044e67 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
@@ -5,7 +5,7 @@
* Author: Antonio
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "ByteArray.h"
#include "WAException.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp b/protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp
index 8f5fd2dcc9..8358560f99 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp
@@ -5,7 +5,7 @@
* Author: Antonio
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "utilities.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/KeyStream.cpp b/protocols/WhatsApp/src/WhatsAPI++/KeyStream.cpp
index c50e4cbbd1..563e5ac7f1 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/KeyStream.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/KeyStream.cpp
@@ -5,7 +5,7 @@
* Author: Antonio
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "WALogin.h"
#include "ByteArray.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/MediaUploader.cpp b/protocols/WhatsApp/src/WhatsAPI++/MediaUploader.cpp
index 319ad02555..7d3d02b30d 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/MediaUploader.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/MediaUploader.cpp
@@ -1,4 +1,4 @@
-#include "../common.h"
+#include "../stdafx.h"
#include "MediaUploader.h"
// TODO get rid of unneeded headers added by NETLIBHTTPREQUEST. it sould look like this:
@@ -74,11 +74,8 @@ namespace MediaUploader
{
string filePath = message->media_url;
string to = message->key.remote_jid;
- long fileSize = message->media_size;
string extension = split(filePath, '.')[1];
- const BYTE *path = (const BYTE*)filePath.c_str();
-
uint8_t digest[16];
md5_string(filePath, digest);
char dest[33];
@@ -99,8 +96,6 @@ namespace MediaUploader
hBAOS += "Content-Type: " + getMimeFromExtension(extension) + "\r\n\r\n";
string fBAOS = "\r\n--" + boundary + "--\r\n";
- long contentlength = sizeof(hBAOS) + sizeof(fBAOS) + fileSize;
-
return sendData(url, hBAOS, filePath, fBAOS);
}
diff --git a/protocols/WhatsApp/src/WhatsAPI++/PhoneNumber.cpp b/protocols/WhatsApp/src/WhatsAPI++/PhoneNumber.cpp
index 966e7cd28c..dc5466321d 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/PhoneNumber.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/PhoneNumber.cpp
@@ -3,7 +3,7 @@
*
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "PhoneNumber.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp b/protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp
index 7ef362ef4b..2e04563fda 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp
@@ -5,7 +5,7 @@
* Author: Antonio
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "WAException.h"
#include "ProtocolTreeNode.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
index dd69603d7c..6b1336e6d7 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
@@ -5,7 +5,7 @@
* Author: Antonio
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "ProtocolTreeNode.h"
#include "utilities.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp b/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
index 8e0c4a2983..957716e2b0 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
@@ -13,7 +13,7 @@
#include <map>
#include <stdlib.h>
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
using namespace Utilities;
diff --git a/protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp b/protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp
index 2f6754d45e..f7371c7fc8 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp
@@ -3,7 +3,7 @@
*
*/
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "WARegister.h"
#include "PhoneNumber.h"
diff --git a/protocols/WhatsApp/src/WhatsAPI++/utilities.cpp b/protocols/WhatsApp/src/WhatsAPI++/utilities.cpp
index bbffd4712a..9c56a0c7dd 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/utilities.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/utilities.cpp
@@ -1,4 +1,4 @@
-#include "../common.h" // #TODO Remove Miranda-dependency
+#include "../stdafx.h" // #TODO Remove Miranda-dependency
#include "utilities.h"
#include "WAException.h"
@@ -166,7 +166,6 @@ string bytesToHex(unsigned char* bytes, int length)
{
string ret(length * 2, ' ');
string::iterator p = ret.begin();
- int i = 0;
for (int c = 0; c < length; c++) {
int ub = bytes[c];
*p++ = forDigit(ub >> 4);
@@ -283,11 +282,9 @@ bool saveChallengeData(const std::vector<unsigned char>& data, const std::string
std::string utf8_to_utf16(const std::string &utf8)
{
std::vector<unsigned long> unicode;
- size_t i = 0;
- while (i < utf8.size()) {
+ for (size_t i = 0; i < utf8.size();) {
unsigned long uni;
size_t todo;
- bool error = false;
unsigned char ch = utf8[i++];
if (ch <= 0x7F) {
uni = ch;
@@ -314,7 +311,7 @@ std::string utf8_to_utf16(const std::string &utf8)
for (size_t j = 0; j < todo; ++j) {
if (i == utf8.size())
throw std::logic_error("not a UTF-8 string");
- unsigned char ch = utf8[i++];
+ ch = utf8[i++];
if (ch < 0x80 || ch > 0xBF)
throw std::logic_error("not a UTF-8 string");
uni <<= 6;
diff --git a/protocols/WhatsApp/src/avatars.cpp b/protocols/WhatsApp/src/avatars.cpp
index 670d5acae7..9e6c24a6ac 100644
--- a/protocols/WhatsApp/src/avatars.cpp
+++ b/protocols/WhatsApp/src/avatars.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
INT_PTR WhatsAppProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)
{
diff --git a/protocols/WhatsApp/src/chat.cpp b/protocols/WhatsApp/src/chat.cpp
index 7213760549..f816e40f1d 100644
--- a/protocols/WhatsApp/src/chat.cpp
+++ b/protocols/WhatsApp/src/chat.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
static const TCHAR *sttStatuses[] = { LPGENT("Members"), LPGENT("Owners") };
diff --git a/protocols/WhatsApp/src/connection.cpp b/protocols/WhatsApp/src/connection.cpp
index be64ed1b41..646a5b134f 100644
--- a/protocols/WhatsApp/src/connection.cpp
+++ b/protocols/WhatsApp/src/connection.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
void WhatsAppProto::stayConnectedLoop(void*)
{
diff --git a/protocols/WhatsApp/src/contacts.cpp b/protocols/WhatsApp/src/contacts.cpp
index e657c1d00d..baea533421 100644
--- a/protocols/WhatsApp/src/contacts.cpp
+++ b/protocols/WhatsApp/src/contacts.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
MCONTACT WhatsAppProto::AddToContactList(const std::string &jid, const char *new_name)
{
diff --git a/protocols/WhatsApp/src/dialogs.cpp b/protocols/WhatsApp/src/dialogs.cpp
index 6bc7889e06..9d95acc5da 100644
--- a/protocols/WhatsApp/src/dialogs.cpp
+++ b/protocols/WhatsApp/src/dialogs.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
#define szAskSendSms LPGEN("An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?")
#define szAskCall LPGEN("A call with registration code will be made to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?")
diff --git a/protocols/WhatsApp/src/main.cpp b/protocols/WhatsApp/src/main.cpp
index 5d0697d998..20480c0332 100644
--- a/protocols/WhatsApp/src/main.cpp
+++ b/protocols/WhatsApp/src/main.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
#include "version.h"
CLIST_INTERFACE *pcli;
diff --git a/protocols/WhatsApp/src/media.cpp b/protocols/WhatsApp/src/media.cpp
index 1d127bafe8..7136a3862a 100644
--- a/protocols/WhatsApp/src/media.cpp
+++ b/protocols/WhatsApp/src/media.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
HANDLE WhatsAppProto::SendFile(MCONTACT hContact, const TCHAR* desc, TCHAR **ppszFiles) {
if (!isOnline())
diff --git a/protocols/WhatsApp/src/messages.cpp b/protocols/WhatsApp/src/messages.cpp
index c27d0e74fe..163144df5e 100644
--- a/protocols/WhatsApp/src/messages.cpp
+++ b/protocols/WhatsApp/src/messages.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
int WhatsAppProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
{
diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index 75ff99c887..9cfa22ac8e 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
#include "WhatsAPI++\WARegister.h"
diff --git a/protocols/WhatsApp/src/stdafx.cpp b/protocols/WhatsApp/src/stdafx.cxx
index 142f352f76..8d5b5b5857 100644
--- a/protocols/WhatsApp/src/stdafx.cpp
+++ b/protocols/WhatsApp/src/stdafx.cxx
@@ -2,7 +2,7 @@
// WhatsAPI++.pch ist der vorkompilierte Header.
// stdafx.obj enthält die vorkompilierten Typinformationen.
-#include "common.h"
+#include "stdafx.h"
// TODO: Auf zusätzliche Header verweisen, die in STDAFX.H
// und nicht in dieser Datei erforderlich sind.
diff --git a/protocols/WhatsApp/src/common.h b/protocols/WhatsApp/src/stdafx.h
index abd76ecf13..9620bb10b7 100644
--- a/protocols/WhatsApp/src/common.h
+++ b/protocols/WhatsApp/src/stdafx.h
@@ -66,6 +66,8 @@ Copyright © 2013-14 Uli Hecht
#include <m_json.h>
#include <m_gui.h>
+#include "..\..\libs\libaxolotl\src\axolotl.h"
+
#include "constants.h"
#include "utils.h"
#include "db.h"
diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp
index 9f743c4362..939def3d81 100644
--- a/protocols/WhatsApp/src/theme.cpp
+++ b/protocols/WhatsApp/src/theme.cpp
@@ -1,4 +1,4 @@
- #include "common.h"
+#include "stdafx.h"
extern OBJLIST<WhatsAppProto> g_Instances;
diff --git a/protocols/WhatsApp/src/utils.cpp b/protocols/WhatsApp/src/utils.cpp
index 946e581bbd..35f84bcc1e 100644
--- a/protocols/WhatsApp/src/utils.cpp
+++ b/protocols/WhatsApp/src/utils.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
TCHAR* utils::removeA(TCHAR *str)
{