From 7dfd1290c7917b7ba22824b9d24954ab3002fe24 Mon Sep 17 00:00:00 2001 From: "Hana (Hyang-Ah) Kim" Date: Thu, 10 May 2018 05:44:12 +0800 Subject: [PATCH] windows: address vet reports Found in https://storage.googleapis.com/go-build-log/300ed876/misc-vet-vetall_dd96a388.log cmd/vendor/golang.org/x/sys/windows/asm_windows_386.s:9: [386] getprocaddress: wrong argument size 8; expected $...-16 cmd/vendor/golang.org/x/sys/windows/asm_windows_386.s:12: [386] loadlibrary: wrong argument size 4; expected $...-12 cmd/vendor/golang.org/x/sys/windows/svc/service.go:337: cmd/vendor/golang.org/x/sys/windows.SERVICE_TABLE_ENTRY composite literal uses unkeyed fields cmd/vendor/golang.org/x/sys/windows/svc/service.go:338: cmd/vendor/golang.org/x/sys/windows.SERVICE_TABLE_ENTRY composite literal uses unkeyed fields cmd/vendor/golang.org/x/sys/windows/svc/debug/service.go:34: cmd/vendor/golang.org/x/sys/windows/svc.ChangeRequest composite literal uses unkeyed fields cmd/vendor/golang.org/x/sys/windows/svc/mgr/config.go:124: cmd/vendor/golang.org/x/sys/windows.SERVICE_DESCRIPTION composite literal uses unkeyed fields Change-Id: Ic08cfcc802aac89cfa1eb98661ec556c844e8013 Reviewed-on: https://go-review.googlesource.com/112557 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- windows/asm_windows_386.s | 4 ++-- windows/svc/debug/service.go | 2 +- windows/svc/mgr/config.go | 2 +- windows/svc/service.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/windows/asm_windows_386.s b/windows/asm_windows_386.s index 1c20dd2f..21d994d3 100644 --- a/windows/asm_windows_386.s +++ b/windows/asm_windows_386.s @@ -6,8 +6,8 @@ // System calls for 386, Windows are implemented in runtime/syscall_windows.goc // -TEXT ·getprocaddress(SB), 7, $0-8 +TEXT ·getprocaddress(SB), 7, $0-16 JMP syscall·getprocaddress(SB) -TEXT ·loadlibrary(SB), 7, $0-4 +TEXT ·loadlibrary(SB), 7, $0-12 JMP syscall·loadlibrary(SB) diff --git a/windows/svc/debug/service.go b/windows/svc/debug/service.go index 123df989..e621b87a 100644 --- a/windows/svc/debug/service.go +++ b/windows/svc/debug/service.go @@ -31,7 +31,7 @@ func Run(name string, handler svc.Handler) error { for { select { case <-sig: - cmds <- svc.ChangeRequest{svc.Stop, 0, 0, status} + cmds <- svc.ChangeRequest{Cmd: svc.Stop, CurrentStatus: status} case status = <-changes: } } diff --git a/windows/svc/mgr/config.go b/windows/svc/mgr/config.go index 0a6edba4..03bf41f5 100644 --- a/windows/svc/mgr/config.go +++ b/windows/svc/mgr/config.go @@ -121,7 +121,7 @@ func (s *Service) Config() (Config, error) { } func updateDescription(handle windows.Handle, desc string) error { - d := windows.SERVICE_DESCRIPTION{toPtr(desc)} + d := windows.SERVICE_DESCRIPTION{Description: toPtr(desc)} return windows.ChangeServiceConfig2(handle, windows.SERVICE_CONFIG_DESCRIPTION, (*byte)(unsafe.Pointer(&d))) } diff --git a/windows/svc/service.go b/windows/svc/service.go index 903cba3f..cda26b54 100644 --- a/windows/svc/service.go +++ b/windows/svc/service.go @@ -334,8 +334,8 @@ func Run(name string, handler Handler) error { var svcmain uintptr getServiceMain(&svcmain) t := []windows.SERVICE_TABLE_ENTRY{ - {syscall.StringToUTF16Ptr(s.name), svcmain}, - {nil, 0}, + {ServiceName: syscall.StringToUTF16Ptr(s.name), ServiceProc: svcmain}, + {ServiceName: nil, ServiceProc: 0}, } goWaitsH = uintptr(s.goWaits.h)