qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-15 11:30:36 -07:00
Code Releases Activity

[release-branch.go1] syscall: unexport GetCurrentProcessId on Windows

Browse Source
This commit is contained in:
Russ Cox 2012-06-13 16:25:01 -04:00
parent 96ab6e4a84
commit 596e6f390b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkg/syscall/syscall_windows.go
View File

@ -201,7 +201,7 @@ func NewCallback(fn interface{}) uintptr
//sys RegQueryInfoKey(key Handle, class *uint16, classLen *uint32, reserved *uint32, subkeysLen *uint32, maxSubkeyLen *uint32, maxClassLen *uint32, valuesLen *uint32, maxValueNameLen *uint32, maxValueLen *uint32, saLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegQueryInfoKeyW //sys RegQueryInfoKey(key Handle, class *uint16, classLen *uint32, reserved *uint32, subkeysLen *uint32, maxSubkeyLen *uint32, maxClassLen *uint32, valuesLen *uint32, maxValueNameLen *uint32, maxValueLen *uint32, saLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegQueryInfoKeyW
//sys RegEnumKeyEx(key Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, class *uint16, classLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegEnumKeyExW //sys RegEnumKeyEx(key Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, class *uint16, classLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegEnumKeyExW
//sys RegQueryValueEx(key Handle, name *uint16, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) = advapi32.RegQueryValueExW //sys RegQueryValueEx(key Handle, name *uint16, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) = advapi32.RegQueryValueExW
//sys GetCurrentProcessId() (pid uint32) = kernel32.GetCurrentProcessId //sys getCurrentProcessId() (pid uint32) = kernel32.getCurrentProcessId
// syscall interface implementation for other packages // syscall interface implementation for other packages
@ -684,7 +684,7 @@ func SetsockoptIPMreq(fd Handle, level, opt int, mreq *IPMreq) (err error) {
} }
func SetsockoptIPv6Mreq(fd Handle, level, opt int, mreq *IPv6Mreq) (err error) { return EWINDOWS } func SetsockoptIPv6Mreq(fd Handle, level, opt int, mreq *IPv6Mreq) (err error) { return EWINDOWS }
func Getpid() (pid int) { return int(GetCurrentProcessId()) } func Getpid() (pid int) { return int(getCurrentProcessId()) }
func FindFirstFile(name *uint16, data *Win32finddata) (handle Handle, err error) { func FindFirstFile(name *uint16, data *Win32finddata) (handle Handle, err error) {
// NOTE(rsc): The Win32finddata struct is wrong for the system call: // NOTE(rsc): The Win32finddata struct is wrong for the system call:

6
src/pkg/syscall/zsyscall_windows_386.go
View File

@ -142,7 +142,7 @@ var (
procOpenProcessToken = modadvapi32.NewProc("OpenProcessToken") procOpenProcessToken = modadvapi32.NewProc("OpenProcessToken")
procGetTokenInformation = modadvapi32.NewProc("GetTokenInformation") procGetTokenInformation = modadvapi32.NewProc("GetTokenInformation")
procGetUserProfileDirectoryW = moduserenv.NewProc("GetUserProfileDirectoryW") procGetUserProfileDirectoryW = moduserenv.NewProc("GetUserProfileDirectoryW")
procGetCurrentProcessId = modkernel32.NewProc("GetCurrentProcessId") procgetCurrentProcessId = modkernel32.NewProc("getCurrentProcessId")
) )
func GetLastError() (lasterr error) { func GetLastError() (lasterr error) {
@ -1602,8 +1602,8 @@ func GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) {
return return
} }
func GetCurrentProcessId() (pid uint32) { func getCurrentProcessId() (pid uint32) {
r0, _, _ := Syscall(procGetCurrentProcessId.Addr(), 0, 0, 0, 0) r0, _, _ := Syscall(procgetCurrentProcessId.Addr(), 0, 0, 0, 0)
pid = uint32(r0) pid = uint32(r0)
return return
} }

6
src/pkg/syscall/zsyscall_windows_amd64.go
View File

@ -142,7 +142,7 @@ var (
procOpenProcessToken = modadvapi32.NewProc("OpenProcessToken") procOpenProcessToken = modadvapi32.NewProc("OpenProcessToken")
procGetTokenInformation = modadvapi32.NewProc("GetTokenInformation") procGetTokenInformation = modadvapi32.NewProc("GetTokenInformation")
procGetUserProfileDirectoryW = moduserenv.NewProc("GetUserProfileDirectoryW") procGetUserProfileDirectoryW = moduserenv.NewProc("GetUserProfileDirectoryW")
procGetCurrentProcessId = modkernel32.NewProc("GetCurrentProcessId") procgetCurrentProcessId = modkernel32.NewProc("getCurrentProcessId")
) )
func GetLastError() (lasterr error) { func GetLastError() (lasterr error) {
@ -1602,8 +1602,8 @@ func GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) {
return return
} }
func GetCurrentProcessId() (pid uint32) { func getCurrentProcessId() (pid uint32) {
r0, _, _ := Syscall(procGetCurrentProcessId.Addr(), 0, 0, 0, 0) r0, _, _ := Syscall(procgetCurrentProcessId.Addr(), 0, 0, 0, 0)
pid = uint32(r0) pid = uint32(r0)
return return
} }