diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2015-10-24 03:22:50 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2015-10-25 00:32:21 +0200 |
commit | 8a48f16de01eaa9f2c65baf43ab3168f68e0ad39 (patch) | |
tree | be350205f004266aecf2ab24084594b0eda5b3cc /nt | |
parent | 478d9d9db39af654abdfeb793f2d9c2ecb71daf1 (diff) |
addpm.c: Don't pass REG_OPTION_NON_VOLATILE to RegOpenKeyEx
* nt/addpm.c (add_registry): Pass 0 to ulOptions argument of
RegOpenKeyEx, not REG_OPTION_NON_VOLATILE. This doesn't change
current behavior because REG_OPTION_NON_VOLATILE is defined to
be 0L anyway, but that option is actually documented only for
RegCreateKeyEx.
Diffstat (limited to 'nt')
-rw-r--r-- | nt/addpm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nt/addpm.c b/nt/addpm.c index cd91a3e2d8..b2f0916098 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -138,7 +138,7 @@ add_registry (const char *path) /* Look for a GTK installation. If found, add it to the library search path for Emacs so that the image libraries it provides are available to Emacs regardless of whether it is in the path or not. */ - if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_GTK, REG_OPTION_NON_VOLATILE, + if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_GTK, 0, KEY_READ, >k_key) == ERROR_SUCCESS) { if (RegQueryValueEx (gtk_key, "DllPath", NULL, NULL, @@ -186,11 +186,9 @@ add_registry (const char *path) /* Check both the current user and the local machine to see if we have any resources. */ - if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT, - REG_OPTION_NON_VOLATILE, + if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT, 0, KEY_WRITE, &hrootkey) != ERROR_SUCCESS - && RegOpenKeyEx (HKEY_CURRENT_USER, REG_ROOT, - REG_OPTION_NON_VOLATILE, + && RegOpenKeyEx (HKEY_CURRENT_USER, REG_ROOT, 0, KEY_WRITE, &hrootkey) != ERROR_SUCCESS) { return FALSE; |