Skip to content

Commit a35907c

Browse files
zx2c4zx2c4
committed
mod: remove x/sys fork
Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent a803e17 commit a35907c

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎driver/wintunremoval_windows.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,31 @@ import (
99
"path/filepath"
1010

1111
"golang.org/x/sys/windows"
12-
"golang.org/x/sys/windows/setupapi"
1312
)
1413

1514
func UninstallLegacyWintun() error {
1615
var deviceClassNetGUID = &windows.GUID{0x4d36e972, 0xe325, 0x11ce, [8]byte{0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}
17-
devInfo, err := setupapi.SetupDiCreateDeviceInfoListEx(deviceClassNetGUID, 0, "")
16+
devInfo, err := windows.SetupDiCreateDeviceInfoListEx(deviceClassNetGUID, 0, "")
1817
if err != nil {
1918
return err
2019
}
2120
defer devInfo.Close()
22-
devInfoData, err := devInfo.CreateDeviceInfo("Wintun", deviceClassNetGUID, "", 0, setupapi.DICD_GENERATE_ID)
21+
devInfoData, err := devInfo.CreateDeviceInfo("Wintun", deviceClassNetGUID, "", 0, windows.DICD_GENERATE_ID)
2322
if err != nil {
2423
return err
2524
}
26-
err = devInfo.SetDeviceRegistryProperty(devInfoData, setupapi.SPDRP_HARDWAREID, []byte("W\x00i\x00n\x00t\x00u\x00n\x00\x00\x00\x00\x00"))
25+
err = devInfo.SetDeviceRegistryProperty(devInfoData, windows.SPDRP_HARDWAREID, []byte("W\x00i\x00n\x00t\x00u\x00n\x00\x00\x00\x00\x00"))
2726
if err != nil {
2827
return err
2928
}
30-
err = devInfo.BuildDriverInfoList(devInfoData, setupapi.SPDIT_COMPATDRIVER)
29+
err = devInfo.BuildDriverInfoList(devInfoData, windows.SPDIT_COMPATDRIVER)
3130
if err != nil {
3231
return err
3332
}
34-
defer devInfo.DestroyDriverInfoList(devInfoData, setupapi.SPDIT_COMPATDRIVER)
33+
defer devInfo.DestroyDriverInfoList(devInfoData, windows.SPDIT_COMPATDRIVER)
3534
var lastError error
3635
for i := 0; ; i++ {
37-
drvInfoData, err := devInfo.EnumDriverInfo(devInfoData, setupapi.SPDIT_COMPATDRIVER, i)
36+
drvInfoData, err := devInfo.EnumDriverInfo(devInfoData, windows.SPDIT_COMPATDRIVER, i)
3837
if err != nil {
3938
if err == windows.ERROR_NO_MORE_ITEMS {
4039
break
@@ -45,7 +44,7 @@ func UninstallLegacyWintun() error {
4544
if err != nil {
4645
continue
4746
}
48-
lastError = setupapi.SetupUninstallOEMInf(filepath.Base(drvInfoDetailData.InfFileName()), 0)
47+
lastError = windows.SetupUninstallOEMInf(filepath.Base(drvInfoDetailData.InfFileName()), 0)
4948
}
5049
return lastError
5150
}

‎go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.17
55
require (
66
github.com/lxn/walk v0.0.0-20210112085537-c389da54e794
77
github.com/lxn/win v0.0.0-20210218163916-a377121e959e
8-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
9-
golang.org/x/net v0.0.0-20211111083644-e5c967477495
10-
golang.org/x/sys v0.0.0-20211110154304-99a53858aa08
8+
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
9+
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9
10+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881
1111
golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2
1212
golang.zx2c4.com/go118/netip v0.0.0-20211111135330-a4a02eeacf9d
1313
)
@@ -21,5 +21,4 @@ require (
2121
replace (
2222
github.com/lxn/walk => golang.zx2c4.com/wireguard/windows v0.0.0-20210121140954-e7fc19d483bd
2323
github.com/lxn/win => golang.zx2c4.com/wireguard/windows v0.0.0-20210224134948-620c54ef6199
24-
golang.org/x/sys => golang.zx2c4.com/wireguard/windows v0.0.0-20211029170807-5c05bdce0504
2524
)

‎go.mod.master‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ require (
1515
replace (
1616
github.com/lxn/walk => golang.zx2c4.com/wireguard/windows pkg/walk
1717
github.com/lxn/win => golang.zx2c4.com/wireguard/windows pkg/walk-win
18-
golang.org/x/sys => golang.zx2c4.com/wireguard/windows pkg/sys
1918
)

‎go.sum‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
22
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
3-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4=
4-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
3+
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI=
4+
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
55
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
66
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
77
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
88
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
9-
golang.org/x/net v0.0.0-20211111083644-e5c967477495/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
9+
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1010
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
11+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
12+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
13+
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
14+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc=
15+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1116
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
1217
golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2 h1:GLw7MR8AfAG2GmGcmVgObFOHXYypgGjnGno25RDwn3Y=
1318
golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2/go.mod h1:EFNZuWvGYxIRUEX+K8UmCFwYmZjqcrnq15ZuVldZkZ0=
@@ -24,5 +29,3 @@ golang.zx2c4.com/wireguard/windows v0.0.0-20210121140954-e7fc19d483bd h1:kAUzMAI
2429
golang.zx2c4.com/wireguard/windows v0.0.0-20210121140954-e7fc19d483bd/go.mod h1:Y+FYqVFaQO6a+1uigm0N0GiuaZrLEaBxEiJ8tfH9sMQ=
2530
golang.zx2c4.com/wireguard/windows v0.0.0-20210224134948-620c54ef6199 h1:ogXKLng/Myrt2odYTkleySGzQj/GWg9GV1AQ8P9NnU4=
2631
golang.zx2c4.com/wireguard/windows v0.0.0-20210224134948-620c54ef6199/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
27-
golang.zx2c4.com/wireguard/windows v0.0.0-20211029170807-5c05bdce0504 h1:nieMJi73mSTXbdllDz6R7Es9QoYOry/q88v1F45ev4A=
28-
golang.zx2c4.com/wireguard/windows v0.0.0-20211029170807-5c05bdce0504/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

‎services/boot.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func StartedAtBoot() bool {
2727
return
2828
}
2929
if reason, err := svc.DynamicStartReason(); err == nil {
30-
startedAtBoot = (reason & svc.StartReasonAuto) != 0 || (reason & svc.StartReasonDelayedAuto) != 0
30+
startedAtBoot = (reason&svc.StartReasonAuto) != 0 || (reason&svc.StartReasonDelayedAuto) != 0
3131
} else if errors.Is(err, windows.ERROR_PROC_NOT_FOUND) {
3232
// TODO: Below this line is Windows 7 compatibility code, which hopefully we can delete at some point.
3333
startedAtBoot = windows.DurationSinceBoot() < time.Minute*10
@@ -44,4 +44,4 @@ func PrintStarting() {
4444
boot = " at boot"
4545
}
4646
log.Printf("Starting%s %s", boot, version.UserAgent())
47-
}
47+
}

0 commit comments

Comments
 (0)