[git] GpgOL - branch, master, updated. gpgol-1.4.0-246-g0af871c

by Andre Heinecke cvs at cvs.gnupg.org
Fri Jan 13 12:36:23 CET 2017


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, master has been updated
       via  0af871c4f9969b6f2324fc26c3ceae8702b16151 (commit)
       via  fde0567164d55520d726a001a179d8350da7acce (commit)
      from  54c973fd2e45ee71664a89c500b00d5088107081 (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 0af871c4f9969b6f2324fc26c3ceae8702b16151
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jan 13 12:35:25 2017 +0100

    Do not release the central application obj
    
    * src/oomhelp.cpp (get_active_hwnd): Do not release central
    application Object.
    
    --
    This was a 0x8000FFFF

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index dba6cae..85d1c46 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -1680,8 +1680,6 @@ get_active_hwnd ()
     }
 
   LPDISPATCH activeWindow = get_oom_object (app, "ActiveWindow");
-  gpgol_release (app);
-
   if (!activeWindow)
     {
       TRACEPOINT;

commit fde0567164d55520d726a001a179d8350da7acce
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jan 13 12:34:30 2017 +0100

    Handle QueryInterface errors
    
    * src/oomhelp.cpp (get_oom_object): Handle QueryInterface errors.
    
    --
    Not a problem in practice but noticed that an error there is
    unhandled while debugging another problem.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 87665d2..dba6cae 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -188,7 +188,13 @@ get_oom_object (LPDISPATCH pStart, const char *fullname)
           gpgol_release (pDisp);
           pDisp = NULL;
         }
-      pObj->QueryInterface (IID_IDispatch, (LPVOID*)&pDisp);
+      if (pObj->QueryInterface (IID_IDispatch, (LPVOID*)&pDisp) != S_OK)
+        {
+          log_error ("%s:%s Object does not support IDispatch",
+                     SRCNAME, __func__);
+          gpgol_release (pObj);
+          return NULL;
+        }
       if (pObj != pStart)
         gpgol_release (pObj);
       pObj = NULL;

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

Summary of changes:
 src/oomhelp.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


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




More information about the Gnupg-commits mailing list