summaryrefslogtreecommitdiffhomepage
path: root/tun/wintun/registry/registry_windows.go
diff options
context:
space:
mode:
authorSimon Rozman <simon@rozman.si>2019-05-10 17:37:03 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-05-10 18:09:20 +0200
commit1c92b48415e7f68cce859b4adf95c5d1ce5df9e9 (patch)
treec368beaf4702a22840851e8a34fe54a9151e0e91 /tun/wintun/registry/registry_windows.go
parentc267965bf888de5abc66cc37b7ea61de12cbfc62 (diff)
wintun: registry: replace REG_NOTIFY with NOTIFY
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'tun/wintun/registry/registry_windows.go')
-rw-r--r--tun/wintun/registry/registry_windows.go14
1 files changed, 5 insertions, 9 deletions
diff --git a/tun/wintun/registry/registry_windows.go b/tun/wintun/registry/registry_windows.go
index 8c63c9b..415aa00 100644
--- a/tun/wintun/registry/registry_windows.go
+++ b/tun/wintun/registry/registry_windows.go
@@ -17,10 +17,6 @@ import (
)
const (
- KEY_NOTIFY uint32 = 0x0010 // should be defined upstream as registry.KEY_NOTIFY
-)
-
-const (
// REG_NOTIFY_CHANGE_NAME notifies the caller if a subkey is added or deleted.
REG_NOTIFY_CHANGE_NAME uint32 = 0x00000001
@@ -66,7 +62,7 @@ func OpenKeyWait(k registry.Key, path string, access uint32, timeout time.Durati
if isLast {
accessFlags = access
} else {
- accessFlags = KEY_NOTIFY
+ accessFlags = registry.NOTIFY
}
key, err = registry.OpenKey(k, keyName, accessFlags)
if err == windows.ERROR_FILE_NOT_FOUND || err == windows.ERROR_PATH_NOT_FOUND {
@@ -97,7 +93,7 @@ func OpenKeyWait(k registry.Key, path string, access uint32, timeout time.Durati
}
func WaitForKey(k registry.Key, path string, timeout time.Duration) error {
- key, err := OpenKeyWait(k, path, KEY_NOTIFY, timeout)
+ key, err := OpenKeyWait(k, path, registry.NOTIFY, timeout)
if err != nil {
return err
}
@@ -109,7 +105,7 @@ func WaitForKey(k registry.Key, path string, timeout time.Duration) error {
// getStringValueRetry function reads a string value from registry. It waits for
// the registry value to become available or returns error on timeout.
//
-// Key must be opened with at least QUERY_VALUE|KEY_NOTIFY access.
+// Key must be opened with at least QUERY_VALUE|NOTIFY access.
//
func getStringValueRetry(key registry.Key, name string, timeout time.Duration, useFirstFromMulti bool) (string, uint32, error) {
runtime.LockOSThread()
@@ -184,7 +180,7 @@ func expandString(value string, valueType uint32, err error) (string, error) {
// GetStringValueWait function reads a string value from registry. It waits
// for the registry value to become available or returns error on timeout.
//
-// Key must be opened with at least QUERY_VALUE|KEY_NOTIFY access.
+// Key must be opened with at least QUERY_VALUE|NOTIFY access.
//
// If the value type is REG_EXPAND_SZ the environment variables are expanded.
// Should expanding fail, original string value and nil error are returned.
@@ -217,7 +213,7 @@ func GetStringValue(key registry.Key, name string) (string, error) {
// It waits for the registry value to become available or returns error on
// timeout.
//
-// Key must be opened with at least QUERY_VALUE|KEY_NOTIFY access.
+// Key must be opened with at least QUERY_VALUE|NOTIFY access.
//
func GetIntegerValueWait(key registry.Key, name string, timeout time.Duration) (uint64, error) {
runtime.LockOSThread()