wintun: registry: replace REG_NOTIFY with NOTIFY

Signed-off-by: Simon Rozman <simon@rozman.si>

diff --git a/tun/wintun/registry/registry_windows.go b/tun/wintun/registry/registry_windows.go
index 8c63c9b4e05789ded88c25932aa21610d48c87ac..415aa009b535d6e6a3b3f2c2e076dff52f8acad7 100644 (file)
--- a/tun/wintun/registry/registry_windows.go
+++ b/tun/wintun/registry/registry_windows.go
@@ -16,10 +16,6 @@ import (
        "golang.org/x/sys/windows/registry"
 )
 
-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()

diff --git a/tun/wintun/registry/registry_windows_test.go b/tun/wintun/registry/registry_windows_test.go
index c5a6e28cf6fadeb9f995457533c1edc52f259baa..c56b51bb28ac6e59ef0ad23afee95584765ca7dd 100644 (file)
--- a/tun/wintun/registry/registry_windows_test.go
+++ b/tun/wintun/registry/registry_windows_test.go
@@ -66,7 +66,7 @@ func Test_GetValueWait(t *testing.T) {
                key.Close()
        }()
 
-       key, err := OpenKeyWait(keyRoot, path, registry.QUERY_VALUE|KEY_NOTIFY, time.Second*2)
+       key, err := OpenKeyWait(keyRoot, path, registry.QUERY_VALUE|registry.NOTIFY, time.Second*2)
        if err != nil {
                t.Errorf("Error waiting for registry key: %v", err)
        }

diff --git a/tun/wintun/wintun_windows.go b/tun/wintun/wintun_windows.go
index 8163f94c671dac81a8930d02a7d8ac570d719f78..7327f98b22b9bd09f4e6e5e186ab0691fedc4c6f 100644 (file)
--- a/tun/wintun/wintun_windows.go
+++ b/tun/wintun/wintun_windows.go
@@ -299,7 +299,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
                        if i != 0 {
                                time.Sleep(pollTimeout)
                        }
-                       key, err = devInfoList.OpenDevRegKey(deviceData, setupapi.DICS_FLAG_GLOBAL, 0, setupapi.DIREG_DRV, registry.QUERY_VALUE|registryEx.KEY_NOTIFY)
+                       key, err = devInfoList.OpenDevRegKey(deviceData, setupapi.DICS_FLAG_GLOBAL, 0, setupapi.DIREG_DRV, registry.QUERY_VALUE|registry.NOTIFY)
                        if err == nil {
                                break
                        }
@@ -326,7 +326,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
                key, err = registryEx.OpenKeyWait(
                        registry.LOCAL_MACHINE,
                        wintun.GetNetRegKeyName(),
-                       registry.QUERY_VALUE|registryEx.KEY_NOTIFY,
+                       registry.QUERY_VALUE|registry.NOTIFY,
                        waitForRegistryTimeout)
                if err == nil {
                        _, err = registryEx.GetStringValueWait(key, "Name", waitForRegistryTimeout)
@@ -338,7 +338,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
                // Wait for TCP/IP adapter registry key to emerge and populate.
                key, err = registryEx.OpenKeyWait(
                        registry.LOCAL_MACHINE,
-                       wintun.GetTcpipAdapterRegKeyName(), registry.QUERY_VALUE|registryEx.KEY_NOTIFY,
+                       wintun.GetTcpipAdapterRegKeyName(), registry.QUERY_VALUE|registry.NOTIFY,
                        waitForRegistryTimeout)
                if err == nil {
                        _, err = registryEx.GetFirstStringValueWait(key, "IpConfig", waitForRegistryTimeout)