diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-23 15:18:58 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-23 15:26:55 +0200 |
| commit | bb4ae18c8a81f376c435b78fe80e087569a2efce (patch) | |
| tree | d0a5711d8f2fa18bdede241686a1608480aa5436 | |
| parent | ui: fix listview painting on win 7 classic theme and high contrast themes (diff) | |
| download | wireguard-windows-bb4ae18c8a81f376c435b78fe80e087569a2efce.tar.xz wireguard-windows-bb4ae18c8a81f376c435b78fe80e087569a2efce.zip | |
manager: use winpipe instead of winio
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
| -rw-r--r-- | go.mod | 4 | ||||
| -rw-r--r-- | manager/ipc_server.go | 4 | ||||
| -rw-r--r-- | updater/msirunner_windows.go | 4 |
3 files changed, 5 insertions, 7 deletions
@@ -1,14 +1,13 @@ module golang.zx2c4.com/wireguard/windows require ( - golang.zx2c4.com/wireguard v0.0.20190517 + golang.zx2c4.com/wireguard v0.0.20190518-0.20190523131602-8fdcf5ee30d9 golang.org/x/crypto latest golang.org/x/net latest golang.org/x/sys latest golang.org/x/text v0.3.0 - github.com/Microsoft/go-winio latest github.com/lxn/walk latest github.com/lxn/win latest ) @@ -16,5 +15,4 @@ require ( replace ( github.com/lxn/walk => golang.zx2c4.com/wireguard/windows pkg/walk github.com/lxn/win => golang.zx2c4.com/wireguard/windows pkg/walk-win - github.com/Microsoft/go-winio => golang.zx2c4.com/wireguard/windows pkg/winio ) diff --git a/manager/ipc_server.go b/manager/ipc_server.go index 0accb4d3..0aa7d3a4 100644 --- a/manager/ipc_server.go +++ b/manager/ipc_server.go @@ -17,9 +17,9 @@ import ( "sync/atomic" "time" - "github.com/Microsoft/go-winio" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" + "golang.zx2c4.com/wireguard/ipc/winpipe" "golang.zx2c4.com/wireguard/windows/conf" "golang.zx2c4.com/wireguard/windows/updater" @@ -53,7 +53,7 @@ func (s *ManagerService) RuntimeConfig(tunnelName string, config *conf.Config) e if err != nil { return err } - pipe, err := winio.DialPipe(pipePath, nil) + pipe, err := winpipe.DialPipe(pipePath, nil) if err != nil { return err } diff --git a/updater/msirunner_windows.go b/updater/msirunner_windows.go index 92fd4e0e..38acc0ac 100644 --- a/updater/msirunner_windows.go +++ b/updater/msirunner_windows.go @@ -16,8 +16,8 @@ import ( "syscall" "unsafe" - "github.com/Microsoft/go-winio" "golang.org/x/sys/windows" + "golang.zx2c4.com/wireguard/ipc/winpipe" ) func runMsi(msiPath string, userToken uintptr) error { @@ -61,7 +61,7 @@ func msiTempFile() (*os.File, error) { if n != int(len(randBytes)) { return nil, errors.New("Unable to generate random bytes") } - sd, err := winio.SddlToSecurityDescriptor("O:SYD:PAI(A;;FA;;;SY)(A;;FR;;;BA)") + sd, err := winpipe.SddlToSecurityDescriptor("O:SYD:PAI(A;;FA;;;SY)(A;;FR;;;BA)") if err != nil { return nil, err } |