Merge with default Experimental_Callback_Events
authorDean
Mon, 29 Aug 2016 12:22:34 +0200
branchExperimental_Callback_Events
changeset 152e6e3d95aced2
parent 145 8aa1127b8288
parent 151 432c35b5903c
child 153 aecfde0414f7
Merge with default
     1.1 --- a/.hgignore	Sat Jul 16 10:03:48 2016 +0200
     1.2 +++ b/.hgignore	Mon Aug 29 12:22:34 2016 +0200
     1.3 @@ -3,6 +3,7 @@
     1.4  *.tmp
     1.5  Debug
     1.6  Release
     1.7 +*.orig
     1.8  *.aps
     1.9  *.user
    1.10  pEpCOMServerAdapter_p.*
     2.1 --- a/CpEpEngine.cpp	Sat Jul 16 10:03:48 2016 +0200
     2.2 +++ b/CpEpEngine.cpp	Mon Aug 29 12:22:34 2016 +0200
     2.3 @@ -465,6 +465,23 @@
     2.4      return S_OK;
     2.5  }
     2.6  
     2.7 +STDMETHODIMP CpEpEngine::get_engine_version(BSTR * engine_version)
     2.8 +{
     2.9 +    assert(engine_version);
    2.10 +
    2.11 +    if (!engine_version)
    2.12 +        return E_INVALIDARG;
    2.13 +
    2.14 +    const char *_enginge_version = ::get_engine_version();
    2.15 +
    2.16 +    if (_enginge_version == NULL)
    2.17 +        return FAIL(L"get_engine_version");
    2.18 +
    2.19 +    *engine_version = utf16_bstr(_enginge_version);
    2.20 +
    2.21 +    return S_OK;
    2.22 +}
    2.23 +
    2.24  STDMETHODIMP CpEpEngine::get_languagelist(BSTR * languages)
    2.25  {
    2.26      assert(languages);
     3.1 --- a/CpEpEngine.h	Sat Jul 16 10:03:48 2016 +0200
     3.2 +++ b/CpEpEngine.h	Mon Aug 29 12:22:34 2016 +0200
     3.3 @@ -191,6 +191,7 @@
     3.4      STDMETHOD(find_keys)(BSTR pattern, LPSAFEARRAY * key_list);
     3.5      STDMETHOD(send_key)(BSTR pattern);
     3.6      STDMETHOD(get_crashdump_log)(LONG maxlines, BSTR * log);
     3.7 +    STDMETHOD(get_engine_version)(BSTR * engine_version);
     3.8      STDMETHOD(get_languagelist)(BSTR * languages);
     3.9      STDMETHOD(get_phrase)(BSTR lang, LONG phrase_id, BSTR * phrase);
    3.10  
     4.1 --- a/pEpCOMServerAdapter.idl	Sat Jul 16 10:03:48 2016 +0200
     4.2 +++ b/pEpCOMServerAdapter.idl	Mon Aug 29 12:22:34 2016 +0200
     4.3 @@ -104,6 +104,7 @@
     4.4      HRESULT trustword([in] LONG value, [in, defaultvalue("en")] BSTR lang, [out, retval] BSTR * word);
     4.5      HRESULT trustwords([in] BSTR fpr, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] LONG max_words, [out, retval] BSTR * words);
     4.6      HRESULT get_crashdump_log([in, defaultvalue(0)] LONG maxlines, [out, retval] BSTR * log);
     4.7 +    HRESULT get_engine_version([out, retval] BSTR * engine_version);
     4.8      HRESULT get_languagelist([out, retval] BSTR * languages);
     4.9      HRESULT get_phrase([in] BSTR lang, [in] LONG phrase_id, [out, retval] BSTR * phrase);
    4.10  
     5.1 --- a/pEpCOMServerAdapter.vcxproj	Sat Jul 16 10:03:48 2016 +0200
     5.2 +++ b/pEpCOMServerAdapter.vcxproj	Mon Aug 29 12:22:34 2016 +0200
     5.3 @@ -1,5 +1,5 @@
     5.4  <?xml version="1.0" encoding="utf-8"?>
     5.5 -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     5.6 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     5.7    <ItemGroup Label="ProjectConfigurations">
     5.8      <ProjectConfiguration Include="Debug|Win32">
     5.9        <Configuration>Debug</Configuration>
    5.10 @@ -18,13 +18,13 @@
    5.11    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    5.12      <ConfigurationType>Application</ConfigurationType>
    5.13      <UseDebugLibraries>true</UseDebugLibraries>
    5.14 -    <PlatformToolset>v120</PlatformToolset>
    5.15 +    <PlatformToolset>v140</PlatformToolset>
    5.16      <CharacterSet>Unicode</CharacterSet>
    5.17    </PropertyGroup>
    5.18    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    5.19      <ConfigurationType>Application</ConfigurationType>
    5.20      <UseDebugLibraries>false</UseDebugLibraries>
    5.21 -    <PlatformToolset>v120</PlatformToolset>
    5.22 +    <PlatformToolset>v140</PlatformToolset>
    5.23      <CharacterSet>Unicode</CharacterSet>
    5.24    </PropertyGroup>
    5.25    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    5.26 @@ -51,8 +51,14 @@
    5.27  "$(TargetPath)" /Regserver
    5.28  
    5.29  echo "generating interop assembly $(TargetDir)pEpCOMServerAdapter.Interop.dll"
    5.30 -"$(SDK40ToolsPath)x64\TlbImp.exe" "$(TargetPath)" /out:"$(TargetDir)pEpCOMServerAdapter.Interop.dll" /namespace:pEpCOMServerAdapterLib /primary /keyfile:"$(SolutionDir)pEp\pEp_test.snk" /machine:Agnostic
    5.31 +"$(SDK40ToolsPath)x64\TlbImp.exe" "$(TargetPath)" /out:"$(TargetDir)pEpCOMServerAdapter.Interop.dll" /namespace:pEpCOMServerAdapterLib /primary /keyfile:"$(SolutionDir)pEpForOutlook\pEp_test.snk" /machine:Agnostic
    5.32  
    5.33 +echo "copying required .dll to output directory"
    5.34 +xcopy /y "..\Dependencies\iconv-1.9.2.win32\bin\iconv.dll" "$(OutDir)"
    5.35 +xcopy /y "..\Dependencies\openssl\out32dll\libeay32.dll" "$(OutDir)"
    5.36 +xcopy /y "..\Dependencies\cyrus-sasl-2.1.25\lib\libsasl.dll" "$(OutDir)"
    5.37 +xcopy /y "..\Dependencies\openssl\out32dll\ssleay32.dll" "$(OutDir)"
    5.38 +xcopy /y "..\Dependencies\zlib-1.2.8\zlib1.dll" "$(OutDir)"
    5.39  </Command>
    5.40      </PostBuildEvent>
    5.41    </ItemDefinitionGroup>
    5.42 @@ -171,7 +177,7 @@
    5.43      <Text Include="ReadMe.txt" />
    5.44    </ItemGroup>
    5.45    <ItemGroup>
    5.46 -    <None Include="..\..\pep_for_outlook\pep\pep_test.snk" />
    5.47 +    <None Include="..\pEpForOutlook\pep_test.snk" />
    5.48      <None Include="pEpCOMServerAdapter.rgs" />
    5.49      <None Include="pEpEngine.rgs" />
    5.50      <None Include="updatekey.bin" />
    5.51 @@ -180,7 +186,7 @@
    5.52      <Midl Include="pEpCOMServerAdapter.idl" />
    5.53    </ItemGroup>
    5.54    <ItemGroup>
    5.55 -    <ProjectReference Include="..\..\pEpEngine\pEpEngine.vcxproj">
    5.56 +    <ProjectReference Include="..\pEpEngine\pEpEngine.vcxproj">
    5.57        <Project>{146e69f8-e1da-456a-b048-6dd29d9acf6b}</Project>
    5.58      </ProjectReference>
    5.59    </ItemGroup>
     6.1 --- a/pEpCOMServerAdapter.vcxproj.filters	Sat Jul 16 10:03:48 2016 +0200
     6.2 +++ b/pEpCOMServerAdapter.vcxproj.filters	Mon Aug 29 12:22:34 2016 +0200
     6.3 @@ -97,10 +97,10 @@
     6.4      <None Include="pEpEngine.rgs">
     6.5        <Filter>Resource Files</Filter>
     6.6      </None>
     6.7 -    <None Include="..\..\pep_for_outlook\pep\pep_test.snk" />
     6.8      <None Include="updatekey.bin">
     6.9        <Filter>Resource Files</Filter>
    6.10      </None>
    6.11 +    <None Include="..\pEpForOutlook\pep_test.snk" />
    6.12    </ItemGroup>
    6.13    <ItemGroup>
    6.14      <Midl Include="pEpCOMServerAdapter.idl">
     7.1 --- a/stdafx.h	Sat Jul 16 10:03:48 2016 +0200
     7.2 +++ b/stdafx.h	Mon Aug 29 12:22:34 2016 +0200
     7.3 @@ -44,9 +44,9 @@
     7.4  
     7.5  #include <assert.h>
     7.6  
     7.7 -#include "../../pEpEngine/src/pEpEngine.h"
     7.8 -#include "../../pEpEngine/src/keymanagement.h"
     7.9 -#include "../../pEpEngine/src/message_api.h"
    7.10 -#include "../../pEpEngine/src/stringpair.h"
    7.11 -#include "../../pEpEngine/src/blacklist.h"
    7.12 -#include "../../pEpEngine/src/sync.h"
    7.13 \ No newline at end of file
    7.14 +#include "../pEpEngine/src/pEpEngine.h"
    7.15 +#include "../pEpEngine/src/keymanagement.h"
    7.16 +#include "../pEpEngine/src/message_api.h"
    7.17 +#include "../pEpEngine/src/stringpair.h"
    7.18 +#include "../pEpEngine/src/blacklist.h"
    7.19 +#include "../pEpEngine/src/sync.h"
    7.20 \ No newline at end of file