-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
action: revert more golang1.22 commit for win7
- Loading branch information
Showing
4 changed files
with
237 additions
and
1 deletion.
There are no files selected for viewing
54 changes: 54 additions & 0 deletions
54
.github/patch_go122/48042aa09c2f878c4faa576948b07fe625c4707a.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| diff --git a/src/syscall/exec_windows.go b/src/syscall/exec_windows.go | ||
| index 06e684c7116b4..b311a5c74684b 100644 | ||
| --- a/src/syscall/exec_windows.go | ||
| +++ b/src/syscall/exec_windows.go | ||
| @@ -319,17 +319,6 @@ func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid int, handle | ||
| } | ||
| } | ||
|
|
||
| - var maj, min, build uint32 | ||
| - rtlGetNtVersionNumbers(&maj, &min, &build) | ||
| - isWin7 := maj < 6 || (maj == 6 && min <= 1) | ||
| - // NT kernel handles are divisible by 4, with the bottom 3 bits left as | ||
| - // a tag. The fully set tag correlates with the types of handles we're | ||
| - // concerned about here. Except, the kernel will interpret some | ||
| - // special handle values, like -1, -2, and so forth, so kernelbase.dll | ||
| - // checks to see that those bottom three bits are checked, but that top | ||
| - // bit is not checked. | ||
| - isLegacyWin7ConsoleHandle := func(handle Handle) bool { return isWin7 && handle&0x10000003 == 3 } | ||
| - | ||
| p, _ := GetCurrentProcess() | ||
| parentProcess := p | ||
| if sys.ParentProcess != 0 { | ||
| @@ -338,15 +327,7 @@ func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid int, handle | ||
| fd := make([]Handle, len(attr.Files)) | ||
| for i := range attr.Files { | ||
| if attr.Files[i] > 0 { | ||
| - destinationProcessHandle := parentProcess | ||
| - | ||
| - // On Windows 7, console handles aren't real handles, and can only be duplicated | ||
| - // into the current process, not a parent one, which amounts to the same thing. | ||
| - if parentProcess != p && isLegacyWin7ConsoleHandle(Handle(attr.Files[i])) { | ||
| - destinationProcessHandle = p | ||
| - } | ||
| - | ||
| - err := DuplicateHandle(p, Handle(attr.Files[i]), destinationProcessHandle, &fd[i], 0, true, DUPLICATE_SAME_ACCESS) | ||
| + err := DuplicateHandle(p, Handle(attr.Files[i]), parentProcess, &fd[i], 0, true, DUPLICATE_SAME_ACCESS) | ||
| if err != nil { | ||
| return 0, 0, err | ||
| } | ||
| @@ -377,14 +358,6 @@ func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid int, handle | ||
|
|
||
| fd = append(fd, sys.AdditionalInheritedHandles...) | ||
|
|
||
| - // On Windows 7, console handles aren't real handles, so don't pass them | ||
| - // through to PROC_THREAD_ATTRIBUTE_HANDLE_LIST. | ||
| - for i := range fd { | ||
| - if isLegacyWin7ConsoleHandle(fd[i]) { | ||
| - fd[i] = 0 | ||
| - } | ||
| - } | ||
| - | ||
| // The presence of a NULL handle in the list is enough to cause PROC_THREAD_ATTRIBUTE_HANDLE_LIST | ||
| // to treat the entire list as empty, so remove NULL handles. | ||
| j := 0 |
File renamed without changes.
162 changes: 162 additions & 0 deletions
162
.github/patch_go122/7c1157f9544922e96945196b47b95664b1e39108.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| diff --git a/src/net/hook_windows.go b/src/net/hook_windows.go | ||
| index ab8656cbbf343..28c49cc6de7e7 100644 | ||
| --- a/src/net/hook_windows.go | ||
| +++ b/src/net/hook_windows.go | ||
| @@ -14,7 +14,6 @@ var ( | ||
| testHookDialChannel = func() { time.Sleep(time.Millisecond) } // see golang.org/issue/5349 | ||
|
|
||
| // Placeholders for socket system calls. | ||
| - socketFunc func(int, int, int) (syscall.Handle, error) = syscall.Socket | ||
| wsaSocketFunc func(int32, int32, int32, *syscall.WSAProtocolInfo, uint32, uint32) (syscall.Handle, error) = windows.WSASocket | ||
| connectFunc func(syscall.Handle, syscall.Sockaddr) error = syscall.Connect | ||
| listenFunc func(syscall.Handle, int) error = syscall.Listen | ||
| diff --git a/src/net/internal/socktest/main_test.go b/src/net/internal/socktest/main_test.go | ||
| index 0197feb3f199a..967ce6795aedb 100644 | ||
| --- a/src/net/internal/socktest/main_test.go | ||
| +++ b/src/net/internal/socktest/main_test.go | ||
| @@ -2,7 +2,7 @@ | ||
| // Use of this source code is governed by a BSD-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| -//go:build !js && !plan9 && !wasip1 | ||
| +//go:build !js && !plan9 && !wasip1 && !windows | ||
|
|
||
| package socktest_test | ||
|
|
||
| diff --git a/src/net/internal/socktest/main_windows_test.go b/src/net/internal/socktest/main_windows_test.go | ||
| deleted file mode 100644 | ||
| index df1cb97784b51..0000000000000 | ||
| --- a/src/net/internal/socktest/main_windows_test.go | ||
| +++ /dev/null | ||
| @@ -1,22 +0,0 @@ | ||
| -// Copyright 2015 The Go Authors. All rights reserved. | ||
| -// Use of this source code is governed by a BSD-style | ||
| -// license that can be found in the LICENSE file. | ||
| - | ||
| -package socktest_test | ||
| - | ||
| -import "syscall" | ||
| - | ||
| -var ( | ||
| - socketFunc func(int, int, int) (syscall.Handle, error) | ||
| - closeFunc func(syscall.Handle) error | ||
| -) | ||
| - | ||
| -func installTestHooks() { | ||
| - socketFunc = sw.Socket | ||
| - closeFunc = sw.Closesocket | ||
| -} | ||
| - | ||
| -func uninstallTestHooks() { | ||
| - socketFunc = syscall.Socket | ||
| - closeFunc = syscall.Closesocket | ||
| -} | ||
| diff --git a/src/net/internal/socktest/sys_windows.go b/src/net/internal/socktest/sys_windows.go | ||
| index 8c1c862f33c9b..1c42e5c7f34b7 100644 | ||
| --- a/src/net/internal/socktest/sys_windows.go | ||
| +++ b/src/net/internal/socktest/sys_windows.go | ||
| @@ -9,38 +9,6 @@ import ( | ||
| "syscall" | ||
| ) | ||
|
|
||
| -// Socket wraps syscall.Socket. | ||
| -func (sw *Switch) Socket(family, sotype, proto int) (s syscall.Handle, err error) { | ||
| - sw.once.Do(sw.init) | ||
| - | ||
| - so := &Status{Cookie: cookie(family, sotype, proto)} | ||
| - sw.fmu.RLock() | ||
| - f, _ := sw.fltab[FilterSocket] | ||
| - sw.fmu.RUnlock() | ||
| - | ||
| - af, err := f.apply(so) | ||
| - if err != nil { | ||
| - return syscall.InvalidHandle, err | ||
| - } | ||
| - s, so.Err = syscall.Socket(family, sotype, proto) | ||
| - if err = af.apply(so); err != nil { | ||
| - if so.Err == nil { | ||
| - syscall.Closesocket(s) | ||
| - } | ||
| - return syscall.InvalidHandle, err | ||
| - } | ||
| - | ||
| - sw.smu.Lock() | ||
| - defer sw.smu.Unlock() | ||
| - if so.Err != nil { | ||
| - sw.stats.getLocked(so.Cookie).OpenFailed++ | ||
| - return syscall.InvalidHandle, so.Err | ||
| - } | ||
| - nso := sw.addLocked(s, family, sotype, proto) | ||
| - sw.stats.getLocked(nso.Cookie).Opened++ | ||
| - return s, nil | ||
| -} | ||
| - | ||
| // WSASocket wraps [syscall.WSASocket]. | ||
| func (sw *Switch) WSASocket(family, sotype, proto int32, protinfo *syscall.WSAProtocolInfo, group uint32, flags uint32) (s syscall.Handle, err error) { | ||
| sw.once.Do(sw.init) | ||
| diff --git a/src/net/main_windows_test.go b/src/net/main_windows_test.go | ||
| index 07f21b72eb1fc..bc024c0bbd82d 100644 | ||
| --- a/src/net/main_windows_test.go | ||
| +++ b/src/net/main_windows_test.go | ||
| @@ -8,7 +8,6 @@ import "internal/poll" | ||
|
|
||
| var ( | ||
| // Placeholders for saving original socket system calls. | ||
| - origSocket = socketFunc | ||
| origWSASocket = wsaSocketFunc | ||
| origClosesocket = poll.CloseFunc | ||
| origConnect = connectFunc | ||
| @@ -18,7 +17,6 @@ var ( | ||
| ) | ||
|
|
||
| func installTestHooks() { | ||
| - socketFunc = sw.Socket | ||
| wsaSocketFunc = sw.WSASocket | ||
| poll.CloseFunc = sw.Closesocket | ||
| connectFunc = sw.Connect | ||
| @@ -28,7 +26,6 @@ func installTestHooks() { | ||
| } | ||
|
|
||
| func uninstallTestHooks() { | ||
| - socketFunc = origSocket | ||
| wsaSocketFunc = origWSASocket | ||
| poll.CloseFunc = origClosesocket | ||
| connectFunc = origConnect | ||
| diff --git a/src/net/sock_windows.go b/src/net/sock_windows.go | ||
| index fa11c7af2e727..5540135a2c43e 100644 | ||
| --- a/src/net/sock_windows.go | ||
| +++ b/src/net/sock_windows.go | ||
| @@ -19,21 +19,6 @@ func maxListenerBacklog() int { | ||
| func sysSocket(family, sotype, proto int) (syscall.Handle, error) { | ||
| s, err := wsaSocketFunc(int32(family), int32(sotype), int32(proto), | ||
| nil, 0, windows.WSA_FLAG_OVERLAPPED|windows.WSA_FLAG_NO_HANDLE_INHERIT) | ||
| - if err == nil { | ||
| - return s, nil | ||
| - } | ||
| - // WSA_FLAG_NO_HANDLE_INHERIT flag is not supported on some | ||
| - // old versions of Windows, see | ||
| - // https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx | ||
| - // for details. Just use syscall.Socket, if windows.WSASocket failed. | ||
| - | ||
| - // See ../syscall/exec_unix.go for description of ForkLock. | ||
| - syscall.ForkLock.RLock() | ||
| - s, err = socketFunc(family, sotype, proto) | ||
| - if err == nil { | ||
| - syscall.CloseOnExec(s) | ||
| - } | ||
| - syscall.ForkLock.RUnlock() | ||
| if err != nil { | ||
| return syscall.InvalidHandle, os.NewSyscallError("socket", err) | ||
| } | ||
| diff --git a/src/syscall/exec_windows.go b/src/syscall/exec_windows.go | ||
| index 0a93bc0a80d4e..06e684c7116b4 100644 | ||
| --- a/src/syscall/exec_windows.go | ||
| +++ b/src/syscall/exec_windows.go | ||
| @@ -14,6 +14,7 @@ import ( | ||
| "unsafe" | ||
| ) | ||
|
|
||
| +// ForkLock is not used on Windows. | ||
| var ForkLock sync.RWMutex | ||
|
|
||
| // EscapeArg rewrites command line argument s as prescribed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters