From ea7aba6e605d0469fc5c9cf38bafa7eb46e69c22 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 2 Aug 2022 12:25:23 +0200 Subject: gpgconf: Improve registry dumping. * common/w32-reg.c (read_w32_reg_string): Add arg r_hklm_fallback and change all callers. (show_configs): Indicate whether the HKLM fallback was used. * tools/gpgconf.c (show_other_registry_entries): Fix the Outlook Addin Registry key. Indicate whether the HKLM fallback was used. -- Note that this is backport from 2.2. The new support there for REG_DWORD needs to be implemented in libgpg-error, though. --- common/t-w32-reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/t-w32-reg.c') diff --git a/common/t-w32-reg.c b/common/t-w32-reg.c index 9665003ea..1a44e385c 100644 --- a/common/t-w32-reg.c +++ b/common/t-w32-reg.c @@ -56,7 +56,7 @@ test_read_registry (void) string2 = read_w32_reg_string ("HKCU\\Software\\Microsoft\\Windows\\CurrentVersion" - "\\Internet Settings:User Agent"); + "\\Internet Settings:User Agent", NULL); if (!string2) fail (1); fprintf (stderr, "User agent: %s\n", string2); @@ -76,7 +76,7 @@ main (int argc, char **argv) { if (argc > 1) { - char *string = read_w32_reg_string (argv[1]); + char *string = read_w32_reg_string (argv[1], NULL); printf ("%s -> %s\n", argv[1], string? string : "(null)"); xfree (string); } -- cgit v1.2.3