Merge with default COM-106
authorThomas
Tue, 23 Jun 2020 08:49:02 +0200
branchCOM-106
changeset 401df0ff08617db
parent 398 5adaf85b6ca4
parent 400 ddaa2b00c51c
Merge with default
CpEpEngine.cpp
     1.1 --- a/.hgtags	Mon Jun 15 09:27:11 2020 +0200
     1.2 +++ b/.hgtags	Tue Jun 23 08:49:02 2020 +0200
     1.3 @@ -1,2 +1,3 @@
     1.4  9db6ab24dee732a6125e1a44968cd988492340bb for_Outlook-1.1.10
     1.5  9b14d293f6f19447ae70dc16c491664d7deb80cd Release 1.0.200
     1.6 +bef6f1b3af882537be1904b4072d591c3b7ce7f2 Release_2.0.0
     2.1 --- a/CpEpEngine.cpp	Mon Jun 15 09:27:11 2020 +0200
     2.2 +++ b/CpEpEngine.cpp	Tue Jun 23 08:49:02 2020 +0200
     2.3 @@ -627,7 +627,7 @@
     2.4      size_t size = SysStringLen(mimeText);
     2.5      ::message *_msg = NULL;
     2.6  
     2.7 -    PEP_STATUS status = mime_decode_message(_mimeText.c_str(), size, &_msg);
     2.8 +    PEP_STATUS status = mime_decode_message(_mimeText.c_str(), size, &_msg, nullptr);
     2.9      assert(status != ::PEP_OUT_OF_MEMORY);
    2.10      if (status == ::PEP_OUT_OF_MEMORY)
    2.11          return E_OUTOFMEMORY;
    2.12 @@ -664,7 +664,7 @@
    2.13  
    2.14      char *_mimeText;
    2.15  
    2.16 -    PEP_STATUS status = mime_encode_message(_msg, omitFields != 0, &_mimeText);
    2.17 +    PEP_STATUS status = mime_encode_message(_msg, omitFields != 0, &_mimeText, false);
    2.18      free_message(_msg);
    2.19  
    2.20      assert(status != ::PEP_OUT_OF_MEMORY);