Cleanup a bit

Use UTF16PtrFromString instead of deprecated StringToUTF16, Use buffered chanel for signals, use t.TempDir

service_su_test.go

@@ -41,8 +41,7 @@ func TestMain(m *testing.M) {
 
 func TestInstallRunRestartStopRemove(t *testing.T) {
 	p := &program{}
-	reportDir := mustTempDir(t)
-	defer os.RemoveAll(reportDir)
+	reportDir := t.TempDir()
 
 	s := mustNewRunAsService(t, p, reportDir)
 	_ = s.Uninstall()
@@ -88,14 +87,6 @@ func runService() {
 	}
 }
 
-func mustTempDir(t *testing.T) string {
-	dir, err := ioutil.TempDir("", "servicetest")
-	if err != nil {
-		t.Fatal(err)
-	}
-	return dir
-}
-
 func writeReport(reportDir string, action string) {
 	b := []byte("go_test_service_report")
 	timeStamp := time.Now().UnixNano()

service_windows.go

@@ -306,8 +306,12 @@ func lowPrivMgr() (*mgr.Mgr, error) {
 }
 
 func lowPrivSvc(m *mgr.Mgr, name string) (*mgr.Service, error) {
+	name16p, err := syscall.UTF16PtrFromString(name)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert '%s' to utf16 string: %w", name, err)
+	}
 	h, err := windows.OpenService(
-		m.Handle, syscall.StringToUTF16Ptr(name),
+		m.Handle, name16p,
 		windows.SERVICE_QUERY_CONFIG|windows.SERVICE_QUERY_STATUS|windows.SERVICE_START|windows.SERVICE_STOP)
 	if err != nil {
 		return nil, err
@@ -469,10 +473,8 @@ func (ws *windowsService) Run() error {
 		return err
 	}
 
-	sigChan := make(chan os.Signal)
-
+	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, os.Interrupt)
-
 	<-sigChan
 
 	return ws.i.Stop(ws)