CpEpEngine.h
branchCOM-74
changeset 271 92866cd8b0c4
parent 267 ae02fcd56811
child 273 30be98685afa
     1.1 --- a/CpEpEngine.h	Wed Feb 07 18:53:25 2018 +0100
     1.2 +++ b/CpEpEngine.h	Wed Feb 07 19:33:59 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 @@ -56,7 +56,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 @@ -133,7 +132,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 @@ -215,7 +213,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);
    1.43 @@ -229,13 +233,6 @@
    1.44          pEpEncryptFlags flags
    1.45          );
    1.46  
    1.47 -    STDMETHOD(EncryptMessage2)(
    1.48 -        /* [in] */ struct TextMessage *src,
    1.49 -        /* [out] */ struct TextMessage *dst,
    1.50 -        /* [in] */ SAFEARRAY * extra,
    1.51 -        /* [defaultvalue][in] */ pEpEncryptFlags flags = pEpEncryptFlagDefault,
    1.52 -        /* [defaultvalue][in] */ pEpEncFormat encFormat = pEpEncPep);
    1.53 -
    1.54      // Event callbacks
    1.55  
    1.56      STDMETHOD(RegisterCallbacks)(IpEpEngineCallbacks *new_callback);