security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-21 19:48:05 +01:00
Code Activity

* w32reg.c (read_w32_registry_string): Fallback to HLM.

Browse Source
This commit is contained in:
Werner Koch 2002-09-16 20:37:55 +00:00
parent 62760da457
commit e3415c3549
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/ChangeLog
View File

@ -1,3 +1,7 @@
2002-09-16 Werner Koch <wk@gnupg.org>
* w32reg.c (read_w32_registry_string): Fallback to HLM.
2002-09-11 Werner Koch <wk@gnupg.org> 2002-09-11 Werner Koch <wk@gnupg.org>
* simple-gettext.c: Disable charset mappings. We do it now when * simple-gettext.c: Disable charset mappings. We do it now when

12
util/w32reg.c
View File

@ -1,5 +1,5 @@
/* w32reg.c - MS-Windows Registry access /* w32reg.c - MS-Windows Registry access
* Copyright (C) 1999 Free Software Foundation, Inc. * Copyright (C) 1999, 2002 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -59,7 +59,7 @@ get_root_key(const char *root)
/**************** /****************
* Return a string from the Win32 Registry or NULL in case of * Return a string from the Win32 Registry or NULL in case of
* error. Caller must release the return value. A NULL for root * error. Caller must release the return value. A NULL for root
* is an alias fro HKEY_CURRENT_USER * is an alias for HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE in turn.
* NOTE: The value is allocated with a plain malloc() - use free() and not * NOTE: The value is allocated with a plain malloc() - use free() and not
* the usual m_free()!!! * the usual m_free()!!!
*/ */
@ -74,7 +74,13 @@ read_w32_registry_string( const char *root, const char *dir, const char *name )
return NULL; return NULL;
if( RegOpenKeyEx( root_key, dir, 0, KEY_READ, &key_handle ) ) if( RegOpenKeyEx( root_key, dir, 0, KEY_READ, &key_handle ) )
return NULL; /* no need for a RegClose, so return direct */ {
if (root)
return NULL; /* no need for a RegClose, so return direct */
/* It seems to be common practise to fall back to HLM. */
if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
return NULL; /* still no need for a RegClose, so return direct */
}
nbytes = 1; nbytes = 1;
if( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) ) if( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) )