diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-06-13 14:58:23 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-06-13 14:58:23 +0200 |
commit | 3d5659c31a0bed337fcc378b7ed6d5a0f9dff01c (patch) | |
tree | 0ea7b4d52207cd8e26ac2286b2f7471ef88c583f /conf/zsyscall_windows.go | |
parent | conf: grammar (diff) | |
download | wireguard-windows-3d5659c31a0bed337fcc378b7ed6d5a0f9dff01c.tar.xz wireguard-windows-3d5659c31a0bed337fcc378b7ed6d5a0f9dff01c.zip |
conf: known folder path is upstream
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
-rw-r--r-- | conf/zsyscall_windows.go | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/conf/zsyscall_windows.go b/conf/zsyscall_windows.go index 4cf6d0bd..ec63bc3d 100644 --- a/conf/zsyscall_windows.go +++ b/conf/zsyscall_windows.go @@ -38,14 +38,10 @@ func errnoErr(e syscall.Errno) error { var ( modwininet = windows.NewLazySystemDLL("wininet.dll") - modole32 = windows.NewLazySystemDLL("ole32.dll") - modshell32 = windows.NewLazySystemDLL("shell32.dll") modadvapi32 = windows.NewLazySystemDLL("advapi32.dll") modkernel32 = windows.NewLazySystemDLL("kernel32.dll") procInternetGetConnectedState = modwininet.NewProc("InternetGetConnectedState") - procCoTaskMemFree = modole32.NewProc("CoTaskMemFree") - procSHGetKnownFolderPath = modshell32.NewProc("SHGetKnownFolderPath") procGetFileSecurityW = modadvapi32.NewProc("GetFileSecurityW") procGetSecurityDescriptorOwner = modadvapi32.NewProc("GetSecurityDescriptorOwner") procFindFirstChangeNotificationW = modkernel32.NewProc("FindFirstChangeNotificationW") @@ -58,19 +54,6 @@ func internetGetConnectedState(flags *uint32, reserved uint32) (connected bool) return } -func coTaskMemFree(pointer uintptr) { - syscall.Syscall(procCoTaskMemFree.Addr(), 1, uintptr(pointer), 0, 0) - return -} - -func shGetKnownFolderPath(id *windows.GUID, flags uint32, token windows.Handle, path **uint16) (ret error) { - r0, _, _ := syscall.Syscall6(procSHGetKnownFolderPath.Addr(), 4, uintptr(unsafe.Pointer(id)), uintptr(flags), uintptr(token), uintptr(unsafe.Pointer(path)), 0, 0) - if r0 != 0 { - ret = syscall.Errno(r0) - } - return -} - func getFileSecurity(fileName *uint16, securityInformation uint32, securityDescriptor *byte, descriptorLen uint32, requestedLen *uint32) (err error) { r1, _, e1 := syscall.Syscall6(procGetFileSecurityW.Addr(), 5, uintptr(unsafe.Pointer(fileName)), uintptr(securityInformation), uintptr(unsafe.Pointer(securityDescriptor)), uintptr(descriptorLen), uintptr(unsafe.Pointer(requestedLen)), 0) if r1 == 0 { |