summaryrefslogtreecommitdiffhomepage
path: root/tun/wintun/setupapi
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-06-06 22:28:13 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-06-06 22:39:20 +0200
commit6d8b68c8f3cd7c9e9560c23e5f20e3ec4bc4fb6e (patch)
tree85c434b738a0dff4d790d691d4df1ebff9ed1683 /tun/wintun/setupapi
parentc2ed133df80392a1592a6b0b79228041dd725427 (diff)
wintun: guid functions are upstream
Diffstat (limited to 'tun/wintun/setupapi')
-rw-r--r--tun/wintun/setupapi/setupapi_windows_test.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/tun/wintun/setupapi/setupapi_windows_test.go b/tun/wintun/setupapi/setupapi_windows_test.go
index a2edab8..b932d7d 100644
--- a/tun/wintun/setupapi/setupapi_windows_test.go
+++ b/tun/wintun/setupapi/setupapi_windows_test.go
@@ -11,7 +11,6 @@ import (
"testing"
"golang.org/x/sys/windows"
- "golang.zx2c4.com/wireguard/tun/wintun/guid"
)
var deviceClassNetGUID = windows.GUID{Data1: 0x4d36e972, Data2: 0xe325, Data3: 0x11ce, Data4: [8]byte{0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}
@@ -323,10 +322,10 @@ func TestSetupDiGetDeviceRegistryProperty(t *testing.T) {
} else if valStr, ok := val.(string); !ok {
t.Errorf("SetupDiGetDeviceRegistryProperty(SPDRP_CLASSGUID) should return string")
} else {
- classGUID, err := guid.FromString(valStr)
+ classGUID, err := windows.GUIDFromString(valStr)
if err != nil {
t.Errorf("Error parsing GUID returned by SetupDiGetDeviceRegistryProperty(SPDRP_CLASSGUID): %s", err.Error())
- } else if *classGUID != deviceClassNetGUID {
+ } else if classGUID != deviceClassNetGUID {
t.Errorf("SetupDiGetDeviceRegistryProperty(SPDRP_CLASSGUID) should return %x", deviceClassNetGUID)
}
}