Update golangci-lint action. (jchv#42)

* Update golangci-lint action.

* Update comproc for Go 1.18.

Author: jchv

.github/workflows/go.yml

@@ -33,7 +33,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-go@v3
+      with:
+        go-version: 1.18
     - name: Lint
-      uses: golangci/golangci-lint-action@v2
+      uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.44
+        version: v1.45

pkg/edge/comproc.go

@@ -0,0 +1,13 @@
+package edge
+
+import (
+	"golang.org/x/sys/windows"
+)
+
+// ComProc stores a COM procedure.
+type ComProc uintptr
+
+// NewComProc creates a new COM proc from a Go function.
+func NewComProc(fn interface{}) ComProc {
+	return ComProc(windows.NewCallback(fn))
+}

pkg/edge/comproc_go17.go

@@ -0,0 +1,51 @@
+//go:build !go1.18
+// +build !go1.18
+
+package edge
+
+import "syscall"
+
+//go:uintptrescapes
+// Call calls a COM procedure.
+func (p ComProc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
+	// The magic uintptrescapes comment is needed to prevent moving uintptr(unsafe.Pointer(p)) so calls to .Call() also
+	// satisfy the unsafe.Pointer rule "(4) Conversion of a Pointer to a uintptr when calling syscall.Syscall."
+	// Otherwise it might be that pointers get moved, especially pointer onto the Go stack which might grow dynamically.
+	// See https://pkg.go.dev/unsafe#Pointer and https://github.com/golang/go/issues/34474
+	switch len(a) {
+	case 0:
+		return syscall.Syscall(uintptr(p), 0, 0, 0, 0)
+	case 1:
+		return syscall.Syscall(uintptr(p), 1, a[0], 0, 0)
+	case 2:
+		return syscall.Syscall(uintptr(p), 2, a[0], a[1], 0)
+	case 3:
+		return syscall.Syscall(uintptr(p), 3, a[0], a[1], a[2])
+	case 4:
+		return syscall.Syscall6(uintptr(p), 4, a[0], a[1], a[2], a[3], 0, 0)
+	case 5:
+		return syscall.Syscall6(uintptr(p), 5, a[0], a[1], a[2], a[3], a[4], 0)
+	case 6:
+		return syscall.Syscall6(uintptr(p), 6, a[0], a[1], a[2], a[3], a[4], a[5])
+	case 7:
+		return syscall.Syscall9(uintptr(p), 7, a[0], a[1], a[2], a[3], a[4], a[5], a[6], 0, 0)
+	case 8:
+		return syscall.Syscall9(uintptr(p), 8, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], 0)
+	case 9:
+		return syscall.Syscall9(uintptr(p), 9, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8])
+	case 10:
+		return syscall.Syscall12(uintptr(p), 10, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], 0, 0)
+	case 11:
+		return syscall.Syscall12(uintptr(p), 11, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], 0)
+	case 12:
+		return syscall.Syscall12(uintptr(p), 12, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11])
+	case 13:
+		return syscall.Syscall15(uintptr(p), 13, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], 0, 0)
+	case 14:
+		return syscall.Syscall15(uintptr(p), 14, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], 0)
+	case 15:
+		return syscall.Syscall15(uintptr(p), 15, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14])
+	default:
+		panic("too many arguments")
+	}
+}

pkg/edge/comproc_go18.go

@@ -0,0 +1,16 @@
+//go:build go1.18
+// +build go1.18
+
+package edge
+
+import "syscall"
+
+//go:uintptrescapes
+// Call calls a COM procedure.
+func (p ComProc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
+	// The magic uintptrescapes comment is needed to prevent moving uintptr(unsafe.Pointer(p)) so calls to .Call() also
+	// satisfy the unsafe.Pointer rule "(4) Conversion of a Pointer to a uintptr when calling syscall.Syscall."
+	// Otherwise it might be that pointers get moved, especially pointer onto the Go stack which might grow dynamically.
+	// See https://pkg.go.dev/unsafe#Pointer and https://github.com/golang/go/issues/34474
+	return syscall.SyscallN(uintptr(p), a...)
+}

pkg/edge/corewebview2.go

@@ -6,7 +6,6 @@ package edge
 import (
 	"log"
 	"runtime"
-	"syscall"
 	"unsafe"
 
 	"github.com/jchv/go-webview2/internal/w32"
@@ -57,59 +56,6 @@ func createCoreWebView2EnvironmentWithOptions(browserExecutableFolder, userDataF
 	)
 }
 
-// ComProc stores a COM procedure.
-type ComProc uintptr
-
-// NewComProc creates a new COM proc from a Go function.
-func NewComProc(fn interface{}) ComProc {
-	return ComProc(windows.NewCallback(fn))
-}
-
-//go:uintptrescapes
-// Call calls a COM procedure.
-func (p ComProc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
-	// The magic uintptrescapes comment is needed to prevent moving uintptr(unsafe.Pointer(p)) so calls to .Call() also
-	// satisfy the unsafe.Pointer rule "(4) Conversion of a Pointer to a uintptr when calling syscall.Syscall."
-	// Otherwise it might be that pointers get moved, especially pointer onto the Go stack which might grow dynamically.
-	// See https://pkg.go.dev/unsafe#Pointer and https://github.com/golang/go/issues/34474
-	switch len(a) {
-	case 0:
-		return syscall.Syscall(uintptr(p), 0, 0, 0, 0)
-	case 1:
-		return syscall.Syscall(uintptr(p), 1, a[0], 0, 0)
-	case 2:
-		return syscall.Syscall(uintptr(p), 2, a[0], a[1], 0)
-	case 3:
-		return syscall.Syscall(uintptr(p), 3, a[0], a[1], a[2])
-	case 4:
-		return syscall.Syscall6(uintptr(p), 4, a[0], a[1], a[2], a[3], 0, 0)
-	case 5:
-		return syscall.Syscall6(uintptr(p), 5, a[0], a[1], a[2], a[3], a[4], 0)
-	case 6:
-		return syscall.Syscall6(uintptr(p), 6, a[0], a[1], a[2], a[3], a[4], a[5])
-	case 7:
-		return syscall.Syscall9(uintptr(p), 7, a[0], a[1], a[2], a[3], a[4], a[5], a[6], 0, 0)
-	case 8:
-		return syscall.Syscall9(uintptr(p), 8, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], 0)
-	case 9:
-		return syscall.Syscall9(uintptr(p), 9, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8])
-	case 10:
-		return syscall.Syscall12(uintptr(p), 10, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], 0, 0)
-	case 11:
-		return syscall.Syscall12(uintptr(p), 11, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], 0)
-	case 12:
-		return syscall.Syscall12(uintptr(p), 12, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11])
-	case 13:
-		return syscall.Syscall15(uintptr(p), 13, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], 0, 0)
-	case 14:
-		return syscall.Syscall15(uintptr(p), 14, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], 0)
-	case 15:
-		return syscall.Syscall15(uintptr(p), 15, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14])
-	default:
-		panic("too many arguments")
-	}
-}
-
 // IUnknown
 
 type _IUnknownVtbl struct {