Merge with default outlook_mime_support
authorMarkus Schaber <markus@pep-security.net>
Thu, 01 Sep 2016 19:09:52 +0200
branchoutlook_mime_support
changeset 1550264d4b637a4
parent 150 316269fc987e
parent 153 aecfde0414f7
child 156 8c9f8ce2c3a8
Merge with default
CpEpEngine.cpp
CpEpEngine.h
pEpCOMServerAdapter.idl
     1.1 --- a/CpEpEngine.cpp	Sun Aug 21 02:01:20 2016 +0200
     1.2 +++ b/CpEpEngine.cpp	Thu Sep 01 19:09:52 2016 +0200
     1.3 @@ -465,6 +465,23 @@
     1.4      return S_OK;
     1.5  }
     1.6  
     1.7 +STDMETHODIMP CpEpEngine::get_engine_version(BSTR * engine_version)
     1.8 +{
     1.9 +    assert(engine_version);
    1.10 +
    1.11 +    if (!engine_version)
    1.12 +        return E_INVALIDARG;
    1.13 +
    1.14 +    const char *_enginge_version = ::get_engine_version();
    1.15 +
    1.16 +    if (_enginge_version == NULL)
    1.17 +        return FAIL(L"get_engine_version");
    1.18 +
    1.19 +    *engine_version = utf16_bstr(_enginge_version);
    1.20 +
    1.21 +    return S_OK;
    1.22 +}
    1.23 +
    1.24  STDMETHODIMP CpEpEngine::get_languagelist(BSTR * languages)
    1.25  {
    1.26      assert(languages);
     2.1 --- a/CpEpEngine.h	Sun Aug 21 02:01:20 2016 +0200
     2.2 +++ b/CpEpEngine.h	Thu Sep 01 19:09:52 2016 +0200
     2.3 @@ -191,6 +191,7 @@
     2.4      STDMETHOD(find_keys)(BSTR pattern, LPSAFEARRAY * key_list);
     2.5      STDMETHOD(send_key)(BSTR pattern);
     2.6      STDMETHOD(get_crashdump_log)(LONG maxlines, BSTR * log);
     2.7 +    STDMETHOD(get_engine_version)(BSTR * engine_version);
     2.8      STDMETHOD(get_languagelist)(BSTR * languages);
     2.9      STDMETHOD(get_phrase)(BSTR lang, LONG phrase_id, BSTR * phrase);
    2.10  
     3.1 --- a/pEpCOMServerAdapter.idl	Sun Aug 21 02:01:20 2016 +0200
     3.2 +++ b/pEpCOMServerAdapter.idl	Thu Sep 01 19:09:52 2016 +0200
     3.3 @@ -104,6 +104,7 @@
     3.4      HRESULT trustword([in] LONG value, [in, defaultvalue("en")] BSTR lang, [out, retval] BSTR * word);
     3.5      HRESULT trustwords([in] BSTR fpr, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] LONG max_words, [out, retval] BSTR * words);
     3.6      HRESULT get_crashdump_log([in, defaultvalue(0)] LONG maxlines, [out, retval] BSTR * log);
     3.7 +    HRESULT get_engine_version([out, retval] BSTR * engine_version);
     3.8      HRESULT get_languagelist([out, retval] BSTR * languages);
     3.9      HRESULT get_phrase([in] BSTR lang, [in] LONG phrase_id, [out, retval] BSTR * phrase);
    3.10