diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-14 00:39:14 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-16 18:17:05 +0100 |
commit | 3e294f9c63fd6fea6981c8f4cc265cfea6570f02 (patch) | |
tree | 6e64060b1c3dc40f88eefc91b929a47b39301117 /updater | |
parent | build: llvm doesnt like dashes (diff) | |
download | wireguard-windows-3e294f9c63fd6fea6981c8f4cc265cfea6570f02.tar.xz wireguard-windows-3e294f9c63fd6fea6981c8f4cc265cfea6570f02.zip |
mod: bump x/sys for IsWow64Process2
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'updater')
-rw-r--r-- | updater/syscall_windows.go | 19 | ||||
-rw-r--r-- | updater/versions_arm.go | 23 | ||||
-rw-r--r-- | updater/zsyscall_windows.go | 52 |
3 files changed, 8 insertions, 86 deletions
diff --git a/updater/syscall_windows.go b/updater/syscall_windows.go deleted file mode 100644 index 074ec164..00000000 --- a/updater/syscall_windows.go +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: MIT - * - * Copyright (C) 2019-2020 WireGuard LLC. All Rights Reserved. - */ - -package updater - -import "golang.org/x/sys/windows" - -//sys isWow64Process2Internal(process windows.Handle, processMachine *uint16, nativeMachine *uint16) (err error) = kernel32.IsWow64Process2 - -func isWow64Process2(process windows.Handle) (processMachine, nativeMachine uint16, err error) { - err = procIsWow64Process2.Find() - if err != nil { - return - } - err = isWow64Process2Internal(process, &processMachine, &nativeMachine) - return -} diff --git a/updater/versions_arm.go b/updater/versions_arm.go index f3e43ec3..45b53be5 100644 --- a/updater/versions_arm.go +++ b/updater/versions_arm.go @@ -12,24 +12,17 @@ import ( "golang.org/x/sys/windows" ) -func findArch() (arch string, err error) { - process := windows.CurrentProcess() - _, nativeMachine, err2 := isWow64Process2(process) - if err2 != nil { - var isWow64 bool - if windows.IsWow64Process(process, &isWow64) != nil || !isWow64 { - nativeMachine = pe.IMAGE_FILE_MACHINE_ARMNT - } else { - nativeMachine = pe.IMAGE_FILE_MACHINE_ARM64 - } +func findArch() (string, error) { + var processMachine, nativeMachine uint16 + err := windows.IsWow64Process2(windows.CurrentProcess(), &processMachine, &nativeMachine) + if err != nil { + return "", err } switch nativeMachine { case pe.IMAGE_FILE_MACHINE_ARM64: - arch = "arm64" + return "arm64", nil case pe.IMAGE_FILE_MACHINE_ARMNT: - arch = "arm" - default: - err = errors.New("Invalid GOARCH") + return "arm", nil } - return + return "", errors.New("Invalid GOARCH") } diff --git a/updater/zsyscall_windows.go b/updater/zsyscall_windows.go deleted file mode 100644 index a2d32cc9..00000000 --- a/updater/zsyscall_windows.go +++ /dev/null @@ -1,52 +0,0 @@ -// Code generated by 'go generate'; DO NOT EDIT. - -package updater - -import ( - "syscall" - "unsafe" - - "golang.org/x/sys/windows" -) - -var _ unsafe.Pointer - -// Do the interface allocations only once for common -// Errno values. -const ( - errnoERROR_IO_PENDING = 997 -) - -var ( - errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING) - errERROR_EINVAL error = syscall.EINVAL -) - -// errnoErr returns common boxed Errno values, to prevent -// allocations at runtime. -func errnoErr(e syscall.Errno) error { - switch e { - case 0: - return errERROR_EINVAL - case errnoERROR_IO_PENDING: - return errERROR_IO_PENDING - } - // TODO: add more here, after collecting data on the common - // error values see on Windows. (perhaps when running - // all.bat?) - return e -} - -var ( - modkernel32 = windows.NewLazySystemDLL("kernel32.dll") - - procIsWow64Process2 = modkernel32.NewProc("IsWow64Process2") -) - -func isWow64Process2Internal(process windows.Handle, processMachine *uint16, nativeMachine *uint16) (err error) { - r1, _, e1 := syscall.Syscall(procIsWow64Process2.Addr(), 3, uintptr(process), uintptr(unsafe.Pointer(processMachine)), uintptr(unsafe.Pointer(nativeMachine))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} |