diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-13 09:01:49 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-13 13:28:00 +0200 |
| commit | 11eca3ec39277009dd1d9730bc8c55c0cd77ba94 (patch) | |
| tree | 710f0442ce9e89bc7832c9db56bfa8cdef00bb64 /service/zsyscall_windows.go | |
| parent | ui: lock runtime thread as early as possible (diff) | |
| download | wireguard-windows-11eca3ec39277009dd1d9730bc8c55c0cd77ba94.tar.xz wireguard-windows-11eca3ec39277009dd1d9730bc8c55c0cd77ba94.zip | |
service: allow go to create correct environment block
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
| -rw-r--r-- | service/zsyscall_windows.go | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/service/zsyscall_windows.go b/service/zsyscall_windows.go index 20f9753b..bb8d89d4 100644 --- a/service/zsyscall_windows.go +++ b/service/zsyscall_windows.go @@ -38,15 +38,12 @@ func errnoErr(e syscall.Errno) error { var ( modwtsapi32 = windows.NewLazySystemDLL("wtsapi32.dll") - moduserenv = windows.NewLazySystemDLL("userenv.dll") modadvapi32 = windows.NewLazySystemDLL("advapi32.dll") modkernel32 = windows.NewLazySystemDLL("kernel32.dll") procWTSQueryUserToken = modwtsapi32.NewProc("WTSQueryUserToken") procWTSEnumerateSessionsW = modwtsapi32.NewProc("WTSEnumerateSessionsW") procWTSFreeMemory = modwtsapi32.NewProc("WTSFreeMemory") - procCreateEnvironmentBlock = moduserenv.NewProc("CreateEnvironmentBlock") - procDestroyEnvironmentBlock = moduserenv.NewProc("DestroyEnvironmentBlock") procNotifyServiceStatusChangeW = modadvapi32.NewProc("NotifyServiceStatusChangeW") procSleepEx = modkernel32.NewProc("SleepEx") ) @@ -80,36 +77,6 @@ func wtsFreeMemory(ptr uintptr) { return } -func createEnvironmentBlock(block *uintptr, token windows.Token, inheritExisting bool) (err error) { - var _p0 uint32 - if inheritExisting { - _p0 = 1 - } else { - _p0 = 0 - } - r1, _, e1 := syscall.Syscall(procCreateEnvironmentBlock.Addr(), 3, uintptr(unsafe.Pointer(block)), uintptr(token), uintptr(_p0)) - if r1 == 0 { - if e1 != 0 { - err = errnoErr(e1) - } else { - err = syscall.EINVAL - } - } - return -} - -func destroyEnvironmentBlock(block uintptr) (err error) { - r1, _, e1 := syscall.Syscall(procDestroyEnvironmentBlock.Addr(), 1, uintptr(block), 0, 0) - if r1 == 0 { - if e1 != 0 { - err = errnoErr(e1) - } else { - err = syscall.EINVAL - } - } - return -} - func notifyServiceStatusChange(service windows.Handle, notifyMask uint32, notifyBuffer uintptr) (status uint32) { r0, _, _ := syscall.Syscall(procNotifyServiceStatusChangeW.Addr(), 3, uintptr(service), uintptr(notifyMask), uintptr(notifyBuffer)) status = uint32(r0) |