service: move WTS upstream

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

4 files changed, 12 insertions, 136 deletions

diff --git a/service/mksyscall.go b/service/mksyscall.go
deleted file mode 100644
index d15628ae..00000000
--- a/service/mksyscall.go
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
- */
-
-package service
-
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go securityapi.go
diff --git a/service/service_manager.go b/service/service_manager.go
index b2d93385..dcc8a908 100644
--- a/service/service_manager.go
+++ b/service/service_manager.go
@@ -87,7 +87,7 @@ func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest
 		}()
 
 		var userToken windows.Token
-		err := wtsQueryUserToken(session, &userToken)
+		err := windows.WTSQueryUserToken(session, &userToken)
 		if err != nil {
 			return
 		}
@@ -220,20 +220,20 @@ func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest
 
 	go checkForUpdates()
 
-	var sessionsPointer *WTS_SESSION_INFO
+	var sessionsPointer *windows.WTS_SESSION_INFO
 	var count uint32
-	err = wtsEnumerateSessions(0, 0, 1, &sessionsPointer, &count)
+	err = windows.WTSEnumerateSessions(0, 0, 1, &sessionsPointer, &count)
 	if err != nil {
 		serviceError = ErrorEnumerateSessions
 		return
 	}
-	sessions := *(*[]WTS_SESSION_INFO)(unsafe.Pointer(&struct {
-		addr *WTS_SESSION_INFO
+	sessions := *(*[]windows.WTS_SESSION_INFO)(unsafe.Pointer(&struct {
+		addr *windows.WTS_SESSION_INFO
 		len  int
 		cap  int
 	}{sessionsPointer, int(count), int(count)}))
 	for _, session := range sessions {
-		if session.State != WTSActive && session.State != WTSDisconnected {
+		if session.State != windows.WTSActive && session.State != windows.WTSDisconnected {
 			continue
 		}
 		procsLock.Lock()
@@ -245,7 +245,7 @@ func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest
 		}
 		procsLock.Unlock()
 	}
-	wtsFreeMemory(uintptr(unsafe.Pointer(sessionsPointer)))
+	windows.WTSFreeMemory(uintptr(unsafe.Pointer(sessionsPointer)))
 
 	changes <- svc.Status{State: svc.Running, Accepts: svc.AcceptStop | svc.AcceptSessionChange}
 
@@ -263,22 +263,22 @@ loop:
 			case svc.Interrogate:
 				changes <- c.CurrentStatus
 			case svc.SessionChange:
-				if c.EventType != WTS_SESSION_LOGON && c.EventType != WTS_SESSION_LOGOFF {
+				if c.EventType != windows.WTS_SESSION_LOGON && c.EventType != windows.WTS_SESSION_LOGOFF {
 					continue
 				}
-				sessionNotification := (*WTS_SESSION_NOTIFICATION)(unsafe.Pointer(c.EventData))
+				sessionNotification := (*windows.WTSSESSION_NOTIFICATION)(unsafe.Pointer(c.EventData))
 				if uintptr(sessionNotification.Size) != unsafe.Sizeof(*sessionNotification) {
-					log.Printf("Unexpected size of WTS_SESSION_NOTIFICATION: %d", sessionNotification.Size)
+					log.Printf("Unexpected size of WTSSESSION_NOTIFICATION: %d", sessionNotification.Size)
 					continue
 				}
-				if c.EventType == WTS_SESSION_LOGOFF {
+				if c.EventType == windows.WTS_SESSION_LOGOFF {
 					procsLock.Lock()
 					delete(aliveSessions, sessionNotification.SessionID)
 					if proc, ok := procs[sessionNotification.SessionID]; ok {
 						proc.Kill()
 					}
 					procsLock.Unlock()
-				} else if c.EventType == WTS_SESSION_LOGON {
+				} else if c.EventType == windows.WTS_SESSION_LOGON {
 					procsLock.Lock()
 					if alive := aliveSessions[sessionNotification.SessionID]; !alive {
 						aliveSessions[sessionNotification.SessionID] = true
diff --git a/service/securityapi.go b/service/tokens.go
index a7e6072c..dba4cd62 100644
--- a/service/securityapi.go
+++ b/service/tokens.go
@@ -13,48 +13,6 @@ import (
 	"golang.org/x/sys/windows"
 )
 
-const (
-	WTS_CONSOLE_CONNECT        = 0x1
-	WTS_CONSOLE_DISCONNECT     = 0x2
-	WTS_REMOTE_CONNECT         = 0x3
-	WTS_REMOTE_DISCONNECT      = 0x4
-	WTS_SESSION_LOGON          = 0x5
-	WTS_SESSION_LOGOFF         = 0x6
-	WTS_SESSION_LOCK           = 0x7
-	WTS_SESSION_UNLOCK         = 0x8
-	WTS_SESSION_REMOTE_CONTROL = 0x9
-	WTS_SESSION_CREATE         = 0xa
-	WTS_SESSION_TERMINATE      = 0xb
-)
-
-const (
-	WTSActive       = 0
-	WTSConnected    = 1
-	WTSConnectQuery = 2
-	WTSShadow       = 3
-	WTSDisconnected = 4
-	WTSIdle         = 5
-	WTSListen       = 6
-	WTSReset        = 7
-	WTSDown         = 8
-	WTSInit         = 9
-)
-
-type WTS_SESSION_NOTIFICATION struct {
-	Size      uint32
-	SessionID uint32
-}
-
-type WTS_SESSION_INFO struct {
-	SessionID         uint32
-	WindowStationName *uint16
-	State             uint32
-}
-
-//sys	wtsQueryUserToken(session uint32, token *windows.Token) (err error) = wtsapi32.WTSQueryUserToken
-//sys	wtsEnumerateSessions(handle windows.Handle, reserved uint32, version uint32, sessions **WTS_SESSION_INFO, count *uint32) (err error) = wtsapi32.WTSEnumerateSessionsW
-//sys	wtsFreeMemory(ptr uintptr) = wtsapi32.WTSFreeMemory
-
 func tokenIsElevated(token windows.Token) bool {
 	var isElevated uint32
 	var outLen uint32
diff --git a/service/zsyscall_windows.go b/service/zsyscall_windows.go
deleted file mode 100644
index bb1eced3..00000000
--- a/service/zsyscall_windows.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Code generated by 'go generate'; DO NOT EDIT.
-
-package service
-
-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)
-)
-
-// errnoErr returns common boxed Errno values, to prevent
-// allocations at runtime.
-func errnoErr(e syscall.Errno) error {
-	switch e {
-	case 0:
-		return nil
-	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 (
-	modwtsapi32 = windows.NewLazySystemDLL("wtsapi32.dll")
-
-	procWTSQueryUserToken     = modwtsapi32.NewProc("WTSQueryUserToken")
-	procWTSEnumerateSessionsW = modwtsapi32.NewProc("WTSEnumerateSessionsW")
-	procWTSFreeMemory         = modwtsapi32.NewProc("WTSFreeMemory")
-)
-
-func wtsQueryUserToken(session uint32, token *windows.Token) (err error) {
-	r1, _, e1 := syscall.Syscall(procWTSQueryUserToken.Addr(), 2, uintptr(session), uintptr(unsafe.Pointer(token)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func wtsEnumerateSessions(handle windows.Handle, reserved uint32, version uint32, sessions **WTS_SESSION_INFO, count *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procWTSEnumerateSessionsW.Addr(), 5, uintptr(handle), uintptr(reserved), uintptr(version), uintptr(unsafe.Pointer(sessions)), uintptr(unsafe.Pointer(count)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func wtsFreeMemory(ptr uintptr) {
-	syscall.Syscall(procWTSFreeMemory.Addr(), 1, uintptr(ptr), 0, 0)
-	return
-}