[git] GpgOL - branch, master, updated. gpgol-2.3.1-11-g2fbb76c
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Oct 24 14:46:14 CEST 2018
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 2fbb76c2d31813399203882eca98866566363815 (commit)
via c321d3c3394bd04cb1f12be288f6e5cacb3fba32 (commit)
via ba8e0516d784a366d676350ae9e87fed41d89224 (commit)
from 56ea58e405b57dcc46f6e8a02dd8dca5a619ef31 (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 2fbb76c2d31813399203882eca98866566363815
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 24 14:45:33 2018 +0200
Pass --w64 parameter to gpgolconfig
* src/addin-options.cpp (open_gpgolconfig): Pass --64 on
64 bit systems.
diff --git a/src/addin-options.cpp b/src/addin-options.cpp
index 137d880..c228b17 100644
--- a/src/addin-options.cpp
+++ b/src/addin-options.cpp
@@ -188,6 +188,10 @@ open_gpgolconfig (LPVOID arg)
args.push_back (std::string ("--lang"));
args.push_back (std::string (gettext_localename ()));
+#ifdef _WIN64
+ args.push_back (std::string ("--w64"));
+#endif
+
auto ctx = GpgME::Context::createForEngine (GpgME::SpawnEngine);
if (!ctx)
{
commit c321d3c3394bd04cb1f12be288f6e5cacb3fba32
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 24 13:16:06 2018 +0200
Revert "Add temporary logging to readRegStr"
This reverts commit 0ab051af6406cb877200f651ca23ebf1ead6482a.
diff --git a/src/common.cpp b/src/common.cpp
index ef232b4..72fa16f 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -108,15 +108,6 @@ get_root_key(const char *root)
return root_key;
}
-const char *nullguard (const char *str)
-{
- if (str)
- {
- return str;
- }
- return "null";
-}
-
static std::string
readRegStr (const char *root, const char *dir, const char *name)
{
@@ -129,47 +120,34 @@ readRegStr (const char *root, const char *dir, const char *name)
DWORD n1, nbytes, type;
std::string ret;
- log_debug ("Read reg str root: '%s', '%s', '%s'",
- nullguard(root), nullguard(dir), nullguard(name));
-
if (!(root_key = get_root_key(root))) {
- log_debug("Failed to get root key");
return ret;
}
if (RegOpenKeyExA(root_key, dir, 0, KEY_READ, &key_handle)) {
- log_debug("Failed to open root");
if (root) {
- log_debug("Failed to open root with forced root");
/* no need for a RegClose, so return direct */
return ret;
}
/* Fallback to HKLM */
- log_debug("Fallback to HKLM");
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle)) {
- log_debug("HKLM open failed");
return ret;
}
}
nbytes = 1;
if (RegQueryValueExA(key_handle, name, 0, nullptr, nullptr, &nbytes)) {
- log_debug("Query Value failed");
if (root) {
- log_debug("Forced root: bail!");
RegCloseKey (key_handle);
return ret;
}
/* Try to fallback to HKLM also vor a missing value. */
- log_debug("HKLM Value fallback!");
RegCloseKey (key_handle);
if (RegOpenKeyExA (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle)) {
- log_debug("Failed to open key");
return ret;
}
if (RegQueryValueExA(key_handle, name, 0, nullptr, nullptr, &nbytes)) {
- log_debug("Failed to open fallback value for %s", nullguard(name));
RegCloseKey(key_handle);
return ret;
}
@@ -177,7 +155,6 @@ 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)) {
- log_debug ("Query Value real failed");
RegCloseKey(key_handle);
return ret;
}
@@ -204,7 +181,6 @@ readRegStr (const char *root, const char *dir, const char *name)
ret = tmp;
}
}
- log_debug ("returning: %s", ret.c_str ());
return ret;
#endif
}
commit ba8e0516d784a366d676350ae9e87fed41d89224
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 24 13:15:57 2018 +0200
Revert "Addionally add outputdebugstring debugs"
This reverts commit 56ea58e405b57dcc46f6e8a02dd8dca5a619ef31.
diff --git a/src/common.cpp b/src/common.cpp
index 71192e1..ef232b4 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -132,22 +132,14 @@ 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;
@@ -155,9 +147,7 @@ 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;
}
@@ -165,25 +155,20 @@ 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;
@@ -192,7 +177,6 @@ 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;
@@ -220,9 +204,6 @@ 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/addin-options.cpp | 4 ++++
src/common.cpp | 43 -------------------------------------------
2 files changed, 4 insertions(+), 43 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list