[git] GpgOL - branch, master, updated. gpgol-2.2.0-121-g4259c5d

[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, master has been updated
       via  4259c5d63d43873733237abcf78a126e49effc9c (commit)
       via  aa61e82d88aa984fb4ba92c37c60a6ae04916283 (commit)
       via  bbcf8708c827b3a252013036a3d302101245722d (commit)
       via  ec9387e439ce083298b56437ffeb494582ce1c26 (commit)
      from  333f17572f1e414eb5a41d477d5187e12f3307bf (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 4259c5d63d43873733237abcf78a126e49effc9c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 24 08:10:29 2018 +0200

    Return 0 for handled WindowMessages
    
    * src/windowmessages.cpp (gpgol_window_proc): Return 0 for
    messages handled by us.
    
    --
    Does not make sense to call the defaultwindowproc for our
    own messages.

diff --git a/src/windowmessages.cpp b/src/windowmessages.cpp
index 84c66b5..5f90e37 100644
--- a/src/windowmessages.cpp
+++ b/src/windowmessages.cpp
@@ -38,6 +38,7 @@ static int invalidation_blocked = 0;
 LONG_PTR WINAPI
 gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
+//  log_debug ("WMG: %x", (unsigned int) message);
   if (message == WM_USER + 42)
     {
       wm_ctx_t *ctx = (wm_ctx_t *) lParam;
@@ -226,7 +227,7 @@ gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             log_debug ("%s:%s: Unknown msg %x",
                        SRCNAME, __func__, ctx->wmsg_type);
         }
-        return DefWindowProc(hWnd, message, wParam, lParam);
+        return 0;
     }
   return DefWindowProc(hWnd, message, wParam, lParam);
 }
@@ -414,6 +415,7 @@ gpgol_hook(int code, WPARAM wParam, LPARAM lParam)
         } */
        break;
      default:
+//       log_debug ("WM: %x", (unsigned int) cwp->message);
        break;
     }
   return CallNextHookEx (NULL, code, wParam, lParam);

commit aa61e82d88aa984fb4ba92c37c60a6ae04916283
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 24 08:09:42 2018 +0200

    Trace timing of sig key request
    
    * src/parsecontroller.cpp (ParseController::parse): Add tracepoints.

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 20753b0..8dc0034 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -463,7 +463,9 @@ ParseController::parse()
 
       /* FIXME: This is very expensive. We need some caching here
          or reduce the information */
+      TRACEPOINT;
       sig.key(true, true);
+      TRACEPOINT;
       if (!ultimate_keys_queried &&
           (sig.validity() == Signature::Validity::Full ||
           sig.validity() == Signature::Validity::Ultimate))

commit bbcf8708c827b3a252013036a3d302101245722d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 24 08:08:02 2018 +0200

    Log invalid skipped secret keys
    
    * src/keycache.cpp (locate_secret): Log invalid skipped keys.
    
    --
    This might help in debug output if autoencrypt does not
    work for some.

diff --git a/src/keycache.cpp b/src/keycache.cpp
index 72eea28..a0eadba 100644
--- a/src/keycache.cpp
+++ b/src/keycache.cpp
@@ -32,6 +32,7 @@
 #include <windows.h>
 
 #include <map>
+#include <sstream>
 
 GPGRT_LOCK_DEFINE (keycache_lock);
 static KeyCache* singleton = nullptr;
@@ -484,8 +485,13 @@ locate_secret (const char *addr, GpgME::Protocol proto)
       if (key.isRevoked() || key.isExpired() ||
           key.isDisabled() || key.isInvalid())
         {
-          log_mime_parser ("%s:%s: Skipping invalid secret key",
-                           SRCNAME, __func__);
+          if ((opt.enable_debug & DBG_MIME_PARSER))
+            {
+              std::stringstream ss;
+              ss << key;
+              log_mime_parser ("%s:%s: Skipping invalid secret key %s",
+                               SRCNAME, __func__, ss.str().c_str());
+            }
           continue;
         }
       if (proto == GpgME::OpenPGP)

commit ec9387e439ce083298b56437ffeb494582ce1c26
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 24 08:06:58 2018 +0200

    Print parsed mail count in dbg output
    
    * src/mail.cpp (Mail::updateBody_o): Print parsed mail
    count.

diff --git a/src/mail.cpp b/src/mail.cpp
index 27fba3f..4ee4314 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1322,12 +1322,14 @@ Mail::updateBody_o ()
   return;
 }
 
+static int parsed_count;
+
 void
 Mail::parsing_done()
 {
   TRACEPOINT;
-  log_oom_extra ("Mail %p Parsing done for parser: %p",
-                 this, m_parser.get());
+  log_oom_extra ("Mail %p Parsing done for parser num %i: %p",
+                 this, parsed_count++, m_parser.get());
   if (!m_parser)
     {
       /* This should not happen but it happens when outlook

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

Summary of changes:
 src/keycache.cpp        | 10 ++++++++--
 src/mail.cpp            |  6 ++++--
 src/parsecontroller.cpp |  2 ++
 src/windowmessages.cpp  |  4 +++-
 4 files changed, 17 insertions(+), 5 deletions(-)


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