X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=725844b615fc0e7456e8423c7b75e5f6bf2c9fd7;hb=a90eade7d022451e92bedcebe816651df7bf0d17;hp=42c542590ad7a25ee71bd97e73fcc7dbe892b8e4;hpb=f7f20a0b3ecbb0e1a2eb59f95b50f0625b37c671;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index 42c5425..725844b 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -457,7 +457,7 @@ void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned
   if (! ok) *buffer = default_value;
 }
 
-HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam) {
+HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, bool must_exist) {
   /* Get registry */
   TCHAR registry[KEY_LENGTH];
   HKEY key;
@@ -470,14 +470,16 @@ HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam) {
     return 0;
   }
 
-  if (sam & KEY_WRITE) {
+  if (sam & KEY_SET_VALUE) {
     if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, sam, 0, &key, 0) != ERROR_SUCCESS) {
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);
       return 0;
     }
   }
   else {
-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, sam, &key) != ERROR_SUCCESS) {
+    long error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, sam, &key);
+    if (error != ERROR_SUCCESS) {
+      if (error == ERROR_FILE_NOT_FOUND && ! must_exist) return 0;
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);
       return 0;
     }
@@ -486,8 +488,12 @@ HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam) {
   return key;
 }
 
+HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam) {
+  return open_registry(service_name, sub, sam, true);
+}
+
 HKEY open_registry(const TCHAR *service_name, REGSAM sam) {
-  return open_registry(service_name, 0, sam);
+  return open_registry(service_name, 0, sam, true);
 }
 
 int get_io_parameters(nssm_service_t *service, HKEY key) {