[git] GpgOL - branch, async-enc, updated. gpgol-2.0.6-42-g1a1c949

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, async-enc has been updated
       via  1a1c949670faf05f1f1ea1b1f66ca808e9c026dd (commit)
      from  c5133586929626685ac6ceef57e775ac7761cdb0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a1c949670faf05f1f1ea1b1f66ca808e9c026dd
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Feb 20 14:41:47 2018 +0100

    Fix setting the account for WKS Mails
    
    * src/oomhelp.cpp (put_oom_disp): For VT_DISPATCH it is
    DISPID_PROPERTYPUTREF and not DISPID_PROPERTYPUT.
    * src/wks-helper.cpp (WKSHelper::send_mail): Properly release
    account.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index a72bace..69695f1 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -550,13 +550,13 @@ put_oom_disp (LPDISPATCH pDisp, const char *name, LPDISPATCH disp)
     return -1;
 
   dispparams.rgvarg = aVariant;
-  dispparams.rgvarg[0].vt = VT_DISPATCH | VT_BYREF;
+  dispparams.rgvarg[0].vt = VT_DISPATCH;
   dispparams.rgvarg[0].pdispVal = disp;
   dispparams.cArgs = 1;
   dispparams.rgdispidNamedArgs = &dispid_put;
   dispparams.cNamedArgs = 1;
   hr = pDisp->Invoke (dispid, IID_NULL, LOCALE_SYSTEM_DEFAULT,
-                      DISPATCH_PROPERTYPUT, &dispparams,
+                      DISPATCH_PROPERTYPUTREF, &dispparams,
                       NULL, &execpinfo, NULL);
   if (hr != S_OK)
     {
diff --git a/src/wks-helper.cpp b/src/wks-helper.cpp
index 3dbc31d..d993a11 100644
--- a/src/wks-helper.cpp
+++ b/src/wks-helper.cpp
@@ -451,10 +451,11 @@ WKSHelper::send_mail (const std::string &mimeData) const
   LPDISPATCH account = get_account_for_mail (from.c_str ());
   if (account)
     {
-      log_debug ("%s:%s: Changing account.",
-                 SRCNAME, __func__);
+      log_debug ("%s:%s: Found account to change for '%s'.",
+                 SRCNAME, __func__, from.c_str ());
       put_oom_disp (mail, "SendUsingAccount", account);
     }
+  gpgol_release (account);
 
   /* Now we have a problem. The created LPDISPATCH pointer has
      a different value then the one with which we saw the ItemLoad

-----------------------------------------------------------------------

Summary of changes:
 src/oomhelp.cpp    | 4 ++--
 src/wks-helper.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org