CpEpEngine.h
changeset 273 30be98685afa
parent 269 26c8597fe860
parent 271 92866cd8b0c4
child 274 b4f390f0a123
     1.1 --- a/CpEpEngine.h	Fri Feb 02 22:03:16 2018 +0100
     1.2 +++ b/CpEpEngine.h	Wed Feb 07 20:23:32 2018 +0100
     1.3 @@ -24,7 +24,7 @@
     1.4      public CComObjectRootEx<CComObjectThreadModel>,
     1.5      public CComCoClass<CpEpEngine, &CLSID_pEpEngine>,
     1.6      public ISupportErrorInfo,
     1.7 -    public IpEpEngine2
     1.8 +    public IpEpEngine
     1.9  {
    1.10  
    1.11  protected:
    1.12 @@ -55,7 +55,6 @@
    1.13  
    1.14      BEGIN_COM_MAP(CpEpEngine)
    1.15          COM_INTERFACE_ENTRY(IpEpEngine)
    1.16 -        COM_INTERFACE_ENTRY(IpEpEngine2)
    1.17          COM_INTERFACE_ENTRY(ISupportErrorInfo)
    1.18      END_COM_MAP()
    1.19  
    1.20 @@ -147,7 +146,6 @@
    1.21  
    1.22      IpEpEngineCallbacks* client_callbacks = NULL;
    1.23      IpEpEngineCallbacks* client_callbacks_on_sync_thread = NULL;
    1.24 -    IpEpEngineCallbacks2* client_callbacks2_on_sync_thread = NULL;
    1.25      bool client_last_signalled_polling_state = true;
    1.26  
    1.27      // Keysync members
    1.28 @@ -229,7 +227,13 @@
    1.29  
    1.30      // Message API
    1.31  
    1.32 -    STDMETHOD(EncryptMessage)(TextMessage * src, TextMessage * dst, SAFEARRAY * extra, pEpEncryptFlags flags);
    1.33 +    STDMETHOD(EncryptMessage)(
    1.34 +        /* [in] */ struct TextMessage *src,
    1.35 +        /* [out] */ struct TextMessage *dst,
    1.36 +        /* [in] */ SAFEARRAY * extra,
    1.37 +        /* [defaultvalue][in] */ pEpEncryptFlags flags = pEpEncryptFlagDefault,
    1.38 +        /* [defaultvalue][in] */ pEpEncFormat encFormat = pEpEncPep);
    1.39 +
    1.40      STDMETHOD(DecryptMessage)(TextMessage * src, TextMessage * dst, SAFEARRAY ** keylist, pEpDecryptFlags* flags, pEpRating *rating);
    1.41      STDMETHOD(ReEvaluateMessageRating)(TextMessage * msg, SAFEARRAY * x_KeyList, pEpRating x_EncStatus, pEpRating *rating);
    1.42      STDMETHOD(OutgoingMessageRating)(TextMessage *msg, pEpRating * pVal);