diff options
Diffstat (limited to 'tun/wintun/setupapi')
| -rw-r--r-- | tun/wintun/setupapi/setupapi_windows.go | 8 | ||||
| -rw-r--r-- | tun/wintun/setupapi/setupapi_windows_test.go | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tun/wintun/setupapi/setupapi_windows.go b/tun/wintun/setupapi/setupapi_windows.go index f736af5..71732a4 100644 --- a/tun/wintun/setupapi/setupapi_windows.go +++ b/tun/wintun/setupapi/setupapi_windows.go @@ -398,10 +398,10 @@ func SetupDiClassNameFromGuidEx(classGUID *windows.GUID, machineName string) (cl //sys setupDiClassGuidsFromNameEx(className *uint16, classGuidList *windows.GUID, classGuidListSize uint32, requiredSize *uint32, machineName *uint16, reserved uintptr) (err error) = setupapi.SetupDiClassGuidsFromNameExW // SetupDiClassGuidsFromNameEx function retrieves the GUIDs associated with the specified class name. This resulting list contains the classes currently installed on a local or remote computer. -func SetupDiClassGuidsFromNameEx(className string, machineName string) (classGuidLists []windows.GUID, err error) { +func SetupDiClassGuidsFromNameEx(className string, machineName string) ([]windows.GUID, error) { classNameUTF16, err := syscall.UTF16PtrFromString(className) if err != nil { - return + return nil, err } const bufCapacity = 4 @@ -412,7 +412,7 @@ func SetupDiClassGuidsFromNameEx(className string, machineName string) (classGui if machineName != "" { machineNameUTF16, err = syscall.UTF16PtrFromString(machineName) if err != nil { - return + return nil, err } } @@ -431,7 +431,7 @@ func SetupDiClassGuidsFromNameEx(className string, machineName string) (classGui } } - return + return nil, err } //sys setupDiGetSelectedDevice(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (err error) = setupapi.SetupDiGetSelectedDevice diff --git a/tun/wintun/setupapi/setupapi_windows_test.go b/tun/wintun/setupapi/setupapi_windows_test.go index cec95d5..30f3692 100644 --- a/tun/wintun/setupapi/setupapi_windows_test.go +++ b/tun/wintun/setupapi/setupapi_windows_test.go @@ -10,11 +10,11 @@ import ( "syscall" "testing" - "golang.zx2c4.com/wireguard/tun/wintun/guid" "golang.org/x/sys/windows" + "golang.zx2c4.com/wireguard/tun/wintun/guid" ) -var deviceClassNetGUID = windows.GUID{0x4d36e972, 0xe325, 0x11ce, [8]byte{0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}} +var deviceClassNetGUID = windows.GUID{Data1: 0x4d36e972, Data2: 0xe325, Data3: 0x11ce, Data4: [8]byte{0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}} var computerName string func init() { |