[git] GpgOL - branch, master, updated. gpgol-2.3.1-8-g56ea58e

[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  56ea58e405b57dcc46f6e8a02dd8dca5a619ef31 (commit)
      from  0ab051af6406cb877200f651ca23ebf1ead6482a (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 56ea58e405b57dcc46f6e8a02dd8dca5a619ef31
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 24 13:04:39 2018 +0200

    Addionally add outputdebugstring debugs
    
    --
    This commit is also temporary.

diff --git a/src/common.cpp b/src/common.cpp
index ef232b4..71192e1 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -132,14 +132,22 @@ readRegStr (const char *root, const char *dir, const char *name)
     log_debug ("Read reg str root: '%s', '%s', '%s'",
                nullguard(root), nullguard(dir), nullguard(name));
 
+    OutputDebugStringA ("----GPGOL Registry load one value start ----");
+    OutputDebugStringA (nullguard (root));
+    OutputDebugStringA (nullguard (dir));
+    OutputDebugStringA (nullguard (name));
+
     if (!(root_key = get_root_key(root))) {
+        OutputDebugStringA ("TRACE 1");
         log_debug("Failed to get root key");
         return ret;
     }
 
     if (RegOpenKeyExA(root_key, dir, 0, KEY_READ, &key_handle)) {
+        OutputDebugStringA ("TRACE 2");
         log_debug("Failed to open root");
         if (root) {
+            OutputDebugStringA ("TRACE 3");
             log_debug("Failed to open root with forced root");
             /* no need for a RegClose, so return direct */
             return ret;
@@ -147,7 +155,9 @@ readRegStr (const char *root, const char *dir, const char *name)
         /* Fallback to HKLM */
 
         log_debug("Fallback to HKLM");
+        OutputDebugStringA ("TRACE 4");
         if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle)) {
+            OutputDebugStringA ("TRACE 5");
             log_debug("HKLM open failed");
             return ret;
         }
@@ -155,20 +165,25 @@ readRegStr (const char *root, const char *dir, const char *name)
 
     nbytes = 1;
     if (RegQueryValueExA(key_handle, name, 0, nullptr, nullptr, &nbytes)) {
+        OutputDebugStringA ("TRACE 6");
         log_debug("Query Value failed");
         if (root) {
             log_debug("Forced root: bail!");
+            OutputDebugStringA ("TRACE 7");
             RegCloseKey (key_handle);
             return ret;
         }
         /* Try to fallback to HKLM also vor a missing value.  */
         log_debug("HKLM Value fallback!");
+        OutputDebugStringA ("TRACE 8");
         RegCloseKey (key_handle);
         if (RegOpenKeyExA (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle)) {
+            OutputDebugStringA ("TRACE 9");
             log_debug("Failed to open key");
             return ret;
         }
         if (RegQueryValueExA(key_handle, name, 0, nullptr, nullptr, &nbytes)) {
+            OutputDebugStringA ("TRACE 10");
             log_debug("Failed to open fallback value for %s", nullguard(name));
             RegCloseKey(key_handle);
             return ret;
@@ -177,6 +192,7 @@ readRegStr (const char *root, const char *dir, const char *name)
     n1 = nbytes+1;
     char result[n1];
     if (RegQueryValueExA(key_handle, name, 0, &type, (LPBYTE)result, &n1)) {
+        OutputDebugStringA ("TRACE 11");
         log_debug ("Query Value real failed");
         RegCloseKey(key_handle);
         return ret;
@@ -204,6 +220,9 @@ readRegStr (const char *root, const char *dir, const char *name)
             ret = tmp;
         }
     }
+    OutputDebugStringA ("Value is:");
+    OutputDebugStringA (ret.c_str ());
+    OutputDebugStringA ("-------------- Load one value end ----------");
     log_debug ("returning: %s", ret.c_str ());
     return ret;
 #endif

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

Summary of changes:
 src/common.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)


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