[git] GpgOL - branch, master, updated. gpgol-2.3.1-14-gbf4ab9a

[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  bf4ab9a6d16869aa6083b10b54a77fc9b8b95b41 (commit)
      from  b4c45c3a3ec98b900bcd785ea9261e33f5562e08 (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 bf4ab9a6d16869aa6083b10b54a77fc9b8b95b41
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 25 12:23:42 2018 +0200

    Explicitly set real access key for reg too
    
    * src/common.cpp (REAL_ACCESS): Define.
    
    --
    We have to make sure that we try both registry views.

diff --git a/src/common.cpp b/src/common.cpp
index 2140f25..dbc9187 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -109,8 +109,10 @@ get_root_key(const char *root)
 }
 #if defined(_WIN64)
 #define CROSS_ACCESS KEY_WOW64_32KEY
+#define REAL_ACCESS KEY_WOW64_64KEY
 #else
 #define CROSS_ACCESS KEY_WOW64_64KEY
+#define REAL_ACCESS KEY_WOW32_64KEY
 #endif
 
 std::string
@@ -129,6 +131,8 @@ _readRegStr (HKEY root_key, const char *dir,
 
     if (alternate) {
         flags |= CROSS_ACCESS;
+    } else {
+        flags |= REAL_ACCESS
     }
 
     if (RegOpenKeyExA(root_key, dir, 0, flags, &key_handle)) {

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

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


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