Change 'TrustWords' to 'Trustwords'
authorDean
Fri, 11 Nov 2016 15:04:19 +0100
changeset 20292fcb5658a34
parent 201 9a6b82eef612
child 203 b398e3da1b99
Change 'TrustWords' to 'Trustwords'
CpEpEngine.cpp
CpEpEngine.h
pEpCOMServerAdapter.idl
     1.1 --- a/CpEpEngine.cpp	Tue Nov 08 21:40:01 2016 +0100
     1.2 +++ b/CpEpEngine.cpp	Fri Nov 11 15:04:19 2016 +0100
     1.3 @@ -108,7 +108,7 @@
     1.4  		return S_OK;
     1.5  }
     1.6  
     1.7 -STDMETHODIMP CpEpEngine::TrustWords(BSTR fpr, BSTR lang, LONG max_words, BSTR * words)
     1.8 +STDMETHODIMP CpEpEngine::Trustwords(BSTR fpr, BSTR lang, LONG max_words, BSTR * words)
     1.9  {
    1.10  	assert(fpr);
    1.11  	assert(max_words >= 0);
    1.12 @@ -154,7 +154,7 @@
    1.13  
    1.14  	if (_words == NULL) {
    1.15  		*words = NULL;
    1.16 -		return FAIL(L"TrustWords: _words == NULL", status);
    1.17 +		return FAIL(L"Trustwords: _words == NULL", status);
    1.18  	}
    1.19  	else {
    1.20  		*words = utf16_bstr(_words);
    1.21 @@ -163,7 +163,7 @@
    1.22  	}
    1.23  }
    1.24  
    1.25 -STDMETHODIMP CpEpEngine::GetTrustWords(struct pEpIdentity *id1, struct pEpIdentity *id2, BSTR lang, VARIANT_BOOL full, BSTR *words)
    1.26 +STDMETHODIMP CpEpEngine::GetTrustwords(struct pEpIdentity *id1, struct pEpIdentity *id2, BSTR lang, VARIANT_BOOL full, BSTR *words)
    1.27  {
    1.28      assert(id1);
    1.29      assert(id2);
    1.30 @@ -210,10 +210,10 @@
    1.31              result = E_OUTOFMEMORY;
    1.32          }
    1.33          else if (status == PEP_TRUSTWORD_NOT_FOUND) {
    1.34 -            result = FAIL(L"GetTrustWords: Trustword not found", status);
    1.35 +            result = FAIL(L"GetTrustwords: Trustword not found", status);
    1.36          }
    1.37          else if (!words) {
    1.38 -            result = FAIL(L"GetTrustWords: _words == NULL", status);
    1.39 +            result = FAIL(L"GetTrustwords: _words == NULL", status);
    1.40          }
    1.41          else {
    1.42              *words = utf16_bstr(_words);
     2.1 --- a/CpEpEngine.h	Tue Nov 08 21:40:01 2016 +0100
     2.2 +++ b/CpEpEngine.h	Fri Nov 11 15:04:19 2016 +0100
     2.3 @@ -156,8 +156,8 @@
     2.4  
     2.5      STDMETHOD(ExportKey)(BSTR fpr, BSTR * keyData);
     2.6      STDMETHOD(Log)(BSTR title, BSTR entity, BSTR description, BSTR comment);
     2.7 -    STDMETHOD(TrustWords)(BSTR fpr, BSTR lang, LONG max_words, BSTR * words);
     2.8 -    STDMETHOD(GetTrustWords)(struct pEpIdentity *id1, struct pEpIdentity *id2, BSTR lang, VARIANT_BOOL full, BSTR *words);
     2.9 +    STDMETHOD(Trustwords)(BSTR fpr, BSTR lang, LONG max_words, BSTR * words);
    2.10 +    STDMETHOD(GetTrustwords)(struct pEpIdentity *id1, struct pEpIdentity *id2, BSTR lang, VARIANT_BOOL full, BSTR *words);
    2.11      STDMETHOD(GetCrashdumpLog)(LONG maxlines, BSTR * log);
    2.12      STDMETHOD(GetEngineVersion)(BSTR * engineVersion);
    2.13      STDMETHOD(GetLanguageList)(BSTR * languages);
     3.1 --- a/pEpCOMServerAdapter.idl	Tue Nov 08 21:40:01 2016 +0100
     3.2 +++ b/pEpCOMServerAdapter.idl	Fri Nov 11 15:04:19 2016 +0100
     3.3 @@ -49,8 +49,8 @@
     3.4  
     3.5      HRESULT ExportKey([in] BSTR fpr, [out, retval] BSTR * keyData);
     3.6      HRESULT Log([in] BSTR title, [in] BSTR entity, [in, defaultvalue("")] BSTR description, [in, defaultvalue("")] BSTR comment);
     3.7 -    HRESULT TrustWords([in] BSTR fpr, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] LONG maxWords, [out, retval] BSTR * words);
     3.8 -    HRESULT GetTrustWords([in] struct pEpIdentity * id1, [in] struct pEpIdentity * id2, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] VARIANT_BOOL full, [out, retval] BSTR * words);
     3.9 +    HRESULT Trustwords([in] BSTR fpr, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] LONG maxWords, [out, retval] BSTR * words);
    3.10 +    HRESULT GetTrustwords([in] struct pEpIdentity * id1, [in] struct pEpIdentity * id2, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] VARIANT_BOOL full, [out, retval] BSTR * words);
    3.11      HRESULT GetCrashdumpLog([in, defaultvalue(0)] LONG maxlines, [out, retval] BSTR * log);
    3.12      HRESULT GetEngineVersion([out, retval] BSTR * engineVersion);
    3.13      HRESULT GetLanguageList([out, retval] BSTR * languages);
    3.14 @@ -179,9 +179,9 @@
    3.15  
    3.16      typedef [v1_enum] enum pEpDecryptFlags {
    3.17          pEpDecryptFlagsNone = 0,
    3.18 -        pEpDecryptFlagOwnPrivateKey = 0x1,
    3.19 -		pEpDecryptFlagConsumed = 0x2,
    3.20 -		pEpDecryptFlagDiscarded = 0x4
    3.21 +        pEpDecryptFlagOwnPrivateKey = 0x1,
    3.22 +        pEpDecryptFlagConsumed = 0x2,
    3.23 +        pEpDecryptFlagDiscarded = 0x4
    3.24      } pEpDecryptFlags;
    3.25  
    3.26      typedef [v1_enum] enum pEpMsgDirection {