gsrlabs/sys
1
0
Fork 0
mirror of https://github.com/golang/sys.git synced 2026-02-08 11:46:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

windows: add NewLazySystemDLL and use it in zsyscall_windows.go

Browse Source 
If we want new secure DLL approach to be adopted, we should make
conversion as simple as possible to explain and implement.
I think that replacing

syscall.NewLazyDLL(...) -> windows.NewLazySystemDLL(...)

is easier than

syscall.NewLazyDLL(...) -> &windows.LazyDLL{Name: ..., System: true}

So I propose we introduce convenience function NewLazySystemDLL.

$GOROOT/src/mksyscall_windows.go changes in the following CL.

Change-Id: If3432aff301c347cb355e4e837834696191b2219
Reviewed-on: https://go-review.googlesource.com/21592
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Alex Brainman
2016-04-06 15:52:57 +10:00
parent b323466d0b
commit 042a8f53ce
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
windows/dll_windows.go
View File

@@ -235,6 +235,13 @@ func NewLazyDLL(name string) *LazyDLL {
return &LazyDLL{Name: name}
}
// NewLazySystemDLL is like NewLazyDLL, but will only
// search Windows System directory for the DLL if name is
// a base name (like "advapi32.dll").
func NewLazySystemDLL(name string) *LazyDLL {
return &LazyDLL{Name: name, System: true}
}
// A LazyProc implements access to a procedure inside a LazyDLL.
// It delays the lookup until the Addr method is called.
type LazyProc struct {

4
windows/registry/zsyscall_windows.go
View File

@@ -11,8 +11,8 @@ import (
var _ unsafe.Pointer
var (
modadvapi32 = &windows.LazyDLL{Name: "advapi32.dll", System: true}
modkernel32 = &windows.LazyDLL{Name: "kernel32.dll", System: true}
modadvapi32 = windows.NewLazySystemDLL("advapi32.dll")
modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
procRegCreateKeyExW = modadvapi32.NewProc("RegCreateKeyExW")
procRegDeleteKeyW = modadvapi32.NewProc("RegDeleteKeyW")

22
windows/zsyscall_windows.go
View File

@@ -10,17 +10,17 @@ import (
var _ unsafe.Pointer
var (
modadvapi32 = &LazyDLL{Name: "advapi32.dll", System: true}
modkernel32 = &LazyDLL{Name: "kernel32.dll", System: true}
modshell32 = &LazyDLL{Name: "shell32.dll", System: true}
modmswsock = &LazyDLL{Name: "mswsock.dll", System: true}
modcrypt32 = &LazyDLL{Name: "crypt32.dll", System: true}
modws2_32 = &LazyDLL{Name: "ws2_32.dll", System: true}
moddnsapi = &LazyDLL{Name: "dnsapi.dll", System: true}
modiphlpapi = &LazyDLL{Name: "iphlpapi.dll", System: true}
modsecur32 = &LazyDLL{Name: "secur32.dll", System: true}
modnetapi32 = &LazyDLL{Name: "netapi32.dll", System: true}
moduserenv = &LazyDLL{Name: "userenv.dll", System: true}
modadvapi32 = NewLazySystemDLL("advapi32.dll")
modkernel32 = NewLazySystemDLL("kernel32.dll")
modshell32 = NewLazySystemDLL("shell32.dll")
modmswsock = NewLazySystemDLL("mswsock.dll")
modcrypt32 = NewLazySystemDLL("crypt32.dll")
modws2_32 = NewLazySystemDLL("ws2_32.dll")
moddnsapi = NewLazySystemDLL("dnsapi.dll")
modiphlpapi = NewLazySystemDLL("iphlpapi.dll")
modsecur32 = NewLazySystemDLL("secur32.dll")
modnetapi32 = NewLazySystemDLL("netapi32.dll")
moduserenv = NewLazySystemDLL("userenv.dll")
procRegisterEventSourceW = modadvapi32.NewProc("RegisterEventSourceW")
procDeregisterEventSource = modadvapi32.NewProc("DeregisterEventSource")