Merge with postrelease sync
authorThomas
Tue, 23 Jun 2020 08:42:22 +0200
branchsync
changeset 399a36efeba8921
parent 395 3ed6a4028c3e
parent 397 b3bcf0684dcc
child 400 ddaa2b00c51c
Merge with postrelease
     1.1 --- a/CpEpEngine.cpp	Tue Apr 14 17:24:50 2020 +0200
     1.2 +++ b/CpEpEngine.cpp	Tue Jun 23 08:42:22 2020 +0200
     1.3 @@ -627,7 +627,7 @@
     1.4      size_t size = SysStringLen(mimeText);
     1.5      ::message *_msg = NULL;
     1.6  
     1.7 -    PEP_STATUS status = mime_decode_message(_mimeText.c_str(), size, &_msg);
     1.8 +    PEP_STATUS status = mime_decode_message(_mimeText.c_str(), size, &_msg, nullptr);
     1.9      assert(status != ::PEP_OUT_OF_MEMORY);
    1.10      if (status == ::PEP_OUT_OF_MEMORY)
    1.11          return E_OUTOFMEMORY;
    1.12 @@ -664,7 +664,7 @@
    1.13  
    1.14      char *_mimeText;
    1.15  
    1.16 -    PEP_STATUS status = mime_encode_message(_msg, omitFields != 0, &_mimeText);
    1.17 +    PEP_STATUS status = mime_encode_message(_msg, omitFields != 0, &_mimeText, false);
    1.18      free_message(_msg);
    1.19  
    1.20      assert(status != ::PEP_OUT_OF_MEMORY);